From 4eb39f415f2e0b66d4ed1af0ba65f7146a4fb1ec05d4c1d1b105ea67ee2efb42 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Thu, 1 Feb 2018 11:04:06 +0000 Subject: [PATCH] Accepting request 571638 from home:Guillaume_G:branches:Base:System - Fix ARM32 builds OBS-URL: https://build.opensuse.org/request/show/571638 OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=27 --- gnu-efi-fix-armv7-detection.patch | 13 +++++++++++++ gnu-efi.changes | 5 +++++ gnu-efi.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gnu-efi-fix-armv7-detection.patch diff --git a/gnu-efi-fix-armv7-detection.patch b/gnu-efi-fix-armv7-detection.patch new file mode 100644 index 0000000..bb11ed8 --- /dev/null +++ b/gnu-efi-fix-armv7-detection.patch @@ -0,0 +1,13 @@ +--- Make.defaults.orig 2018-02-01 10:32:41.616449383 +0100 ++++ Make.defaults 2018-02-01 10:35:05.964876126 +0100 +@@ -75,6 +75,10 @@ ifeq ($(ARCH),amd64) + override ARCH := x86_64 + endif + ++ifeq ($(ARCH),armv7hl) ++ override ARCH := arm ++endif ++ + # + # Where to build the package + # diff --git a/gnu-efi.changes b/gnu-efi.changes index 3953cdd..9429683 100644 --- a/gnu-efi.changes +++ b/gnu-efi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 27 16:55:32 UTC 2018 - guillaume@opensuse.org + +- Fix ARM32 builds + ------------------------------------------------------------------- Tue Jun 13 08:49:16 UTC 2017 - glin@suse.com diff --git a/gnu-efi.spec b/gnu-efi.spec index ea6382e..f3df228 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -1,7 +1,7 @@ # # spec file for package gnu-efi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source1: %{name}-rpmlintrc Patch1: gnu-efi-fix-switch-warning.patch Patch2: gnu-efi-ar-stable-order.patch Patch3: gnu-efi-fix-efi-pxe-base-code.patch +Patch4: gnu-efi-fix-armv7-detection.patch BuildRequires: kernel-source BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 %ix86 x86_64 aarch64 %arm @@ -42,6 +43,7 @@ environment. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p0 %build ##########################