From 0c3d9ff24fae6bee16c7b517c6968714cde3f09a Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Tue, 28 May 2024 16:04:14 +0200 Subject: [PATCH] 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 (From OE-Core rev: f25717bff291ca225a70e63d3266656d8e643531) Signed-off-by: Quentin Schulz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index f741a342d4..6d5c3b6327 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