From patchwork Tue Oct 31 15:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 33174 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 DEBC1C4332F for ; Tue, 31 Oct 2023 15:36:07 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web11.1820.1698766564745148467 for ; Tue, 31 Oct 2023 08:36:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=m48O4eSG; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6b20a48522fso5289851b3a.1 for ; Tue, 31 Oct 2023 08:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1698766563; x=1699371363; 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=m48O4eSG6kF6gM9UwM/QB8pHkrVmaA5qdBLREORFmsfIM3GOg8nN49ZX6RRyHEkyIG 9oKAlUUvTp+QrgwyfrayRoblX9mU9HKoXt+BiOZ0//7Qf/2ZN5kdZhPmLHZLYLUCUJfm XE9G4XA5tjXtXSfz/u0VvOyuE96hWOvw0KnKNWhKGlK+8D3OMsQqv8jaJYndcC0dKdMn P80HjhQ80aVE5tp4rBkEihF7hrax+BFIeeUFDjmjzpLAuk3urj757ONtHJSl7l2Zocsh Vc49z68HcLiJ5bOmL0qG+5OSyl1RReC48v9u8H2btAfdcVkJ5/O9tylT/rls+GNlq3b6 lazw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698766563; x=1699371363; 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=euVGVaLeoNQiXgkX1U30uPZf/zz+y4j+JHYKhijkMSN7EWdGdq2gkopLFXKb9hi/Hm Vlk83t/h4Pwp9unVgB6UxsFjQ637Kok+EoLjqM6GVVLwk0ZYuRFuaDA76QeqsGEbBpAf Q26syqSZYCOHrf2JilcyBWdkZeITIoc/JMdwb32mJ0HoEuRFNBeJ3+mKe2Bii7xfWcdN iEDODf+8GA4YNWN2dxvMo7VLmtvdudVVHmKTYH23w7+iDlvv/34kxONi4CqIrgfBAY3g AdXaCc+eeMu6h28u9iss1nplKkkIoknb+MuCJxHcB901qs9ab1LS2fHDt3BRJA5IP4Z8 mVew== X-Gm-Message-State: AOJu0Yznz1+qoTqkT/L3coUR8RiAJb6FTl0aJ5guPkC6MgojpPHWKtnD V89mZdIn2XtrF/il0dJv176SsbJaz/zBBuTKvz/KMA== X-Google-Smtp-Source: AGHT+IEwmwlTQipAC8ICoTDhoFBbUgPWIBh4DN2egtgNR1vHYm8jeik3AJrPlBK65uMHYTLs4QTA/w== X-Received: by 2002:a05:6a20:914e:b0:172:83b8:67f8 with SMTP id x14-20020a056a20914e00b0017283b867f8mr12453590pzc.29.1698766563409; Tue, 31 Oct 2023 08:36:03 -0700 (PDT) Received: from hexa.router0800d9.com (rrcs-66-91-142-162.west.biz.rr.com. [66.91.142.162]) by smtp.gmail.com with ESMTPSA id f10-20020a170902684a00b001ca21e05c69sm1498048pln.109.2023.10.31.08.36.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 08:36:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 5/5] linux-yocto: make sure the pahole-native available before do_kernel_configme Date: Tue, 31 Oct 2023 05:35:44 -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 ; Tue, 31 Oct 2023 15:36:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189857 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() {