From patchwork Mon Nov 20 16:38:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 34871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D64B6C2BB3F for ; Mon, 20 Nov 2023 16:39:22 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web10.600.1700498361958211255 for ; Mon, 20 Nov 2023 08:39:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ejg4k/3q; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5bdbe2de25fso3479250a12.3 for ; Mon, 20 Nov 2023 08:39:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1700498361; x=1701103161; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JDjxAUTDyqXsSES+Vn4gVZ3TCpcuA2p6RdP++xKCoAc=; b=Ejg4k/3qXbt/YmwRWdEMxpSU9px5mxeGhq7HN63LzRVf0p1LvrTWtuT3JV5vgDcasT PxISWi30Mpo6aDbj13Hl0bhZPdg9KSpiLnim/3MGwoxsw6WOfFYAG9oxQFrHhL7ldWuN Qydb46nZoxirT6SdJc2+pc7esvk95E1qTbC2hjCymYnkIqiX0KAK8hTw99JTh3WfqsPx UY5C0bnHZ7yW2vOl1ij78HQXeQnzslqOgSna1UUvSwz075HyHZT2x7z8I0nRuRaHSn6O ECQTeYMGJy/9dF8OvP/BWltqwmtBjiMRSrZS3Tg7y+hzlYhl2ecoWgWwOv7yQFIUJr9P mq+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700498361; x=1701103161; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JDjxAUTDyqXsSES+Vn4gVZ3TCpcuA2p6RdP++xKCoAc=; b=c1KyhwKp/gl2DLIumtKHKFc5izu0skoqoMYEzl4hoFpFfJBZUPhoIt+SDIW8zhwkbU o21kw461QlAjxMfXPDJ00DaWpryby0gXWkUDz/Uow3egwiABZjso8/Y7aJ7DniJz8mS3 JY43TOw7C21hg9KM4+1X05uZYpZ8Uh0pJpLce1A98kj5KvVyoP+NEOLul28CGm3V06BQ mAm8cr+NrCCaYp9UtgcFN7dblUIRXibcqR0YUtwWkKtcBIxYxdMuvC07tuflor9GieGW aE66kOL9hpWAzm3NuTlF3eFZ8W/JGhuCNxJTy6XZExzwT9l+H8ZhVYk00Emg14xBxOZ5 CKvA== X-Gm-Message-State: AOJu0YzvyelIf9v5Vb8bHivbNsJ7FI71maJ5K2St4qTxFbVcaETzywmv 0aQ/CuBN3QFml7mMwVtP407rdU4lwckRt3aGRv4QBA== X-Google-Smtp-Source: AGHT+IGloxRHT8agPLxVw144WmAHjmGePWsJKjCwJnqJ8H1hOooALkbC0p2yzXhHpI2wspwHUWFH3A== X-Received: by 2002:a05:6a21:3414:b0:186:664b:44bf with SMTP id yn20-20020a056a21341400b00186664b44bfmr9860872pzb.60.1700498360785; Mon, 20 Nov 2023 08:39:20 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id o23-20020a634e57000000b005c215baacc1sm4899279pgl.70.2023.11.20.08.39.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 08:39:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][nanbield 13/33] linux-yocto: make sure the pahole-native available before do_kernel_configme Date: Mon, 20 Nov 2023 06:38:27 -1000 Message-Id: <9a175e954d1dd485293e0c3c49332fa2fe2bab1b.1700496737.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Nov 2023 16:39:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190902 From: Xiangyu Chen When using debug-btf.scc in a clean workspace, the CONFIG_MODULE_ALLOW_BTF_MISMATCH cannot apply to kernel until clean the kernel code(bitbake linux-yocto -c cleanall) and rebuild. After tracking the code, some options depend on CONFIG_PAHOLE_VERSION, it was generated by scripts/pahole-version.sh in kernel, but during do_kernel_configme step, the pahole-native is not available in sysroot-native, so need to wait pahole-native install to sysroot-native before do_kernel_configme. Signed-off-by: Xiangyu Chen Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 217a4db53edbd88001f6390bbff39e5dd3d137af) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 0cc303c009..0132fcffb3 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -65,7 +65,10 @@ KERNEL_DEBUG ?= "" DEPENDS += '${@bb.utils.contains_any("ARCH", [ "x86", "arm64", "powerpc" ], "elfutils-native", "", d)}' DEPENDS += "openssl-native util-linux-native" DEPENDS += "gmp-native libmpc-native" -DEPENDS += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native", "", d)}' + +# Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native available before do_kernel_configme +do_kernel_configme[depends] += '${@bb.utils.contains("KERNEL_DEBUG", "True", "pahole-native:do_populate_sysroot", "", d)}' + EXTRA_OEMAKE += '${@bb.utils.contains("KERNEL_DEBUG", "True", "", "PAHOLE=false", d)}' do_devshell:prepend() {