diff options
author | Ting Liu <ting.liu@nxp.com> | 2016-01-09 14:43:00 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:22 -0300 |
commit | 32f87010094a3e64716b9f26f63e9dfa2c8fba5a (patch) | |
tree | c737ea82b70dc197b8099e84ea7010ffc76df71f | |
parent | 47c7c3fd0f48d49295370870437b2dd9833b1b9b (diff) | |
download | meta-freescale-32f87010094a3e64716b9f26f63e9dfa2c8fba5a.tar.gz |
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>
-rw-r--r-- | recipes-kernel/linux/linux-qoriq.inc | 5 |
1 files changed, 2 insertions, 3 deletions
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 ?= "" | |||
23 | 23 | ||
24 | do_configure_prepend() { | 24 | do_configure_prepend() { |
25 | # copy desired defconfig so we pick it up for the real kernel_do_configure | 25 | # copy desired defconfig so we pick it up for the real kernel_do_configure |
26 | cp ${KERNEL_DEFCONFIG} ${B}/.config | 26 | cp ${KERNEL_DEFCONFIG} .config |
27 | cp ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig | ||
28 | # add config fragments | 27 | # add config fragments |
29 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do | 28 | for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do |
30 | if [ -f "${deltacfg}" ]; then | 29 | if [ -f "${deltacfg}" ]; then |
@@ -34,7 +33,7 @@ do_configure_prepend() { | |||
34 | ${S}/arch/powerpc/configs/${deltacfg} | 33 | ${S}/arch/powerpc/configs/${deltacfg} |
35 | fi | 34 | fi |
36 | done | 35 | done |
37 | 36 | cp .config ${WORKDIR}/defconfig | |
38 | } | 37 | } |
39 | 38 | ||
40 | do_install_append_qoriq-arm() { | 39 | do_install_append_qoriq-arm() { |