commit dfb8270caf71f0c24c8cf0efc50c4377f3db24aa Author: Sofia Boldyreva Date: Wed Jan 15 22:15:51 2025 +0100 Initial commit diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..cdb762e --- /dev/null +++ b/config.yaml @@ -0,0 +1,21 @@ +actions: + - replace: + - target: "spec" + find: "git config --local --add efi.arches \"x86_64 aarch64 %{arm} %{ix86}\"" + replace: "git config --local --add efi.arches \"%{x86_64} aarch64 %{arm} %{ix86}\"" + count: 1 + + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Andrei Lukoshko" + email: "alukoshko@almalinux.org" + line: + - "Add support for versioned x86_64 arches" + + - add_files: + - type: "patch" + name: "0001-Add-support-for-versioned-x86_64-arches.patch" + number: 0001 diff --git a/files/0001-Add-support-for-versioned-x86_64-arches.patch b/files/0001-Add-support-for-versioned-x86_64-arches.patch new file mode 100644 index 0000000..d80f8c9 --- /dev/null +++ b/files/0001-Add-support-for-versioned-x86_64-arches.patch @@ -0,0 +1,53 @@ +From 20e624e0ed69a65e8c2365225287206c2cf81215 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Mon, 5 Aug 2024 13:59:24 +0000 +Subject: [PATCH] Add support for versioned x86_64 arches + +--- + Makefile | 2 +- + efi-rpm-macros.spec.in | 2 +- + macros.efi-srpm.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index d410bc4..1d12fba 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ override EFI_ESP_ROOT=/boot/efi + endif + EFI_ARCHES ?= $(call get-config,arches) + ifeq ($(EFI_ARCHES),) +-override EFI_ARCHES="x86_64 aarch64 %{arm} %{ix86}" ++override EFI_ARCHES="%{x86_64} aarch64 %{arm} %{ix86}" + endif + EFI_VENDOR ?= $(call get-config,vendor) + +diff --git a/efi-rpm-macros.spec.in b/efi-rpm-macros.spec.in +index 6f0e7b0..4c22053 100644 +--- a/efi-rpm-macros.spec.in ++++ b/efi-rpm-macros.spec.in +@@ -36,7 +36,7 @@ machine bootloaders and tools. + %autosetup -S git_am -n %{name}-@@EFI_SOURCE_VERSION@@ + git config --local --add efi.vendor "%{_efi_vendor_}" + git config --local --add efi.esp-root /boot/efi +-git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}" ++git config --local --add efi.arches "%{x86_64} aarch64 %{arm} %{ix86}" + + %build + %make_build clean all +diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in +index f91ea31..3f0780a 100644 +--- a/macros.efi-srpm.in ++++ b/macros.efi-srpm.in +@@ -29,7 +29,7 @@ + local function getarch() + if arch("ia64") then + return("ia64") +- elseif arch("x86_64") then ++ elseif arch("%{x86_64}") then + return("x64") + elseif arch("%{ix86}") then + return("ia32") +-- +2.43.5 +