[edk2] Readd parts of patch 1 that are not upstream.
bonzini
bonzini at fedoraproject.org
Thu Nov 14 15:30:26 UTC 2013
commit 60a9a27ad7fd69b88801de8f658e81b949fa36cf
Author: Paolo Bonzini <pbonzini at redhat.com>
Date: Thu Nov 14 16:30:12 2013 +0100
Readd parts of patch 1 that are not upstream.
basetools-arm.patch | 14 ++++++++++++++
edk2.spec | 4 +++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/basetools-arm.patch b/basetools-arm.patch
new file mode 100644
index 0000000..aeeb88c
--- /dev/null
+++ b/basetools-arm.patch
@@ -0,0 +1,14 @@
+diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
+index e0dde3e..bee0059 100644
+--- a/BaseTools/Source/C/GNUmakefile
++++ b/BaseTools/Source/C/GNUmakefile
+@@ -22,6 +22,9 @@ ifndef ARCH
+ ifeq ($(uname_m),x86_64)
+ ARCH=X64
+ endif
++ ifeq ($(patsubst arm%,ARM,$(uname_m)),ARM)
++ ARCH=ARM
++ endif
+ ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32)
+ ARCH=IA32
+ endif
diff --git a/edk2.spec b/edk2.spec
index c827175..13d1079 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -17,6 +17,7 @@ Summary: EFI Development Kit II
# rm -rf edk2-r${SVNREV}/FatBinPkg
# tar -cv edk2-r${SVNREV} | xz -6 > edk2-r${SVNREV}.tar.xz
Source0: edk2-r%{SVNREV}.tar.xz
+Patch1: basetools-arm.patch
License: BSD
Group: Applications/Emulators
@@ -65,6 +66,7 @@ build EFI executables and ROMs using the GNU tools.
%prep
%setup -q -n %{name}-r%{SVNREV}
+%patch1 -p1
%build
source ./edksetup.sh
@@ -164,7 +166,7 @@ done
%changelog
* Thu Nov 14 2013 Paolo Bonzini <pbonzini at redhat.com> - 20131114svn14844-1
- Upgrade to r14844.
-- Remove patch 1.
+- Remove upstreamed parts of patch 1.
* Fri Nov 8 2013 Paolo Bonzini <pbonzini at redhat.com> - 20130515svn14365-7
- Make BaseTools compile on ARM.
More information about the scm-commits
mailing list