From e1ec11fb1c7906fa681af4032879fccb1553d9a5 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Sep 2024 02:01:49 +0800 Subject: [PATCH] add sw8a patch --- rpm-Add-sw64-8A-architecture.patch | 72 ++++++++++++++++++++++++++++++ rpm.spec | 7 ++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 rpm-Add-sw64-8A-architecture.patch diff --git a/rpm-Add-sw64-8A-architecture.patch b/rpm-Add-sw64-8A-architecture.patch new file mode 100644 index 0000000..a2d6487 --- /dev/null +++ b/rpm-Add-sw64-8A-architecture.patch @@ -0,0 +1,72 @@ +diff -uNar rpm-4.17.0.org/lib/rpmrc.c rpm-4.17.0.sw/lib/rpmrc.c +--- rpm-4.17.0.org/lib/rpmrc.c 2024-09-12 22:44:39.705827954 +0800 ++++ rpm-4.17.0.sw/lib/rpmrc.c 2024-09-12 22:46:11.723829571 +0800 +@@ -1277,7 +1277,7 @@ + + # if defined(__GNUC__) && defined(__sw_64__) + { +- strcpy(un.machine, "sw_64sw6b"); ++ strcpy(un.machine, "sw_64sw8a"); + } + # endif + +diff -uNar rpm-4.17.0.org/macros.in rpm-4.17.0.sw/macros.in +--- rpm-4.17.0.org/macros.in 2024-09-12 22:44:40.120827961 +0800 ++++ rpm-4.17.0.sw/macros.in 2024-09-12 22:46:35.686829992 +0800 +@@ -1107,7 +1107,7 @@ + #------------------------------------------------------------------------------ + # arch macro for all supported Alpha processors + %alpha alpha alphaev56 alphaev6 alphaev67 +-%sw_64 sw_64 sw_64sw6b ++%sw_64 sw_64 sw_64sw8a + + #------------------------------------------------------------------------------ + # arch macro for all supported PowerPC 64 processors +diff -uNar rpm-4.17.0.org/rpmrc.in rpm-4.17.0.sw/rpmrc.in +--- rpm-4.17.0.org/rpmrc.in 2024-09-12 22:44:39.701827954 +0800 ++++ rpm-4.17.0.sw/rpmrc.in 2024-09-12 22:47:54.175831371 +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=sw6b + + optflags: alpha -O2 -g -mieee + optflags: alphaev5 -O2 -g -mieee -mtune=ev5 +@@ -181,7 +181,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 +@@ -323,7 +323,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 +@@ -411,7 +411,7 @@ + + #########################################/#################### + # Architecture compatibility +-arch_compat: sw_64sw6b: sw_64 ++arch_compat: sw_64sw8a: sw_64 + arch_compat: sw_64: axp noarch + + arch_compat: alphaev67: alphaev6 +@@ -582,7 +582,7 @@ + buildarch_compat: sparcv8: sparc + buildarch_compat: sparc: noarch + +-buildarch_compat: sw_64sw6b: sw_64 ++buildarch_compat: sw_64sw8a: sw_64 + buildarch_compat: sw_64: noarch + + buildarch_compat: alphaev67: alphaev6 diff --git a/rpm.spec b/rpm.spec index 82dd9b5..593dd8f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.17.0 -Release: 44 +Release: 45 Summary: RPM Package Manager License: GPLv2+ URL: http://www.rpm.org/ @@ -23,6 +23,7 @@ Patch14: Add-loongarch-architecture-support.patch Patch15: Avoid-generating-digest-lists-if-they-are-already-pa.patch Patch16: rpm-Add-sw64-architecture.patch Patch17: 0001-add-default-machine-name-to-support-loongarch.patch +Patch18: rpm-Add-sw64-8A-architecture.patch Patch6000: backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch Patch6001: backport-Check-file-iterator-for-being-NULL-consistently.patch @@ -206,6 +207,7 @@ Obsoletes: apidocs %prep %autosetup -n %{name}-%{version} -p1 %ifnarch sw_64 +%patch18 -R -p1 %patch16 -R -p1 %endif @@ -418,6 +420,9 @@ make check || (cat tests/rpmtests.log; exit 0) %{_mandir}/man1/gendiff.1* %changelog +* Fri Sep 13 2024 wuzx - 4.17.0-45 +- Add sw64-8A support + * Tue Sep 3 2024 gengqihu - 4.17.0-44 - Backport some patches from upstream -- Gitee