Rebase to 20140724svn2670-1

This commit is contained in:
Paolo Bonzini 2014-07-24 14:27:29 +02:00
parent 7fb40196aa
commit d2839d50b7
4 changed files with 8 additions and 7 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/edk2-r14844.tar.xz
/edk2-r15376.tar.xz
/edk2-buildtools-r2649.tar.xz
/edk2-buildtools-r2670.tar.xz

View File

@ -3,7 +3,7 @@ index e0dde3e..bee0059 100644
--- a/Source/C/GNUmakefile
+++ b/Source/C/GNUmakefile
@@ -22,6 +22,9 @@ ifndef ARCH
ifeq ($(uname_m),x86_64)
ifneq (,$(strip $(filter $(uname_m), x86_64 amd64)))
ARCH=X64
endif
+ ifeq ($(patsubst arm%,ARM,$(uname_m)),ARM)

View File

@ -1,5 +1,5 @@
%define SVNDATE 20140624
%define SVNREV 2649
%define SVNDATE 20140724
%define SVNREV 2670
Name: edk2
Version: %{SVNDATE}svn%{SVNREV}
@ -191,6 +191,9 @@ done
%doc UserManuals/VolInfo_Utility_Man_Page.rtf
%changelog
* Thu Jul 24 2014 Paolo Bonzini <pbonzini@redhat.com> - 20140724svn2670-1
- Rebase to 20140724svn2670-1
* Tue Jun 24 2014 Paolo Bonzini <pbonzini@redhat.com> - 20140624svn2649-1
- Use standalone .tar.xz from buildtools repo

View File

@ -1,4 +1 @@
ad1e70d62ac0ba942566bce4139843ee edk2-r14365.tar.xz
d2cde08bda623f012d62744a66f4b71f edk2-r14844.tar.xz
5a95866d7015bc40e4bf48cdcd8e862e edk2-r15376.tar.xz
fe2bfd3dd6094be3cb1f04c3d09748a1 edk2-buildtools-r2649.tar.xz
d83190712ac0ee579038667c4a32ea32 edk2-buildtools-r2670.tar.xz