From patchwork Wed Nov 8 13:46:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 34064 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 EF06BC4332F for ; Wed, 8 Nov 2023 13:47:16 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.13935.1699451234536805600 for ; Wed, 08 Nov 2023 05:47:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=K+asQNYQ; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-692c02adeefso5962305b3a.3 for ; Wed, 08 Nov 2023 05:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1699451233; x=1700056033; 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=xTal5PGeh/nSVL7GmsMV3CJACIsRXRenqv8bR1NKcUE=; b=K+asQNYQW0iByt4WO01NrkPHhWJoJqXlcmiKtC2NwKtY+OyOF8xYeSbB5gMv/Inudc 8WFbsASygpN0bhXqQcp3BrcXI+m43QJplTIJgx2LeoGvakA8Dlq4npPtzLTH75z+4L9K hPgFT8zW3dGtEg0Uy8LUIBldFxmybUKExhTRqSEtSh6NGuUceB/8L2stwflP8CfcC6j/ oYuDG4T1LCPNhV0pE18pbr9sMbjlyRNfY+NWplSWg6lMHm4bRf8pqpZx919BdiR31TfK a0TEsjj9ji/PrL09TZQEzGXjQQhWZrRWF9FEKvjsgnk+gUTr/H0TtV3WGu/7lif09LTC HIIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699451233; x=1700056033; 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=xTal5PGeh/nSVL7GmsMV3CJACIsRXRenqv8bR1NKcUE=; b=LJSop88zt+/wnrY3GYJTcYfapq0BMBDJdUAhL/gSe6w8MsS9BZTUCTDL2Fj5Nn6rcJ 4KMu928b9byhZBkp9d24QX7Is+40WnszRDe1COeRw3MegmXiC0QZHONBOT96mvBlVGIz ACNKw8GStNaLcMxFXi66ZQD8K8wduD+KXg5w3/fLHrqUxAZOnYr55Hr60oBUX22dHXKE u2JFTgQh7e2ELHOEzs1roTp+Qe6cU8NOy2rBpJSJx63C61RLxzW3p0QsiIDZ9qkqty6T lrR0rKEctuqO9/5X04vcarOIem/auht3yBncX7HPZGd0DsJHugAbyMYndu6rI5BdhLiz 7Tfw== X-Gm-Message-State: AOJu0Yy3to686/5tQcDBdkCFHHW2BUyJe8xRu+8zYTrspT9OgCQHSJ2o AJI5pdpv4Yt3olsCX9+uGyDTmxu3fzOrSKakKVDfDg== X-Google-Smtp-Source: AGHT+IG8g/daFwPIQJSOBYPwwJrF9/ZRi5pBFuYnU3ZgeHIl+hmL9/ZrBUIQtfMjkhBSHQ7lEfr01Q== X-Received: by 2002:a05:6a21:7802:b0:181:219f:4a4f with SMTP id be2-20020a056a21780200b00181219f4a4fmr1961441pzc.48.1699451233283; Wed, 08 Nov 2023 05:47:13 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id w12-20020a170902d3cc00b001b7cbc5871csm1781980plb.53.2023.11.08.05.47.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 05:47:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/10] linux-yocto: make sure the pahole-native available before do_kernel_configme Date: Wed, 8 Nov 2023 03:46:50 -1000 Message-Id: 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 ; Wed, 08 Nov 2023 13:47:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190335 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. (cherry picked from commit 217a4db53edbd88001f6390bbff39e5dd3d137af) Signed-off-by: Xiangyu Chen Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie 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 04a8105e17..461e5684cd 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" ], "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() {