From 7125141c98b8fbd6df66e99f01a87ac21074d90a Mon Sep 17 00:00:00 2001 From: doriscchao Date: Thu, 16 Nov 2023 14:54:46 +0800 Subject: [PATCH 1/4] add 5000-lscpu-arm-add-type-S5000C.patch to add S5000C type --- SOURCES/5000-lscpu-arm-add-type-S5000C.patch | 11 +++++++++++ SPECS/util-linux.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 SOURCES/5000-lscpu-arm-add-type-S5000C.patch diff --git a/SOURCES/5000-lscpu-arm-add-type-S5000C.patch b/SOURCES/5000-lscpu-arm-add-type-S5000C.patch new file mode 100644 index 0000000..8653cba --- /dev/null +++ b/SOURCES/5000-lscpu-arm-add-type-S5000C.patch @@ -0,0 +1,11 @@ +diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c +index 79b8e3a..46569be 100644 +--- a/sys-utils/lscpu-arm.c ++++ b/sys-utils/lscpu-arm.c +@@ -191,6 +191,7 @@ static const struct id_part hisi_part[] = { +static const struct id_part ft_part[] = { +     { 0x662, "FT-2000+" }, +     { 0x663, "S2500" }, ++    { 0x862, "S5000C" }, +     { -1, "unknown" }, +}; diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec index 4a1296d..db58da9 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: 42%{?dist} +Release: 42%{?dist}.1 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 @@ -284,6 +284,8 @@ Patch92: 0092-last-use-full-size-of-the-username.patch Patch93: 0093-include-c-add-cmp_timespec-and-cmp_stat_mtime.patch Patch94: 0094-mount-add-hint-about-systemctl-daemon-reload.patch +# lscpu-arm add type S5000C +Patch5000: 5000-lscpu-arm-add-type-S5000C.patch %description The util-linux package contains a large variety of low-level system @@ -1132,6 +1134,9 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Thu Nov 16 2023 Doris Chao - 2.32.1-42.oc8.1 +- add 5000-lscpu-arm-add-type-S5000C.patch to add S5000C type + * Thu Mar 30 2023 Karel Zak 2.32.1-42 - fix #2180413 - Backport hint about systemd daemon-reload -- Gitee From 746ed6026cc11be97f5a5cf627716ac011f44d4b Mon Sep 17 00:00:00 2001 From: doriscchao Date: Thu, 16 Nov 2023 16:25:24 +0800 Subject: [PATCH 2/4] add 5000-lscpu-arm-add-type-S5000C.patch to add arm type FT-2000+,S2500 and S5000C --- ...dd-arm_part-FT-2000-S2500S-and-5000C.patch | 26 +++++++++++++++++++ SOURCES/5000-lscpu-arm-add-type-S5000C.patch | 11 -------- 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch delete mode 100644 SOURCES/5000-lscpu-arm-add-type-S5000C.patch diff --git a/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch b/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch new file mode 100644 index 0000000..b6e08b4 --- /dev/null +++ b/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch @@ -0,0 +1,26 @@ +From 05e76e936da2a48720f3faa192af5673040a5a68 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Thu, 16 Nov 2023 15:50:26 +0800 +Subject: [PATCH] lscpu-arm.c add arm_part FT-2000+ S2500S and 5000C + +--- + sys-utils/lscpu-arm.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c +index 2b178a7..4260be9 100644 +--- a/sys-utils/lscpu-arm.c ++++ b/sys-utils/lscpu-arm.c +@@ -82,6 +82,9 @@ static const struct id_part arm_part[] = { + { 0xd42, "Cortex-A78AE" }, + { 0xd4a, "Neoverse-E1" }, + { 0xd4b, "Cortex-A78C" }, ++ { 0x662, "FT-2000+" }, ++ { 0x663, "S2500" }, ++ { 0x862, "S5000C" }, + { -1, "unknown" }, + }; + +-- +2.31.1 + diff --git a/SOURCES/5000-lscpu-arm-add-type-S5000C.patch b/SOURCES/5000-lscpu-arm-add-type-S5000C.patch deleted file mode 100644 index 8653cba..0000000 --- a/SOURCES/5000-lscpu-arm-add-type-S5000C.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c -index 79b8e3a..46569be 100644 ---- a/sys-utils/lscpu-arm.c -+++ b/sys-utils/lscpu-arm.c -@@ -191,6 +191,7 @@ static const struct id_part hisi_part[] = { -static const struct id_part ft_part[] = { -     { 0x662, "FT-2000+" }, -     { 0x663, "S2500" }, -+    { 0x862, "S5000C" }, -     { -1, "unknown" }, -}; -- Gitee From 78fe19a62e797ec7fb749a8cbe83f4943413aed5 Mon Sep 17 00:00:00 2001 From: doriscchao Date: Thu, 16 Nov 2023 16:58:12 +0800 Subject: [PATCH 3/4] add 5000-lscpu-arm-add-type-S5000C.patch to add arm type FT-2000+,S2500 and S5000C --- SPECS/util-linux.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec index db58da9..7f6d269 100644 --- a/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec @@ -284,8 +284,8 @@ Patch92: 0092-last-use-full-size-of-the-username.patch Patch93: 0093-include-c-add-cmp_timespec-and-cmp_stat_mtime.patch Patch94: 0094-mount-add-hint-about-systemctl-daemon-reload.patch -# lscpu-arm add type S5000C -Patch5000: 5000-lscpu-arm-add-type-S5000C.patch +# lscpu-arm add type FT-2000+ S2500S and 5000C +Patch5000: 0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch %description The util-linux package contains a large variety of low-level system @@ -1135,7 +1135,8 @@ fi %changelog * Thu Nov 16 2023 Doris Chao - 2.32.1-42.oc8.1 -- add 5000-lscpu-arm-add-type-S5000C.patch to add S5000C type +- add 5000-lscpu-arm-add-type-S5000C.patch to add arm type FT-2000+,S2500 + and S5000C * Thu Mar 30 2023 Karel Zak 2.32.1-42 - fix #2180413 - Backport hint about systemd daemon-reload -- Gitee From 5621c7b4bf7d3b7a9ec6098f6b0a57d7cdd5306d Mon Sep 17 00:00:00 2001 From: doriscchao Date: Thu, 16 Nov 2023 17:09:51 +0800 Subject: [PATCH 4/4] format --- ...1-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch b/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch index b6e08b4..ec6c4be 100644 --- a/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch +++ b/SOURCES/0001-lscpu-arm.c-add-arm_part-FT-2000-S2500S-and-5000C.patch @@ -1,8 +1,3 @@ -From 05e76e936da2a48720f3faa192af5673040a5a68 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Thu, 16 Nov 2023 15:50:26 +0800 -Subject: [PATCH] lscpu-arm.c add arm_part FT-2000+ S2500S and 5000C - --- sys-utils/lscpu-arm.c | 3 +++ 1 file changed, 3 insertions(+) -- Gitee