From f4f8d014fec8df1d7dd41a891c3f9020979ad2fe Mon Sep 17 00:00:00 2001 From: wangkaiyuan Date: Tue, 15 Nov 2022 01:58:31 -0500 Subject: [PATCH] Hide CompatibleKernel in anaconda on Phytium Sever CPU Signed-off-by: wangkaiyuan --- ...ernel-in-anaconda-on-Phytium-Sever-C.patch | 33 +++++++++++++++++++ anaconda.spec | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-Hide-CompatibleKernel-in-anaconda-on-Phytium-Sever-C.patch diff --git a/0001-Hide-CompatibleKernel-in-anaconda-on-Phytium-Sever-C.patch b/0001-Hide-CompatibleKernel-in-anaconda-on-Phytium-Sever-C.patch new file mode 100644 index 0000000..5f8e573 --- /dev/null +++ b/0001-Hide-CompatibleKernel-in-anaconda-on-Phytium-Sever-C.patch @@ -0,0 +1,33 @@ +From a86a1920f6d72ef3a748ccaf530a88a5ac58d5e3 Mon Sep 17 00:00:00 2001 +From: wangkaiyuan +Date: Wed, 2 Nov 2022 23:02:52 -0400 +Subject: [PATCH] Hide CompatibleKernel in anaconda on Phytium Sever CPU + +Signed-off-by: wangkaiyuan +--- + pyanaconda/payload/dnf/payload.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyanaconda/payload/dnf/payload.py b/pyanaconda/payload/dnf/payload.py +index aca7c07..bbe73a8 100644 +--- a/pyanaconda/payload/dnf/payload.py ++++ b/pyanaconda/payload/dnf/payload.py +@@ -783,13 +783,13 @@ class DNFPayload(Payload): + def isCompatibleKernel(self, kernel_version): + # ZHAOXIN KaiSheng KH-37800D@2.7GHz + # Hygon C86 7280 32-core Processor +- # Phytium,D2000/8 ++ # Phytium,D2000/8,FT-2000+/64,S2500,FT2004 + if kernel_version == "4.18.0": + f_cpuinfo = os.popen('dmidecode -s processor-version') + cpuinfo = f_cpuinfo.readlines() + f_cpuinfo.close() + for line in cpuinfo: +- if "Hygon" in line or "ZHAOXIN" in line or "Phytium" in line: ++ if "Hygon" in line or "ZHAOXIN" in line or "Phytium" in line or "FT-2000+/64" in line or "S2500" in line or "FT2004" in line: + return False + return True + +-- +2.31.1 + diff --git a/anaconda.spec b/anaconda.spec index d13dbaf..b86ac8c 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.6 +%define anolis_release .0.7 Summary: Graphical system installer Name: anaconda Version: 33.16.6.7 @@ -24,6 +24,7 @@ Patch0007: 0007-install-fix-anolis-bootloader.patch Patch0008: 0008-install-fix-kernel-spoke-notify.patch Patch0009: 0001-add-BOOTLOONGARCH64.EFI-for-anaconda-to-support-new-firmware.patch Patch0010: 0009-Fix-smt-description.patch +Patch0011: 0001-Hide-CompatibleKernel-in-anaconda-on-Phytium-Sever-C.patch # End of Anolis patches # Versions of required components (done so we make sure the buildrequires @@ -377,6 +378,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Nov 15 2022 wangkaiyuan - 33.16.6.7-1.0.7 +- Hide CompatibleKernel in anaconda on Phytium Sever CPU + * Wed Nov 09 2022 Chang Gao - 33.16.6.7-1.0.6 - Rebrand the smt warning description -- Gitee