packages/util-linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!7 util-linux

Browse Source 
Merge pull request !7 from syyhao/dev35
This commit is contained in:
openeuler-ci-bot 2020-03-20 15:22:17 +08:00 committed by Gitee
commit 870ed88211
3 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lscpu-Add-HiSilicon-aarch64-tsv110-cpupart.patch Normal file
View File

@ -0,0 +1,42 @@
From 6f00af5b3c7aadd1322424a84661cfdac83146eb Mon Sep 17 00:00:00 2001
From: John Garry <john.garry@huawei.com>
Date: Tue, 8 Oct 2019 21:12:21 +0800
Subject: [PATCH] lscpu: Add HiSilicon aarch64 tsv110 cpupart
Add an entry for the HiSilicon aarch64 part tsv110.
Another known alias for this part is TaishanV110, and it can be
found in the Kunpeng920/Hi1620 SoC.
Signed-off-by: John Garry <john.garry@huawei.com>
---
sys-utils/lscpu-arm.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
index fd9ab3f..b45cbe3 100644
--- a/sys-utils/lscpu-arm.c
+++ b/sys-utils/lscpu-arm.c
@@ -170,6 +170,11 @@ static const struct id_part intel_part[] = {
{ -1, "unknown" },
};
+static const struct id_part hisi_part[] = {
+ { 0xd01, "tsv110" },
+ { -1, "unknown" },
+};
+
static const struct id_part unknown_part[] = {
{ -1, "unknown" },
};
@@ -185,6 +190,7 @@ static const struct hw_impl hw_implementer[] = {
{ 0x42, brcm_part, "Broadcom" },
{ 0x43, cavium_part, "Cavium" },
{ 0x44, dec_part, "DEC" },
+ { 0x48, hisi_part, "HiSilicon" },
{ 0x4e, nvidia_part, "Nvidia" },
{ 0x50, apm_part, "APM" },
{ 0x51, qcom_part, "Qualcomm" },
--
1.8.3.1

36
lscpu-use-official-name-for-HiSilicon-tsv110.patch Normal file
View File

@ -0,0 +1,36 @@
From 8243036cae35c1be6992b0ef722d68585589d7d7 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 4 Mar 2020 12:54:24 +0100
Subject: [PATCH] lscpu: use official name for HiSilicon tsv110
Addresses: https://github.com/karelzak/util-linux/issues/969
Signed-off-by: Karel Zak <kzak@redhat.com>
---
sys-utils/lscpu-arm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
index b45cbe3..ef9d1ff 100644
--- a/sys-utils/lscpu-arm.c
+++ b/sys-utils/lscpu-arm.c
@@ -171,7 +171,7 @@ static const struct id_part intel_part[] = {
};
static const struct id_part hisi_part[] = {
- { 0xd01, "tsv110" },
+ { 0xd01, "Kunpeng-920" }, /* aka tsv110 */
{ -1, "unknown" },
};
@@ -190,7 +190,7 @@ static const struct hw_impl hw_implementer[] = {
{ 0x42, brcm_part, "Broadcom" },
{ 0x43, cavium_part, "Cavium" },
{ 0x44, dec_part, "DEC" },
- { 0x48, hisi_part, "HiSilicon" },
+ { 0x48, hisi_part, "HiSilicon" },
{ 0x4e, nvidia_part, "Nvidia" },
{ 0x50, apm_part, "APM" },
{ 0x51, qcom_part, "Qualcomm" },
--
1.8.3.1

12
util-linux.spec
View File

@ -2,7 +2,7 @@
Name: util-linux
Version: 2.34
Release: 4
Release: 5
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
@ -38,6 +38,8 @@ Patch0000: 2.28-login-lastlog-create.patch
Patch0001: fdisk-fix-quit-dialog-for-non-libreadline-version.patch
Patch0002: libmount-move-already-mounted-code-to-separate-funct.patch
Patch0003: libmount-try-read-only-mount-on-write-protected-supe.patch
Patch0004: lscpu-Add-HiSilicon-aarch64-tsv110-cpupart.patch
Patch0005: lscpu-use-official-name-for-HiSilicon-tsv110.patch
%description
The util-linux package contains a random collection of files that
@ -380,6 +382,14 @@ fi
%{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
%changelog
* Fri Mar 20 2020 openEuler Buildteam <buildteam@openeuler.org
> - 2.34-5
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:Add an entry for the HiSilicon aarch64 part tsv110 and
use official name for HiSilicon tsv110
* Thu Mar 5 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.34-4
- Type:enhancement
- ID:NA