]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
kernel-yocto: fix incorrect debug message for defconfig in WORKDIR
authorQuentin Schulz <quentin.schulz@cherry.de>
Tue, 28 May 2024 14:04:14 +0000 (16:04 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 3 Jun 2024 06:47:00 +0000 (07:47 +0100)
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 <bruce.ashfield@gmail.com>
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
meta/classes-recipe/kernel-yocto.bbclass

index f741a342d40dd571b0d1ed4b6e9e7fc7d54b5e31..6d5c3b6327b61b9bb6678dae2dbf059dbde178f6 100644 (file)
@@ -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