From: Ting Liu <ting.liu@nxp.com>
Date: Sat, 9 Jan 2016 06:43:00 +0000 (+0800)
Subject: linux-qoriq: save the merged .config as ${WORKDIR}/defconfig
X-Git-Tag: 2.1~161
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=32f87010094a3e64716b9f26f63e9dfa2c8fba5a;p=meta-freescale.git

linux-qoriq: save the merged .config as ${WORKDIR}/defconfig

In fsl-kernel-localversion.bbclass, ${B}/.config will be regenerated
based on ${WORKDIR}/defconfig. Save the merged .config to avoid issue.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 6c925de3..950c08c9 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -23,8 +23,7 @@ DELTA_KERNEL_DEFCONFIG ?= ""
 
 do_configure_prepend() {
     # copy desired defconfig so we pick it up for the real kernel_do_configure
-    cp ${KERNEL_DEFCONFIG} ${B}/.config
-    cp ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig
+    cp ${KERNEL_DEFCONFIG} .config
     # add config fragments
     for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
         if [ -f "${deltacfg}" ]; then
@@ -34,7 +33,7 @@ do_configure_prepend() {
                 ${S}/arch/powerpc/configs/${deltacfg}
         fi
     done
-
+    cp .config ${WORKDIR}/defconfig
 }
 
 do_install_append_qoriq-arm() {