summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 23:36:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:44:07 +0100
commitd271a8e004fc29dba48c444157f7d1a9b59a105f (patch)
tree5b8fddcc3ed0080b1045278c3008297f2530bfbb /meta
parent409bdca8e33931a6893409f08061641333a228c4 (diff)
downloadpoky-d271a8e004fc29dba48c444157f7d1a9b59a105f.tar.gz
kernel-yocto: propagate in tree defconfigs to WORKDIR
As reported by Steffen Pankratz <Steffen.Pankratz@elektrobit.com>, the previous logic of KBUILD_DEFCONFIG processing would not propagate an in tree defcofig to WORKDIR if one was not already present. We fix the propagation by copying the in tee config if a defconfig is not already in WORKDIR. Additionally we only warn (versus copying) if an in tree configuration is specified, is different than the WORKDIR version and isn't copied. (From OE-Core rev: 58cc903a5156063b24e48011438a709cb6e09f54) (From OE-Core rev: 0b12cc3a326740bd95bb199d4f1b38bf5beadfa9) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0dd5b48513..88588d7cac 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -97,14 +97,15 @@ do_kernel_metadata() {
97 if [ -n "${KBUILD_DEFCONFIG}" ]; then 97 if [ -n "${KBUILD_DEFCONFIG}" ]; then
98 if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then 98 if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then
99 if [ -f "${WORKDIR}/defconfig" ]; then 99 if [ -f "${WORKDIR}/defconfig" ]; then
100 # If the two defconfigs are the same, leave the existing one in place 100 # If the two defconfig's are different, warn that we didn't overwrite the
101 # one already placed in WORKDIR by the fetcher.
101 cmp "${WORKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" 102 cmp "${WORKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}"
102 if [ $? -ne 0 ]; then 103 if [ $? -ne 0 ]; then
103 bbnote "defconfig detected in WORKDIR. ${KBUILD_DEFCONFIG} skipped" 104 bbwarn "defconfig detected in WORKDIR. ${KBUILD_DEFCONFIG} skipped"
104 else
105 cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
106 sccs="${WORKDIR}/defconfig"
107 fi 105 fi
106 else
107 cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
108 sccs="${WORKDIR}/defconfig"
108 fi 109 fi
109 else 110 else
110 bbfatal "A KBUILD_DECONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree" 111 bbfatal "A KBUILD_DECONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"