summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2025-04-28 15:09:21 +0800
committerArmin Kuster <akuster808@gmail.com>2025-05-17 11:56:50 -0600
commit2ee46eed41567676009b8cdf70cbdd9d9a4ed58e (patch)
treef8147285a4ed3566f44f48d425b0df508066523f
parentb53719841897b0f8147e878c0e75c87abb29e467 (diff)
downloadmeta-openembedded-2ee46eed41567676009b8cdf70cbdd9d9a4ed58e.tar.gz
turbostat: make turbostat's version align with kernel version
* Current PV 3.4 is the kernel version when the recipe is newly added, set PKGV to KERNEL_VERSION to make it always align with kernel version * turbostat has its runtime version, set CHECK_VERSION_PV to this version to mute the version mismatch warning [snip of turbostat.c] void print_version() { fprintf(outf, "turbostat version 2024.07.26 - Len Brown <lenb@kernel.org>\n"); } [snip] Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/conf/version-check.conf1
-rw-r--r--meta-oe/recipes-kernel/turbostat/turbostat.bb (renamed from meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb)7
2 files changed, 8 insertions, 0 deletions
diff --git a/meta-oe/conf/version-check.conf b/meta-oe/conf/version-check.conf
index ecc8802565..7193ece705 100644
--- a/meta-oe/conf/version-check.conf
+++ b/meta-oe/conf/version-check.conf
@@ -22,3 +22,4 @@ CHECK_VERSION_PV:pn-luajit = "${PV}.%"
22CHECK_VERSION_PV:pn-sg3-utils = "%" 22CHECK_VERSION_PV:pn-sg3-utils = "%"
23CHECK_VERSION_PV:pn-netperf = "2.7.%" 23CHECK_VERSION_PV:pn-netperf = "2.7.%"
24CHECK_VERSION_PV:pn-bridge-utils = "1.7%" 24CHECK_VERSION_PV:pn-bridge-utils = "1.7%"
25CHECK_VERSION_PV:pn-turbostat = "2024.07.26"
diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat.bb
index cfe3bb9682..8ac15164d4 100644
--- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
+++ b/meta-oe/recipes-kernel/turbostat/turbostat.bb
@@ -16,6 +16,9 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b
16COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' 16COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
17COMPATIBLE_HOST:libc-musl = "null" 17COMPATIBLE_HOST:libc-musl = "null"
18 18
19KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}"
20inherit linux-kernel-base
21
19SRC_URI += "\ 22SRC_URI += "\
20 file://COPYING \ 23 file://COPYING \
21 " 24 "
@@ -91,3 +94,7 @@ do_compile() {
91do_install() { 94do_install() {
92 oe_runmake DESTDIR="${D}" install 95 oe_runmake DESTDIR="${D}" install
93} 96}
97
98python do_package:prepend() {
99 d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
100}