From 6268b0189402f0db4e75c601329034a8f83b9e827b6365a6893e9e8c325bc768 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Fri, 31 Oct 2014 10:20:50 +0000
Subject: [PATCH] Accepting request 259127 from
 home:gary_lin:branches:Base:System

- Update pesign-suse-build.patch to set LIBDIR for AArch64

OBS-URL: https://build.opensuse.org/request/show/259127
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=30
---
 pesign-suse-build.patch | 68 +++++++++++++++++++++++------------------
 pesign.changes          |  5 +++
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/pesign-suse-build.patch b/pesign-suse-build.patch
index 997f783..de8a44c 100644
--- a/pesign-suse-build.patch
+++ b/pesign-suse-build.patch
@@ -1,13 +1,8 @@
----
- Make.defaults       |    5 +++--
- Make.rules          |    3 ++-
- src/pesign.sysvinit |   12 ++++++++----
- util/Makefile       |    6 +++---
- 4 files changed, 16 insertions(+), 10 deletions(-)
-
+diff --git a/Make.defaults b/Make.defaults
+index 95ba9d5..c03bf70 100644
 --- a/Make.defaults
 +++ b/Make.defaults
-@@ -5,7 +5,8 @@ HOSTARCH   = $(shell uname -m | sed s,i[
+@@ -5,7 +5,8 @@ HOSTARCH   = $(shell uname -m | sed s,i[3456789]86,ia32,)
  ARCH	   := $(shell uname -m | sed s,i[3456789]86,ia32,)
  INCDIR	   = -I$(TOPDIR)/include
  CPPFLAGS   = -DCONFIG_$(ARCH)
@@ -26,6 +21,15 @@
  endif
  
  ifeq ($(ARCH), ia32)
+@@ -41,3 +42,6 @@ ifeq ($(ARCH), x86_64)
+   endif
+ endif
+ 
++ifeq ($(ARCH), aarch64)
++  LIBDIR := $(PREFIX)/lib64
++endif
+diff --git a/Make.rules b/Make.rules
+index 2749521..3553a03 100644
 --- a/Make.rules
 +++ b/Make.rules
 @@ -2,10 +2,11 @@
@@ -41,28 +45,8 @@
  
  %.o: %.c
  	$(CC) $(INCDIR) $(BUILDFLAGS) $(CPPFLAGS) -c $< -o $@
---- a/util/Makefile
-+++ b/util/Makefile
-@@ -4,7 +4,7 @@ TOPDIR = $(SRCDIR)/..
- include $(TOPDIR)/Make.defaults
- 
- FORMAT=efi-app-$(HOSTARCH)
--LDFLAGS = -nostdlib -T $(LIBDIR)/gnuefi/elf_$(HOSTARCH)_efi.lds -shared -Bsymbolic $(LIBDIR)/gnuefi/crt0-efi-$(HOSTARCH).o -L$(LIBDIR)
-+LDFLAGS = -nostdlib -T $(LIBDIR)/elf_$(HOSTARCH)_efi.lds -shared -Bsymbolic $(LIBDIR)/crt0-efi-$(HOSTARCH).o -L$(LIBDIR)
- LIBS=-lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
- CCLDFLAGS =
- BUILDFLAGS = -I/usr/include/efi/ -I/usr/include/efi/$(HOSTARCH)/ -I/usr/include/efi/protocol -fpic -fshort-wchar -fno-reorder-functions -fno-strict-aliasing -fno-merge-constants -mno-red-zone -Wimplicit-function-declaration
-@@ -17,8 +17,8 @@ clean :
- 	@rm -rfv *.o *.a *.so $(TARGETS)
- 
- install :
--	$(INSTALL) -d -m 755 $(INSTALLROOT)/boot/efi/EFI/redhat/
--	$(INSTALL) -m 755 *.efi $(INSTALLROOT)/boot/efi/EFI/redhat/
-+	$(INSTALL) -d -m 755 $(INSTALLROOT)/boot/efi/EFI/SuSE/
-+	$(INSTALL) -m 755 *.efi $(INSTALLROOT)/boot/efi/EFI/SuSE/
- 
- .PHONY: all clean install
- 
+diff --git a/src/pesign.sysvinit b/src/pesign.sysvinit
+index ea37c58..120a49c 100644
 --- a/src/pesign.sysvinit
 +++ b/src/pesign.sysvinit
 @@ -6,21 +6,25 @@
@@ -95,3 +79,27 @@
      RETVAL=$?
      echo
      touch /var/lock/subsys/pesign
+diff --git a/util/Makefile b/util/Makefile
+index ff11cb8..5d4cebb 100644
+--- a/util/Makefile
++++ b/util/Makefile
+@@ -4,7 +4,7 @@ TOPDIR = $(SRCDIR)/..
+ include $(TOPDIR)/Make.defaults
+ 
+ FORMAT=efi-app-$(HOSTARCH)
+-LDFLAGS = -nostdlib -T $(LIBDIR)/gnuefi/elf_$(HOSTARCH)_efi.lds -shared -Bsymbolic $(LIBDIR)/gnuefi/crt0-efi-$(HOSTARCH).o -L$(LIBDIR)
++LDFLAGS = -nostdlib -T $(LIBDIR)/elf_$(HOSTARCH)_efi.lds -shared -Bsymbolic $(LIBDIR)/crt0-efi-$(HOSTARCH).o -L$(LIBDIR)
+ LIBS=-lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+ CCLDFLAGS =
+ BUILDFLAGS = -I/usr/include/efi/ -I/usr/include/efi/$(HOSTARCH)/ -I/usr/include/efi/protocol -fpic -fshort-wchar -fno-reorder-functions -fno-strict-aliasing -fno-merge-constants -mno-red-zone -Wimplicit-function-declaration
+@@ -17,8 +17,8 @@ clean :
+ 	@rm -rfv *.o *.a *.so $(TARGETS)
+ 
+ install :
+-	$(INSTALL) -d -m 755 $(INSTALLROOT)/boot/efi/EFI/redhat/
+-	$(INSTALL) -m 755 *.efi $(INSTALLROOT)/boot/efi/EFI/redhat/
++	$(INSTALL) -d -m 755 $(INSTALLROOT)/boot/efi/EFI/SuSE/
++	$(INSTALL) -m 755 *.efi $(INSTALLROOT)/boot/efi/EFI/SuSE/
+ 
+ .PHONY: all clean install
+ 
diff --git a/pesign.changes b/pesign.changes
index eb6b504..cb3b2ee 100644
--- a/pesign.changes
+++ b/pesign.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 31 07:16:40 UTC 2014 - glin@suse.com
+
+- Update pesign-suse-build.patch to set LIBDIR for AArch64
+
 -------------------------------------------------------------------
 Tue Oct 28 08:47:34 UTC 2014 - glin@suse.com