From ab9a54e0b4dc97ebe768fe866fb6c6af1ab2b3c9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 27 Nov 2015 14:00:44 +0100 Subject: [PATCH] Rebase to 20151127svn18975-1 - Linker script renamed to GccBase.lds --- .gitignore | 1 + edk2.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b3ccd99..101dced 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /edk2-buildtools-r2649.tar.xz /edk2-buildtools-r2670.tar.xz /edk2-buildtools-r17469.tar.xz +/edk2-buildtools-r18975.tar.xz diff --git a/edk2.spec b/edk2.spec index 1291e7e..4625866 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,5 +1,5 @@ -%define SVNDATE 20150519 -%define SVNREV 17469 +%define SVNDATE 20151127 +%define SVNREV 18975 Name: edk2 Version: %{SVNDATE}svn%{SVNREV} @@ -112,7 +112,7 @@ install \ mkdir -p %{buildroot}%{_datadir}/%{name}/Scripts install \ - Scripts/gcc4.4-ld-script \ + Scripts/GccBase.lds \ %{buildroot}%{_datadir}/%{name}/Scripts cp -R Source/Python %{buildroot}%{_datadir}/%{name}/Python @@ -189,7 +189,11 @@ done %doc UserManuals/VolInfo_Utility_Man_Page.rtf %changelog -* Tue May 19 2015 Bonzini - 20150519svn17469-1 +* Tue Nov 27 2015 Paolo Bonzini - 20151127svn18975-1 +- Rebase to 20151127svn18975-1 +- Linker script renamed to GccBase.lds + +* Tue May 19 2015 Paolo Bonzini - 20150519svn17469-1 - Rebase to 20150519svn17469-1 - edk2-remove-tree-check.patch now upstream diff --git a/sources b/sources index 184c53c..b04bb1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c685de1403f4116d93e79f6074ea0e3 edk2-buildtools-r17469.tar.xz +b54c3b57cd661dc4e232489919315a6f edk2-buildtools-r18975.tar.xz