From 884d50a6705971048f7666c4e5f64c604f7995aa4b2dd45f4b24c7f48d7ca46a Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 20 Mar 2018 14:52:11 +0000
Subject: [PATCH] Accepting request 586549 from home:kasimir:ToTest

- Fix armv6 builds
  * Renamed gnu-efi-fix-armv7-detection.patch to gnu-efi-fix-armv6-and-armv7-detection.patch

OBS-URL: https://build.opensuse.org/request/show/586549
OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=30
---
 gnu-efi-fix-armv6-and-armv7-detection.patch | 16 ++++++++++++++++
 gnu-efi-fix-armv7-detection.patch           | 13 -------------
 gnu-efi.changes                             |  6 ++++++
 gnu-efi.spec                                |  2 +-
 4 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 gnu-efi-fix-armv6-and-armv7-detection.patch
 delete mode 100644 gnu-efi-fix-armv7-detection.patch

diff --git a/gnu-efi-fix-armv6-and-armv7-detection.patch b/gnu-efi-fix-armv6-and-armv7-detection.patch
new file mode 100644
index 0000000..2944f2b
--- /dev/null
+++ b/gnu-efi-fix-armv6-and-armv7-detection.patch
@@ -0,0 +1,16 @@
+--- Make.defaults.orig	2018-03-13 21:33:01.937164183 +0100
++++ Make.defaults	2018-03-13 21:35:29.487916123 +0100
+@@ -75,6 +75,13 @@ ifeq ($(ARCH),amd64)
+   override ARCH := x86_64
+ endif
+ 
++ifeq ($(ARCH),armv6hl)
++  override ARCH := arm
++endif
++ifeq ($(ARCH),armv7hl)
++  override ARCH := arm
++endif
++
+ #
+ # Where to build the package
+ #
diff --git a/gnu-efi-fix-armv7-detection.patch b/gnu-efi-fix-armv7-detection.patch
deleted file mode 100644
index bb11ed8..0000000
--- a/gnu-efi-fix-armv7-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 0507ed8..cbf9be6 100644
--- a/gnu-efi.changes
+++ b/gnu-efi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 13 22:06:59 UTC 2018 - kasimir_@outlook.de
+
+- Fix armv6 builds
+  * Renamed gnu-efi-fix-armv7-detection.patch to gnu-efi-fix-armv6-and-armv7-detection.patch
+
 -------------------------------------------------------------------
 Sat Jan 27 16:55:32 UTC 2018 - guillaume@opensuse.org
 
diff --git a/gnu-efi.spec b/gnu-efi.spec
index f3df228..14c7e29 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -28,7 +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
+Patch4:         gnu-efi-fix-armv6-and-armv7-detection.patch
 BuildRequires:  kernel-source
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  ia64 %ix86 x86_64 aarch64 %arm