| Message ID | 20261112021419.795130-1-ricardo.salveti@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,v2] cpupower: split cpufreq-bench into cpupower-bench | expand |
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 37c7d8c446..9158b9acf1 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -53,7 +53,7 @@ RDEPENDS:packagegroup-meta-oe = "\ RDEPENDS:packagegroup-meta-oe-benchmarks = "\ bonnie++ \ coremark-pro \ - cpupower \ + cpupower-bench \ dbench \ dhrystone \ fio \ diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb index a8cdf1bf0a..789df415fe 100644 --- a/meta-oe/recipes-kernel/cpupower/cpupower.bb +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb @@ -27,11 +27,12 @@ do_install() { } PACKAGE_ARCH = "${MACHINE_ARCH}" -PACKAGES =+ "${PN}-systemd" +PACKAGES =+ "${PN}-bench ${PN}-systemd" +FILES:${PN}-bench = "${sbindir}/cpufreq-bench ${bindir}/cpufreq-bench_plot.sh ${sysconfdir}/cpufreq-bench.conf" FILES:${PN}-systemd = "${sysconfdir}/cpupower-service.conf ${systemd_system_unitdir}" -RDEPENDS:${PN} = "bash" +RDEPENDS:${PN}-bench = "bash" python do_package:prepend() { d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
The kernel's cpupower Makefile builds cpufreq-bench by default and installs its cpufreq-bench_plot.sh helper, a bash script, into ${bindir}. That makes the whole cpupower package RDEPEND on bash, which pulls bash into images that only want the cpupower tool, such as busybox based initramfs images. Move cpufreq-bench, its plot script and its configuration file to cpupower-bench and carry the bash dependency there. Images that use cpufreq-bench now need to install cpupower-bench, so switch the benchmarks packagegroup to it. AI-Generated: Uses Claude Code Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com> --- v2: rebased on master-next (on top of "cpupower: Install systemd unit into systemd_system_unitdir"). meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- meta-oe/recipes-kernel/cpupower/cpupower.bb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)