From patchwork Mon Jun 30 12:17:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 65854 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 E2755C83030 for ; Mon, 30 Jun 2025 12:17:19 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.38615.1751285832881840730 for ; Mon, 30 Jun 2025 05:17:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9276563c86=hongxu.jia@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55U50m38028305 for ; Mon, 30 Jun 2025 12:17:12 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47j5m19t3a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 30 Jun 2025 12:17:11 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.57; Mon, 30 Jun 2025 05:17:10 -0700 Received: from pek-lpg-core5.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Mon, 30 Jun 2025 05:17:09 -0700 From: Hongxu Jia To: Subject: [PATCH 1/2] kernelsrc.bbclass/perf: make package version consistent with kernel source Date: Mon, 30 Jun 2025 20:17:07 +0800 Message-ID: <20250630121708.4010323-1-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjMwMDEwMCBTYWx0ZWRfXyrXuTbkHPJqr m26oNcB/Cu5nOudVjjtxj+Dm5Eu2W9IVJxYX8+W3kGF+YeRMpZwN23W92ycMxIoN1ZFmIEC7Fkd AfTuCecyrYDCdglkNIspzrg/tZfmhcFEB8WALl75m/iI/jO5v1Tc7NXSOQPEekqwsv6pg5/82g8 T8jYHwWtIbN7hAX/sd6a7GDPD98svWt9kteW9q+XFHTvEbMKmQBffQWuPvHmn8YdX/xbt079ect 2bbhwBOEu6XF8dmnUQpzgaIpRgHr+zj8sWhju3X7dPyhyBsCrLc/kHXpWizr867qWw2hKcKel7C Ahd8vcs/ma8zNwTeUvvRwIy7VlmdIu+KywTy2TtUNbXBL65txBLByrGA6gI9AaaBM4hn8VGQERW /nJjM4AHdxZ5IGFidRl1gOcavDVw0coDsO+DoIaByyeL21GSVFJ6LDkcvgAj/Shz8cLYA/1o X-Authority-Analysis: v=2.4 cv=IOsCChvG c=1 sm=1 tr=0 ts=68628047 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=6IFa9wvqVegA:10 a=t7CeM3EgAAAA:8 a=ebKT7KSLUzKIW0Oku2YA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 9fNQDmWpRXb7m3AeyeMkbbZoeC3UOtNn X-Proofpoint-ORIG-GUID: 9fNQDmWpRXb7m3AeyeMkbbZoeC3UOtNn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-30_03,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 priorityscore=1501 adultscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506300100 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, 30 Jun 2025 12:17:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219515 If recipe inherits bbclass kernelsrc to use kernel sources, the recipe should explicitly set ${KERNEL_VERSION} to ${PKGV} in task do_package, otherwise package version (${PV} is usually default 1.0) is not consistent with kernel source. For example, there are 5 recipes in meta-openembedded to inherit kernelsrc, but 4 recipes explicitly set PKGV. meta-openembedded$ grep -e "setVar(.*PKGV.*KERNEL_VERSION" -e kernelsrc -rn * meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb:9:inherit kernelsrc meta-oe/recipes-kernel/bpftool/bpftool.bb:8:inherit bash-completion kernelsrc kernel-arch meta-oe/recipes-kernel/bpftool/bpftool.bb:44: d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) meta-oe/recipes-kernel/cpupower/cpupower.bb:8:inherit kernelsrc kernel-arch bash-completion meta-oe/recipes-kernel/cpupower/cpupower.bb:32: d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) meta-oe/recipes-kernel/turbostat/turbostat.bb:98: d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb:25:inherit kernelsrc autotools-brokensep meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb:68: d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) meta-oe/recipes-kernel/spidev-test/spidev-test.bb:7:inherit bash-completion kernelsrc kernel-arch meta-oe/recipes-kernel/spidev-test/spidev-test.bb:26: d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) This commit moves the setting of PKGV to kernelsrc.bbclass for common use, the recipe (such as intel-speed-select) will not be required to set it explicitly Signed-off-by: Hongxu Jia --- meta/classes-recipe/kernelsrc.bbclass | 4 ++++ meta/recipes-kernel/perf/perf.bb | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/kernelsrc.bbclass b/meta/classes-recipe/kernelsrc.bbclass index ecb02dc9edc..93361842989 100644 --- a/meta/classes-recipe/kernelsrc.bbclass +++ b/meta/classes-recipe/kernelsrc.bbclass @@ -15,3 +15,7 @@ LOCAL_VERSION = "${@get_kernellocalversion_file("${STAGING_KERNEL_BUILDDIR}")}" inherit linux-kernel-base +# The final packages get the kernel version instead of the default 1.0 +python do_package:prepend() { + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) +} diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 157aca4d791..4f29bd5bbc3 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -385,10 +385,6 @@ do_configure:prepend () { done } -python do_package:prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) -} - PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" From patchwork Mon Jun 30 12:17:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 65855 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 E36A8C83032 for ; Mon, 30 Jun 2025 12:17:19 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.38826.1751285833340369371 for ; Mon, 30 Jun 2025 05:17:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9276563c86=hongxu.jia@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55U50m39028305 for ; Mon, 30 Jun 2025 12:17:12 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47j5m19t3a-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 30 Jun 2025 12:17:12 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.57; Mon, 30 Jun 2025 05:17:11 -0700 Received: from pek-lpg-core5.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Mon, 30 Jun 2025 05:17:10 -0700 From: Hongxu Jia To: Subject: [PATCH 2/2] kernel-devsrc: make package version consistent with kernel source Date: Mon, 30 Jun 2025 20:17:08 +0800 Message-ID: <20250630121708.4010323-2-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250630121708.4010323-1-hongxu.jia@windriver.com> References: <20250630121708.4010323-1-hongxu.jia@windriver.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjMwMDEwMCBTYWx0ZWRfX9bmQpRisaW4w Z1V2nPpxjpFkGaI0TeBUyDVum6ICQS6uS7T7jVhZ6/myHuJ/ObYPTqo7jKnIGW/ZHsnEho2A4o3 l2qnN5e8UxQ6tYR2vaazTAmyVR2J1y9Ts7DQOkqTBfml8MqhR34EThuOTwVmY1tou6+P5yIEdJV +LYYFngnDwY/piQpbmfbXZVxGjCm8hMd6gOTbipqj+CIxYSiqk4kMNdGy69NJGYkzg9hPK6U3DM lvleKL8kOyhR2uU3i5B+O0sYNL91ZzRF/FJsFF9p/2o7CM0wZNVPz8dMlLIg9ZB29862hY2pWSb r+AiZAMolcuvdKBdYAA9xMGK7PwV5f4fO3TmQaSM/KYz0Avyr3yYJGDFYEJ2S27n/K/vNPwPmlD Qw/Zub7Bfy8rimp5ITb6/sV9pNwS7JbwU1F0wA1KyGOxRuq3dub8aBozBCqthhf0CfUfq7/v X-Authority-Analysis: v=2.4 cv=IOsCChvG c=1 sm=1 tr=0 ts=68628048 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=6IFa9wvqVegA:10 a=t7CeM3EgAAAA:8 a=fKP2KVUKu4Y3BLxCb-wA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: bVZJNcdcX5oJtE4iUKWU0C-5sSi1kwo9 X-Proofpoint-ORIG-GUID: bVZJNcdcX5oJtE4iUKWU0C-5sSi1kwo9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-30_03,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 priorityscore=1501 adultscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506300100 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, 30 Jun 2025 12:17:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219516 The package version of kernel-devsrc is 1.0 which is not consistent with kernel source $ bitbake kernel-devsrc $ ls tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-* tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-1.0-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dbg-1.0-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dev-1.0-r0.qemux86_64.rpm After commit [kernelsrc.bbclass/perf: make package version consistent with kernel source] applied, it moved the setting of PKGV to kernelsrc.bbclass for common use. And bbclass kernelsrc has already inherited linux-kernel-base, this commit uses bbclass kernelsrc to instead of linux-kernel-base, and remove duplicated settings. After applying this commit: $ ls tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-* tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-6.12.31-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dbg-6.12.31-r0.qemux86_64.rpm tmp/work/qemux86_64-poky-linux/kernel-devsrc/1.0/deploy-rpms/qemux86_64/kernel-devsrc-dev-6.12.31-r0.qemux86_64.rpm Signed-off-by: Hongxu Jia --- meta/recipes-kernel/linux/kernel-devsrc.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 7ad848c35eb..3d2eb3929e6 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -7,7 +7,7 @@ SECTION = "kernel" LICENSE = "GPL-2.0-only" -inherit linux-kernel-base +inherit kernelsrc # Whilst not a module, this ensures we don't get multilib extended (which would make no sense) inherit module-base @@ -20,14 +20,10 @@ do_install[depends] += "virtual/kernel:do_shared_workdir" do_install[depends] += "virtual/kernel:do_install" # There's nothing to do here, except install the source where we can package it -do_fetch[noexec] = "1" -do_unpack[noexec] = "1" -do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" deltask do_populate_sysroot -S = "${STAGING_KERNEL_DIR}" B = "${STAGING_KERNEL_BUILDDIR}" PACKAGE_ARCH = "${MACHINE_ARCH}"