From 863b9a41336a2db0df1ecb83f279aefccd384953 Mon Sep 17 00:00:00 2001 From: Cupcake Date: Thu, 27 Feb 2025 23:06:27 +0800 Subject: [PATCH] backport community patches --- ...port-lscpu-add-riscv-cputype-support.patch | 26 +++++++++++++++++++ util-linux.spec | 10 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 backport-lscpu-add-riscv-cputype-support.patch diff --git a/backport-lscpu-add-riscv-cputype-support.patch b/backport-lscpu-add-riscv-cputype-support.patch new file mode 100644 index 0000000..4e62ae6 --- /dev/null +++ b/backport-lscpu-add-riscv-cputype-support.patch @@ -0,0 +1,26 @@ +From f2d35154e52052e315a193900157dc9a0e2f3fb9 Mon Sep 17 00:00:00 2001 +From: Yunhui Cui +Date: Mon, 19 Feb 2024 17:34:17 +0800 +Subject: [PATCH] lscpu: add RISC-V CPUTYPE support + +Only after adding cpu type can print the remaining cpu information, +such as cacheinfo. + +Signed-off-by: Yunhui Cui +Signed-off-by: yuanchicheng +--- + sys-utils/lscpu-cputype.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c +index bcdf06e8db0..4ca3d353299 100644 +--- a/sys-utils/lscpu-cputype.c ++++ b/sys-utils/lscpu-cputype.c +@@ -212,6 +212,7 @@ + DEF_PAT_CPUTYPE( "family", PAT_FAMILY, family), + DEF_PAT_CPUTYPE( "features", PAT_FEATURES, flags), /* s390 */ + DEF_PAT_CPUTYPE( "flags", PAT_FLAGS, flags), /* x86 */ ++ DEF_PAT_CPUTYPE( "hart isa", PAT_ISA, isa), /* riscv */ + DEF_PAT_CPUTYPE( "max thread id", PAT_MAX_THREAD_ID, mtid), /* s390 */ + DEF_PAT_CPUTYPE( "model", PAT_MODEL, model), + DEF_PAT_CPUTYPE( "model name", PAT_MODEL_NAME, modelname), diff --git a/util-linux.spec b/util-linux.spec index f6227c5..b55ea02 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 16 +Release: 17 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -93,6 +93,7 @@ Patch6071: backport-lsmem-make-lsmem-to-check-for-the-nodes-more-robust.pat Patch6072: backport-cfdisk-fix-possible-integer-overflow-coverity-scan.patch Patch6073: backport-more-make-sure-we-have-data-on-stderr.patch Patch6074: backport-libblkid-apfs-validate-checksums.patch +Patch6075: backport-lscpu-add-riscv-cputype-support.patch Patch9000: SKIPPED-no-root-permissions-test.patch Patch9001: util-linux-Add-sw64-architecture.patch @@ -474,6 +475,13 @@ fi %endif %changelog +* Fri Feb 28 2025 yuanchicheng - 2.39.1-17 +- Type: bugfix +- CVE: NA +- SUG: NA +- DESC: backport community patches + backport-lscpu-add-riscv-cputype-support.patch + * Mon Dec 16 2024 yanglongkang - 2.39.1-16 - Type: bugfix - CVE: NA -- Gitee