rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update patch to detect ExclusiveArch

Browse Source
This commit is contained in:
eabdullin 2024-08-01 10:39:44 +03:00
parent 1a26e9b711
commit 88a0aaa42a
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SOURCES/0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch
View File

@ -1,13 +1,29 @@
From 86efc664f71721cb2fb1ec512f29b36876f86baa Mon Sep 17 00:00:00 2001 From 834feed695b5cb5ea27aaa23936eaeda2372b56b Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com> From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 9 Jul 2024 17:03:27 +0300 Date: Tue, 9 Jul 2024 17:03:27 +0300
Subject: [PATCH] Fix: Treat x86_64_v2 as x86_64 in architecture checks Subject: [PATCH] Fix: Treat x86_64_v2 as x86_64 in architecture checks
This change allows spec files to use x86_64_v2 as an alias for x86_64, ensuring compatibility with packages and build scripts expecting x86_64. This change allows spec files to use x86_64_v2 as an alias for x86_64, ensuring compatibility with packages and build scripts expecting x86_64.
--- ---
build/parseSpec.c | 17 +++++++++++++++++ build/parsePreamble.c | 4 ++++
1 file changed, 17 insertions(+) build/parseSpec.c | 17 +++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index de205d5..a8f3b47 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -425,6 +425,10 @@ static int isMemberInEntry(Header h, const char *name, rpmTagVal tag)
return -1;
while ((str = rpmtdNextString(&td))) {
+ if (!rstrcasecmp(str, "x86_64") && !rstrcasecmp(name, "x86_64_v2")) {
+ found = 1;
+ break;
+ }
if (!rstrcasecmp(str, name)) {
found = 1;
break;
diff --git a/build/parseSpec.c b/build/parseSpec.c diff --git a/build/parseSpec.c b/build/parseSpec.c
index d6e998a..102ce5b 100644 index d6e998a..102ce5b 100644
--- a/build/parseSpec.c --- a/build/parseSpec.c

5
SPECS/rpm.spec
View File

@ -36,7 +36,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}%{baserelease}%{?dist}.alma.1 Release: %{?snapver:0.%{snapver}.}%{baserelease}%{?dist}.alma.2
Url: http://www.rpm.org/ Url: http://www.rpm.org/
License: GPL-2.0-or-later License: GPL-2.0-or-later
Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2 Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2
@ -618,6 +618,9 @@ fi
%doc %{_defaultdocdir}/rpm/API/ %doc %{_defaultdocdir}/rpm/API/
%changelog %changelog
* Thu Aug 01 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.19.1.1-2.alma.2
- Update patch to detect ExclusiveArch
* Tue Jul 09 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.19.1.1-2.alma.1 * Tue Jul 09 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.19.1.1-2.alma.1
- Fix: Treat x86_64_v2 as x86_64 in architecture checks - Fix: Treat x86_64_v2 as x86_64 in architecture checks