backport community patches

This commit is contained in:
Cupcake 2025-02-27 23:06:27 +08:00
parent a76cd894f6
commit 863b9a4133
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From f2d35154e52052e315a193900157dc9a0e2f3fb9 Mon Sep 17 00:00:00 2001
From: Yunhui Cui <cuiyunhui@bytedance.com>
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 <cuiyunhui@bytedance.com>
Signed-off-by: yuanchicheng <chicheng.oerv@isrc.iscas.ac.cn>
---
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),

View File

@ -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 <chicheng.oerv@isrc.iscas.ac.cn> - 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 <yanglongkang@h-partners.com> - 2.39.1-16
- Type: bugfix
- CVE: NA