diff --git a/.util-linux.metadata b/.util-linux.metadata new file mode 100644 index 0000000..a2762b7 --- /dev/null +++ b/.util-linux.metadata @@ -0,0 +1 @@ +6e6c49c1dbb288b90b933e4328bde4786172f021 util-linux-2.37.4.tar.xz diff --git a/0076-lscpu-update-tests-follow-max-freq-for-scaling.patch b/0076-lscpu-update-tests-follow-max-freq-for-scaling.patch index 5be9b32..59fb753 100644 --- a/0076-lscpu-update-tests-follow-max-freq-for-scaling.patch +++ b/0076-lscpu-update-tests-follow-max-freq-for-scaling.patch @@ -1,4 +1,4 @@ -From c24caf60a92b8e8dbfbc6a00920fa2a59d5a02d0 Mon Sep 17 00:00:00 2001 +From a2a2e7129a418693bfe63bf35fc5d4ea38210f58 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 8 Feb 2024 10:36:08 +0100 Subject: lscpu: update tests, follow max freq for scaling @@ -7,12 +7,13 @@ Addresses: https://issues.redhat.com/browse/RHEL-12783 Signed-off-by: Karel Zak --- sys-utils/lscpu-topology.c | 3 +++ + tests/expected/lscpu/lscpu-armv7 | 1 + tests/expected/lscpu/lscpu-vbox-win | 1 + tests/expected/lscpu/lscpu-vmware_fpe | 1 + tests/expected/lscpu/lscpu-x86_64-64cpu | 1 + tests/expected/lscpu/lscpu-x86_64-dell_e4310 | 1 + tests/expected/lscpu/lscpu-x86_64-epyc_7451 | 1 + - 6 files changed, 8 insertions(+) + 7 files changed, 9 insertions(+) diff --git a/sys-utils/lscpu-topology.c b/sys-utils/lscpu-topology.c index fe4da7cd5..23021df72 100644 @@ -28,6 +29,18 @@ index fe4da7cd5..23021df72 100644 if (cpu->type && (cpu->mhz_min_freq || cpu->mhz_max_freq)) cpu->type->has_freq = 1; +diff --git a/tests/expected/lscpu/lscpu-armv7 b/tests/expected/lscpu/lscpu-armv7 +index 7f1c726c1..27deb8099 100644 +--- a/tests/expected/lscpu/lscpu-armv7 ++++ b/tests/expected/lscpu/lscpu-armv7 +@@ -7,6 +7,7 @@ Thread(s) per core: 1 + Core(s) per socket: 2 + Socket(s): 1 + Stepping: r0p4 ++CPU(s) scaling MHz: 12% + CPU max MHz: 1700.0000 + CPU min MHz: 200.0000 + BogoMIPS: 1694.10 diff --git a/tests/expected/lscpu/lscpu-vbox-win b/tests/expected/lscpu/lscpu-vbox-win index ab8a25c2c..bc0ed4cb6 100644 --- a/tests/expected/lscpu/lscpu-vbox-win diff --git a/util-linux.spec b/util-linux.spec index 44c4a08..cf475f2 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.37.4 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: http://en.wikipedia.org/wiki/Util-linux @@ -1053,6 +1053,9 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Thu Feb 08 2024 Karel Zak 2.37.4-18 +- lscpu: another tests update (RHEL-12783) + * Thu Feb 08 2024 Karel Zak 2.37.4-17 - lscpu: update tests, follow max freq for scaling (RHEL-12783)