From: Quentin Schulz Date: Tue, 28 May 2024 14:04:14 +0000 (+0200) Subject: kernel-yocto: fix incorrect debug message for defconfig in WORKDIR X-Git-Tag: uninative-4.6~365 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f25717bff291ca225a70e63d3266656d8e643531;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git kernel-yocto: fix incorrect debug message for defconfig in WORKDIR Right before this message is printed, the in-tree defconfig is checked against the one in WORKDIR. If it is different, and therefore either provided through SRC_URI or patched, then the message is printed. Therefore, the debug message is incorrect and should say that a patched defconfig was detected and overwritten. Fixes: 004da4c6c602 ("kernel-yocto: split meta data gathering into patch and config phases") Cc: Bruce Ashfield Signed-off-by: Quentin Schulz Signed-off-by: Alexandre Belloni --- diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index f741a342d40..6d5c3b6327b 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass @@ -158,7 +158,7 @@ do_kernel_metadata() { # one already placed in UNPACKDIR cmp "${UNPACKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" if [ $? -ne 0 ]; then - bbdebug 1 "detected SRC_URI or unpatched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it" + bbdebug 1 "detected SRC_URI or patched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it" fi cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig else