[meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use correct path to access config2:w fragments

[Ting Liu]

> -----Original Message-----
> From: meta-freescale-bounces at yoctoproject.org [mailto:meta-freescale-
> bounces at yoctoproject.org] On Behalf Of Adrian Dudau
> Sent: Wednesday, February 24, 2016 6:40 PM
> To: meta-freescale at yoctoproject.org
> Subject: [meta-freescale] [meta-fsl-ppc][PATCH] linux-qoriq: use correct
> path to access config2:w fragments
> 
> Config fragments passed through SRC_URI are installed in $WORKDIR but the
> recipe is looking for them in the current directory which in this case is
> different.
> 
> Signed-off-by: Adrian Dudau <adrian.dudau at enea.com>
> ---
>  recipes-kernel/linux/linux-qoriq.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-
> qoriq.inc
> index d28e75d..80edede 100644
> --- a/recipes-kernel/linux/linux-qoriq.inc
> +++ b/recipes-kernel/linux/linux-qoriq.inc
> @@ -24,8 +24,8 @@ do_configure_prepend() {
> 
>      # add config fragments
>      for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
> -        if [ -f "${deltacfg}" ]; then
> -            ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
[Liu Ting-B28495] this is intended to merge the config fragments with absolute path. The config fragments can be outside of Yocto layers.

> +        if [ -f "${WORKDIR}/${deltacfg}" ]; then
> +            ${S}/scripts/kconfig/merge_config.sh -m .config
> + ${WORKDIR}/${deltacfg}
[Liu Ting-B28495] This looks fine to merge the config fragments that passed through SRC_URI.

>          elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
>              ${S}/scripts/kconfig/merge_config.sh -m .config \
>                  ${S}/arch/powerpc/configs/${deltacfg}
> --
> 1.9.1
> 
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale