summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2016-03-01 10:22:41 +0100
committerZhenhua Luo <zhenhua.luo@nxp.com>2016-03-01 18:41:43 +0800
commit97a5f5d7c1451649b72cdc4d6faab69a761c6e7b (patch)
tree443b7238a392985d43037ae73eda2179275be7cc
parent51a2d618958ec9bd1c99b34c7ce7c7fa7d051b7d (diff)
downloadmeta-fsl-ppc-97a5f5d7c1451649b72cdc4d6faab69a761c6e7b.tar.gz
linux-qoriq: check $WORKDIR for config fragments
Config fragments passed through SRC_URI are installed in $WORKDIR. Adapt the recipe to look there too. Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
-rw-r--r--recipes-kernel/linux/linux-qoriq.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index d28e75d..15a9f1a 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -26,6 +26,8 @@ do_configure_prepend() {
26 for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do 26 for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
27 if [ -f "${deltacfg}" ]; then 27 if [ -f "${deltacfg}" ]; then
28 ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} 28 ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
29 elif [ -f "${WORKDIR}/${deltacfg}" ]; then
30 ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
29 elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then 31 elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
30 ${S}/scripts/kconfig/merge_config.sh -m .config \ 32 ${S}/scripts/kconfig/merge_config.sh -m .config \
31 ${S}/arch/powerpc/configs/${deltacfg} 33 ${S}/arch/powerpc/configs/${deltacfg}