Skip to content

Add support for versioned x86_64 arches #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrewlukoshko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for versioned x86_64 arches #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion efi-rpm-macros.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion macros.efi-srpm.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down