All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] kernelsrc.bbclass/perf: make package version consistent with kernel source
@ 2025-06-30 12:17 Hongxu Jia
  2025-06-30 12:17 ` [PATCH 2/2] kernel-devsrc: " Hongxu Jia
  2025-07-02  1:40 ` [OE-core] [PATCH 1/2] kernelsrc.bbclass/perf: " Bruce Ashfield
  0 siblings, 2 replies; 5+ messages in thread
From: Hongxu Jia @ 2025-06-30 12:17 UTC (permalink / raw)
  To: openembedded-core

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 <hongxu.jia@windriver.com>
---
 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"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-02  2:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-30 12:17 [PATCH 1/2] kernelsrc.bbclass/perf: make package version consistent with kernel source Hongxu Jia
2025-06-30 12:17 ` [PATCH 2/2] kernel-devsrc: " Hongxu Jia
2025-07-02  1:42   ` [OE-core] " Bruce Ashfield
2025-07-02  1:40 ` [OE-core] [PATCH 1/2] kernelsrc.bbclass/perf: " Bruce Ashfield
2025-07-02  2:44   ` [PATCH V2 1/2] kernelsrc.bbclass/perf: clean up package version while using " Hongxu Jia

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.