From b557990e6dc79351df483d4882b8dda488612afe Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 9 Jan 2016 14:43:02 +0800 Subject: [PATCH] linux-qoriq: support kernel delta defconfig managed in recipe folder Signed-off-by: Zhenhua Luo Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-qoriq.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 5992fbff..6436d9c3 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -29,6 +29,8 @@ do_configure_prepend() { for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do if [ -f "${deltacfg}" ]; then ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} + elif [ -f "${WORKDIR}/${deltacfg}" ]; then + ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then ${S}/scripts/kconfig/merge_config.sh -m .config \ ${S}/arch/powerpc/configs/${deltacfg} -- 2.40.1