[meta-fsl-ppc][PATCH v2] linux-qoriq: check $WORKDIR for config fragments
Adrian Dudau
Config fragments passed through SRC_URI are installed in $WORKDIR. Adapt
the recipe to look there too.
Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index d28e75d..ad61baa 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -25,7 +25,9 @@ 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}
+ ${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}
--
1.9.1
the recipe to look there too.
Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
recipes-kernel/linux/linux-qoriq.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index d28e75d..ad61baa 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -25,7 +25,9 @@ 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}
+ ${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}
--
1.9.1