From fcb1a984a8c1567977ca2864be7df9a9684f0c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=90=8E=E9=93=B6?= <@kanghou-silver> Date: Wed, 17 Apr 2024 19:06:24 +0800 Subject: [PATCH] add sw8a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 康后银 Signed-off-by: Weisson --- rpm-4.14.3-sw8a.patch | 72 +++++++++++++++++++++++++++++++++++++++++++ rpm.spec | 7 ++++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 rpm-4.14.3-sw8a.patch diff --git a/rpm-4.14.3-sw8a.patch b/rpm-4.14.3-sw8a.patch new file mode 100644 index 0000000..6e98eaa --- /dev/null +++ b/rpm-4.14.3-sw8a.patch @@ -0,0 +1,72 @@ +diff -uNar rpm-4.14.3.org/lib/rpmrc.c rpm-4.14.3.new/lib/rpmrc.c +--- rpm-4.14.3.org/lib/rpmrc.c 2024-04-17 17:09:56.322914055 +0800 ++++ rpm-4.14.3.new/lib/rpmrc.c 2024-04-17 17:12:14.035829226 +0800 +@@ -1250,7 +1250,7 @@ + + # if defined(__GNUC__) && defined(__alpha__) + { +- strcpy(un.machine, "sw_64sw6b"); ++ strcpy(un.machine, "sw_64sw8a"); + } + # endif + +diff -uNar rpm-4.14.3.org/macros.in rpm-4.14.3.new/macros.in +--- rpm-4.14.3.org/macros.in 2024-04-17 17:09:56.310913540 +0800 ++++ rpm-4.14.3.new/macros.in 2024-04-17 17:11:21.152557731 +0800 +@@ -1155,7 +1155,7 @@ + + #------------------------------------------------------------------------------ + # arch macro for all supported Sw_64 processors +-%sw_64 sw_64 sw_64sw6b ++%sw_64 sw_64 sw_64sw8a + + #------------------------------------------------------------------------------ + # arch macro for all supported Alpha processors +diff -uNar rpm-4.14.3.org/rpmrc.in rpm-4.14.3.new/rpmrc.in +--- rpm-4.14.3.org/rpmrc.in 2024-04-17 17:09:56.309913497 +0800 ++++ rpm-4.14.3.new/rpmrc.in 2024-04-17 17:13:44.157700226 +0800 +@@ -26,7 +26,7 @@ + optflags: ia32e -O2 -g + + optflags: sw_64 -O2 -g -mieee +-optflags: sw_64sw6b -O2 -g -mieee -mtune=sw6b ++optflags: sw_64sw8a -O2 -g -mieee -mtune=sw8a + + optflags: alpha -O2 -g -mieee + optflags: alphaev5 -O2 -g -mieee -mtune=ev5 +@@ -178,7 +178,7 @@ + arch_canon: em64t: em64t 1 + + arch_canon: sw_64: sw_64 2 +-arch_canon: sw_64sw6b: sw_64sw6b 2 ++arch_canon: sw_64sw8a: sw_64sw8a 2 + + arch_canon: alpha: alpha 2 + arch_canon: alphaev5: alphaev5 2 +@@ -318,7 +318,7 @@ + buildarchtranslate: i386: i386 + + buildarchtranslate: sw_64: sw_64 +-buildarchtranslate: sw_64sw6b: sw_64 ++buildarchtranslate: sw_64sw8a: sw_64 + + buildarchtranslate: alphaev5: alpha + buildarchtranslate: alphaev56: alpha +@@ -412,7 +412,7 @@ + arch_compat: alphaev5: alpha + arch_compat: alpha: axp noarch + +-arch_compat: sw_64sw6b: sw_64 ++arch_compat: sw_64sw8a: sw_64 + arch_compat: sw_64: axp noarch + + arch_compat: athlon: i686 +@@ -580,7 +580,7 @@ + buildarch_compat: alphaev5: alpha + buildarch_compat: alpha: noarch + +-buildarch_compat: sw_64sw6b: sw_64 ++buildarch_compat: sw_64sw8a: sw_64 + buildarch_compat: sw_64: noarch + + buildarch_compat: m68k: noarch diff --git a/rpm.spec b/rpm.spec index 5366433..5107199 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %define _legacy_common_support 1 # build against xz? %bcond_without xz @@ -182,6 +182,7 @@ Patch2002: rpm-4.14.3-sw.patch Patch2003: 2004-rpm-anolis-support-sw_64.patch Patch2004: rpm-4.14.3-keep-compatibility-between-sw-and-other-architecture.patch Patch2005: rpm-4.14.3-Fix-compatibility-of-debugedit-tool-on-sw_64-platfor.patch +Patch2006: rpm-4.14.3-sw8a.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -750,6 +751,10 @@ rpm -q rpm 2>&1 | grep bdb && rpmdb --rebuilddb %doc doc/librpm/html/* %changelog +* Fri Nov 8 2024 wxiat - 4.14.3-31.0.2 +- cherry-pick Add sw8a Architecture #d96aa474da407c806ef6b68c669f8027e366f302 +- cherry-pick Add sw8a patch #923576a65dc00eb4fbe1f10a5d0027c4de1f5be0 + * Thu Jul 18 2024 Liwei Ge - 4.14.4-31.0.1 - Rebrand for Anolis OS - Fix gcc10 -fno-common compile issue for compatible with gcc10 build -- Gitee