From 2ee46eed41567676009b8cdf70cbdd9d9a4ed58e Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 28 Apr 2025 15:09:21 +0800 Subject: 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 \n"); } [snip] Signed-off-by: Changqing Li Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/conf/version-check.conf | 1 + meta-oe/recipes-kernel/turbostat/turbostat.bb | 100 ++++++++++++++++++++++ meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 93 -------------------- 3 files changed, 101 insertions(+), 93 deletions(-) create mode 100644 meta-oe/recipes-kernel/turbostat/turbostat.bb delete mode 100644 meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb 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}.%" CHECK_VERSION_PV:pn-sg3-utils = "%" CHECK_VERSION_PV:pn-netperf = "2.7.%" CHECK_VERSION_PV:pn-bridge-utils = "1.7%" +CHECK_VERSION_PV:pn-turbostat = "2024.07.26" diff --git a/meta-oe/recipes-kernel/turbostat/turbostat.bb b/meta-oe/recipes-kernel/turbostat/turbostat.bb new file mode 100644 index 0000000000..8ac15164d4 --- /dev/null +++ b/meta-oe/recipes-kernel/turbostat/turbostat.bb @@ -0,0 +1,100 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +SUMMARY = "Frequency and Idle power monitoring tools for Linux" + +DESCRIPTION = "The turbostat tool allows you to determine the actual \ +processor frequency and idle power saving state residency on supported \ +processors." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' +COMPATIBLE_HOST:libc-musl = "null" + +KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}" +inherit linux-kernel-base + +SRC_URI += "\ + file://COPYING \ + " + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +DEPENDS = "libcap" + +# This looks in S, so we better make sure there's +# something in the directory. +# +do_populate_lic[depends] = "${PN}:do_configure" + + +EXTRA_OEMAKE = '\ + CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \ + ' + +# If we build under STAGING_KERNEL_DIR, source will not be put +# into the dbg rpm. STAGING_KERNEL_DIR will exist by the time +# do_configure() is invoked so we can safely copy from it. +# +do_configure[depends] += "virtual/kernel:do_shared_workdir" +do_configure:prepend() { + mkdir -p ${S} + cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S} + cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S} + if [ -f "${STAGING_KERNEL_DIR}/include/vdso/bits.h" ]; then + cp -r ${STAGING_KERNEL_DIR}/include/vdso/bits.h ${S} + cp -r ${STAGING_KERNEL_DIR}/include/vdso/const.h ${S} + else + cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} + cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} + fi + if [ -f "${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h" ]; then + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h ${S} + fi + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler.h ${S} + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler_types.h ${S} + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler-gcc.h ${S} + cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} +} + + +do_compile() { + sed -i 's##"bits.h"#' msr-index.h + sed -i 's##"compiler.h"#' build_bug.h + sed -i 's##"compiler_types.h"#' compiler.h + sed -i 's##"compiler-gcc.h"#' compiler_types.h + 'TMPCHECK='grep "" bits.h'' || true + if [ -n $TMPCHECK ]; then + sed -i 's##"const.h"#' bits.h + sed -i 's###' const.h + else + sed -i 's##"const.h"#' bits.h + sed -i -e 's###' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h + fi + echo '#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))' >> msr-index.h + echo "#define BIT(x) (1 << (x))" > bits.h + echo "#define BIT_ULL(nr) (1ULL << (nr))" >> bits.h + echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> bits.h + echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> bits.h + + sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c + sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c + sed -i 's#BUILD_BUG_HEADER#"build_bug.h"#' turbostat.c + sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile + oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} +} + +do_install() { + oe_runmake DESTDIR="${D}" install +} + +python do_package:prepend() { + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) +} diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb deleted file mode 100644 index cfe3bb9682..0000000000 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ /dev/null @@ -1,93 +0,0 @@ -# -# Copyright (C) 2013 Wind River Systems, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -SUMMARY = "Frequency and Idle power monitoring tools for Linux" - -DESCRIPTION = "The turbostat tool allows you to determine the actual \ -processor frequency and idle power saving state residency on supported \ -processors." - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -COMPATIBLE_HOST:libc-musl = "null" - -SRC_URI += "\ - file://COPYING \ - " - -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS = "libcap" - -# This looks in S, so we better make sure there's -# something in the directory. -# -do_populate_lic[depends] = "${PN}:do_configure" - - -EXTRA_OEMAKE = '\ - CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \ - ' - -# If we build under STAGING_KERNEL_DIR, source will not be put -# into the dbg rpm. STAGING_KERNEL_DIR will exist by the time -# do_configure() is invoked so we can safely copy from it. -# -do_configure[depends] += "virtual/kernel:do_shared_workdir" -do_configure:prepend() { - mkdir -p ${S} - cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S} - cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S} - if [ -f "${STAGING_KERNEL_DIR}/include/vdso/bits.h" ]; then - cp -r ${STAGING_KERNEL_DIR}/include/vdso/bits.h ${S} - cp -r ${STAGING_KERNEL_DIR}/include/vdso/const.h ${S} - else - cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} - cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} - fi - if [ -f "${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h" ]; then - cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h ${S} - fi - cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler.h ${S} - cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler_types.h ${S} - cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler-gcc.h ${S} - cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} -} - - -do_compile() { - sed -i 's##"bits.h"#' msr-index.h - sed -i 's##"compiler.h"#' build_bug.h - sed -i 's##"compiler_types.h"#' compiler.h - sed -i 's##"compiler-gcc.h"#' compiler_types.h - 'TMPCHECK='grep "" bits.h'' || true - if [ -n $TMPCHECK ]; then - sed -i 's##"const.h"#' bits.h - sed -i 's###' const.h - else - sed -i 's##"const.h"#' bits.h - sed -i -e 's###' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h - fi - echo '#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))' >> msr-index.h - echo "#define BIT(x) (1 << (x))" > bits.h - echo "#define BIT_ULL(nr) (1ULL << (nr))" >> bits.h - echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> bits.h - echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> bits.h - - sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c - sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c - sed -i 's#BUILD_BUG_HEADER#"build_bug.h"#' turbostat.c - sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile - oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} -} - -do_install() { - oe_runmake DESTDIR="${D}" install -} -- cgit v1.2.3-54-g00ecf