summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/kernel-yocto.bbclass8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass
index c45abf6ddc..cef6b9ec3f 100644
--- a/meta/classes-recipe/kernel-yocto.bbclass
+++ b/meta/classes-recipe/kernel-yocto.bbclass
@@ -150,10 +150,6 @@ do_kernel_metadata() {
150 # from the source tree, into a common location and normalized "defconfig" name, 150 # from the source tree, into a common location and normalized "defconfig" name,
151 # where the rest of the process will include and incoroporate it into the build 151 # where the rest of the process will include and incoroporate it into the build
152 # 152 #
153 # If the fetcher has already placed a defconfig in UNPACKDIR (from the SRC_URI),
154 # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take
155 # precendence.
156 #
157 if [ -n "${KBUILD_DEFCONFIG}" ]; then 153 if [ -n "${KBUILD_DEFCONFIG}" ]; then
158 if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then 154 if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then
159 if [ -f "${UNPACKDIR}/defconfig" ]; then 155 if [ -f "${UNPACKDIR}/defconfig" ]; then
@@ -163,10 +159,8 @@ do_kernel_metadata() {
163 if [ $? -ne 0 ]; then 159 if [ $? -ne 0 ]; then
164 bbdebug 1 "detected SRC_URI or patched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it" 160 bbdebug 1 "detected SRC_URI or patched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it"
165 fi 161 fi
166 cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
167 else
168 cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
169 fi 162 fi
163 cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
170 in_tree_defconfig="${UNPACKDIR}/defconfig" 164 in_tree_defconfig="${UNPACKDIR}/defconfig"
171 else 165 else
172 bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)" 166 bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)"