From b3072366287837bb91d84fe37ce806795fca7072 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2021 06:12:13 +0000 Subject: import util-linux-2.32.1-27.el8 --- diff --git a/SOURCES/0054-lscpu-show-physical-socket-on-aarch64-without-ACPI-P.patch b/SOURCES/0054-lscpu-show-physical-socket-on-aarch64-without-ACPI-P.patch index 03697cd..22ad472 100644 --- a/SOURCES/0054-lscpu-show-physical-socket-on-aarch64-without-ACPI-P.patch +++ b/SOURCES/0054-lscpu-show-physical-socket-on-aarch64-without-ACPI-P.patch @@ -1,7 +1,7 @@ -From 5b20e51f98798161138f0758af845c43931f59ba Mon Sep 17 00:00:00 2001 +From ac6651b2bc599af707ccc96936bb028d31c1aea8 Mon Sep 17 00:00:00 2001 From: Masayoshi Mizuma Date: Fri, 11 Sep 2020 09:53:28 -0400 -Subject: [PATCH 54/55] lscpu: show physical socket on aarch64 without ACPI +Subject: [PATCH 54/56] lscpu: show physical socket on aarch64 without ACPI PPTT Show the number of physical socket even if the sysfs doesn't have @@ -9,14 +9,16 @@ the physical socket information. Note, lscpu cannot show the number of socket info for unprivileged users because it needs to access the DMI table. +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1883056 Signed-off-by: Masayoshi Mizuma +Signed-off-by: Karel Zak --- sys-utils/lscpu.c | 6 ++++-- sys-utils/lscpu.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c -index a8b448fa0..45fcb08cf 100644 +index a8b448fa0..dc6dc97c3 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -1850,8 +1850,10 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod) @@ -27,7 +29,7 @@ index a8b448fa0..45fcb08cf 100644 - add_summary_n(tb, _("Socket(s):"), desc->nr_socket_on_cluster); + int sockets = get_number_of_physical_sockets_from_dmi(); + -+ if (sockets) ++ if (sockets > 0) + add_summary_n(tb, _("Socket(s):"), sockets); else add_summary_s(tb, _("Socket(s):"), "-"); diff --git a/SOURCES/0055-lscpu-arm-read-vendor-and-model-from-BIOS.patch b/SOURCES/0055-lscpu-arm-read-vendor-and-model-from-BIOS.patch index 72954ff..44ef972 100644 --- a/SOURCES/0055-lscpu-arm-read-vendor-and-model-from-BIOS.patch +++ b/SOURCES/0055-lscpu-arm-read-vendor-and-model-from-BIOS.patch @@ -1,7 +1,7 @@ -From 880958fe818c5bc9fb4a1a1cdcd241d90e7fb179 Mon Sep 17 00:00:00 2001 +From 7089a63d03b35743de533686906c451b917d0909 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 16 Dec 2020 13:08:51 +0100 -Subject: [PATCH 55/55] lscpu: (arm) read vendor and model from BIOS +Subject: [PATCH 55/56] lscpu: (arm) read vendor and model from BIOS This patch backports the current upstream code to read CPU vendor and model name from BIOS. @@ -77,7 +77,7 @@ index 31127f48a..3bdd7dcb2 100644 + return 0; +} diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c -index 45fcb08cf..0a4926e65 100644 +index dc6dc97c3..70a797dd6 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -1868,6 +1868,8 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod) diff --git a/SOURCES/0056-tests-update-sfdisk-resize.patch b/SOURCES/0056-tests-update-sfdisk-resize.patch index 2897961..ebf256d 100644 --- a/SOURCES/0056-tests-update-sfdisk-resize.patch +++ b/SOURCES/0056-tests-update-sfdisk-resize.patch @@ -1,7 +1,7 @@ -From feb4b6cd1422d6ea9063be5f02338357b039a058 Mon Sep 17 00:00:00 2001 +From 2193cfc5ee3f417e276c181fe39455646399153b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 17 Sep 2018 16:22:14 +0200 -Subject: [PATCH] tests: update sfdisk resize +Subject: [PATCH 56/56] tests: update sfdisk resize Upstream: http://github.com/karelzak/util-linux/commit/a1b463d94afdae65ab5bfb192a58f1ceeb13679a Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1900498 diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec index 76385f0..bbf8f05 100644 --- a/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.32.1 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -1070,6 +1070,9 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Tue Jan 19 2021 Karel Zak 2.32.1-27 +- update lscpu-show-physical-socket-on-aarch64-without-ACPI-P.patch (#1882740) + * Wed Dec 16 2020 Karel Zak 2.32.1-26 - update regression tests (related to #1900498)