删除无用的LA架构补丁,重新修订SW补丁

Signed-off-by: herengui <herengui@kylinsec.com.cn>
(cherry picked from commit c747cf23c8d0bd93bb61467c038abb207b3adaa6)
This commit is contained in:
herengui 2023-08-14 10:33:39 +08:00 committed by openeuler-sync-bot
parent ad7310ffcc
commit 0abac8e8d9
4 changed files with 22 additions and 43 deletions

View File

@ -1,25 +0,0 @@
From 77d9646088647ae2bbecb70248701458662ebf48 Mon Sep 17 00:00:00 2001
From: Sun Haiyong <sunhaiyong@loongson.cn>
Date: Wed, 22 Dec 2021 14:37:16 +0800
Subject: [PATCH] Add loongarch architecture support.
---
dnf/rpm/__init__.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py
index 696e594..0db8e95 100644
--- a/dnf/rpm/__init__.py
+++ b/dnf/rpm/__init__.py
@@ -97,6 +97,8 @@ _BASEARCH_MAP = _invert({
'mipsel': ('mipsel',),
'mips64': ('mips64',),
'mips64el': ('mips64el',),
+ 'loongarch32' : ('loongarch32',),
+ 'loongarch64' : ('loongarch64',),
'noarch': ('noarch',),
'ppc': ('ppc',),
'ppc64': ('ppc64', 'ppc64iseries', 'ppc64p7', 'ppc64pseries'),
--
2.30.0

View File

@ -0,0 +1,12 @@
diff --git a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py
index 12efca7..d9eba54 100644
--- a/dnf/rpm/__init__.py
+++ b/dnf/rpm/__init__.py
@@ -111,6 +111,7 @@ _BASEARCH_MAP = _invert({
'sh4': ('sh4', 'sh4a'),
'sparc': ('sparc', 'sparc64', 'sparc64v', 'sparcv8', 'sparcv9',
'sparcv9v'),
+ 'sw_64': ('sw_64',),
'x86_64': ('x86_64', 'amd64', 'ia32e'),
})

View File

@ -1,11 +0,0 @@
diff -Naur dnf-4.10.0.org/dnf/rpm/__init__.py dnf-4.10.0.sw/dnf/rpm/__init__.py
--- dnf-4.10.0.org/dnf/rpm/__init__.py 2022-02-27 01:21:45.610000000 +0000
+++ dnf-4.10.0.sw/dnf/rpm/__init__.py 2022-02-27 01:22:17.040000000 +0000
@@ -87,6 +87,7 @@
_BASEARCH_MAP = _invert({
'aarch64': ('aarch64',),
+ 'sw_64': ('sw_64',),
'alpha': ('alpha', 'alphaev4', 'alphaev45', 'alphaev5', 'alphaev56',
'alphaev6', 'alphaev67', 'alphaev68', 'alphaev7', 'alphapca56'),
'arm': ('armv5tejl', 'armv5tel', 'armv5tl', 'armv6l', 'armv7l', 'armv8l'),

View File

@ -3,12 +3,14 @@
Name: dnf
Version: 4.14.0
Release: 16
Release: 17
Summary: A software package manager that manages packages on Linux distributions.
License: GPL-2.0-or-later AND GPL-1.0-only
URL: https://github.com/rpm-software-management/dnf
Source0: https://github.com/rpm-software-management/dnf/archive/%{version}/%{name}-%{version}.tar.gz
Patch1000: add-sw_64-support-not-upstream-modified.patch
Patch9002: add-rpm-transaction-debuginfo.patch
Patch9004: fix-dnf-history-undo-error-when-history-sqlite-missing.patch
@ -16,12 +18,6 @@ Patch9004: fix-dnf-history-undo-error-when-history-sqlite-missing.pat
Patch9006: get-lockfile-exists-before-unlick.patch
%endif
%ifarch sw_64
Patch6000: dnf-4.10.0-sw.patch
%endif
%if 0%(test `uname -m` == "loongarch64" && echo 1)
Patch6001: 0001-Add-loongarch-architecture-support.patch
%endif
Patch6002: backport-fix-plugins-unit-tests-unload-plugins-upon-their-deletion.patch
Patch6003: backport-pass-whole-url-in-relativeUrl-to-packageTarget-for-rpm-url-download.patch
Patch6004: backport-add-support-for-rollback-of-group-upgrade-rollback.patch
@ -253,6 +249,13 @@ popd
%{_mandir}/man8/%{name}-automatic.8*
%changelog
* Mon Aug 14 2023 herengui <herengui@kylinsec.com.cn> - 4.14.0-17
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:dnf:remove useless patch of loongarch64
dnf:recreate patch of sw64 and make arch sorted alphabetically
* Sat Aug 12 2023 sunhai <sunhai10@huawei.com> - 4.14.0-16
- Type:bugfix
- CVE:NA