rpms/libsolv
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Set x86_64 arch as exchangeable to x86_64_v2

Browse Source
This commit is contained in:
Eduard Abdullin 2025-05-14 17:36:24 +00:00 committed by root
parent fec3ecb4a3
commit 7cc9aff6c6
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch Normal file
View File

@ -0,0 +1,42 @@
From d63dfdba8f97ea42e1e3661de6bbaf273ccb790a Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 10 Jul 2024 15:36:47 +0300
Subject: [PATCH] Set x86_64 arch as exchangeable to x86_64_v2
---
src/poolarch.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/poolarch.c b/src/poolarch.c
index bc4582f..3b5a893 100644
--- a/src/poolarch.c
+++ b/src/poolarch.c
@@ -24,13 +24,13 @@ static const char *archpolicies[] = {
#if defined(FEDORA) || defined(MAGEIA)
"x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386",
"x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386",
- "x86_64_v2", "x86_64_v2:x86_64:athlon:i686:i586:i486:i386",
- "x86_64", "x86_64:athlon:i686:i586:i486:i386",
+ "x86_64_v2", "x86_64_v2=x86_64:athlon:i686:i586:i486:i386",
+ "x86_64", "x86_64=x86_64_v2:athlon:i686:i586:i486:i386",
#else
"x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386",
"x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386",
- "x86_64_v2", "x86_64_v2:x86_64:i686:i586:i486:i386",
- "x86_64", "x86_64:i686:i586:i486:i386",
+ "x86_64_v2", "x86_64_v2=x86_64:i686:i586:i486:i386",
+ "x86_64", "x86_64=x86_64_v2:i686:i586:i486:i386",
#endif
"i686", "i686:i586:i486:i386",
"i586", "i586:i486:i386",
@@ -70,6 +70,7 @@ static const char *archpolicies[] = {
0
};
+
void
pool_setarch(Pool *pool, const char *arch)
{
--
2.39.3 (Apple Git-146)

6
libsolv.spec
View File

@ -46,6 +46,9 @@ Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# Downstream-only, RHEL-41048
Patch0: 0001-Add-support-for-computing-hashes-using-OpenSSL.patch
# AlmaLinux Patch
Patch1000: 0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: ninja-build
@ -284,6 +287,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%endif
%changelog
* Wed May 14 2025 Eduard Abdullin <eabdullin@almalinux.org> - 0.7.29-8
- Set x86_64 arch as exchangeable to x86_64_v2
## START: Generated by rpmautospec
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.7.29-8
- Bump release for October 2024 mass rebuild: