rpms
/
edk2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use standalone .tar.xz from buildtools repo

This commit is contained in:
Paolo Bonzini 2014-06-24 10:43:55 +02:00
parent 0655ef8d83
commit 7fb40196aa
5 changed files with 66 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/edk2-r14365.tar.xz /edk2-r14365.tar.xz
/edk2-r14844.tar.xz /edk2-r14844.tar.xz
/edk2-r15376.tar.xz /edk2-r15376.tar.xz
/edk2-buildtools-r2649.tar.xz

6
basetools-arm.patch
View File

@ -1,7 +1,7 @@
diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile diff --git a/Source/C/GNUmakefile b/Source/C/GNUmakefile
index e0dde3e..bee0059 100644 index e0dde3e..bee0059 100644
--- a/BaseTools/Source/C/GNUmakefile --- a/Source/C/GNUmakefile
+++ b/BaseTools/Source/C/GNUmakefile +++ b/Source/C/GNUmakefile
@@ -22,6 +22,9 @@ ifndef ARCH @@ -22,6 +22,9 @@ ifndef ARCH
ifeq ($(uname_m),x86_64) ifeq ($(uname_m),x86_64)
ARCH=X64 ARCH=X64

4
edk2-remove-tree-check.patch
View File

@ -1,5 +1,5 @@
--- a/BaseTools/BuildEnv --- a/BuildEnv
+++ b/BaseTools/BuildEnv +++ b/BuildEnv
@@ -23,14 +23,6 @@ @@ -23,14 +23,6 @@
return 0 return 0
fi fi

117
edk2.spec
View File

@ -1,7 +1,6 @@
%define SVNDATE 20140328 %define SVNDATE 20140624
%define SVNREV 15376 %define SVNREV 2649
# More subpackages to come once licensing issues are fixed
Name: edk2 Name: edk2
Version: %{SVNDATE}svn%{SVNREV} Version: %{SVNDATE}svn%{SVNREV}
Release: 4%{?dist} Release: 4%{?dist}
@ -11,12 +10,10 @@ Summary: EFI Development Kit II
# Tarballs are created with: # Tarballs are created with:
# svn export -r ${SVNREV} \ # svn export -r ${SVNREV} \
# https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2 edk2-r${SVNREV} # https://edk2-buildtools.svn.sourceforge.net/svnroot/edk2-buildtools/trunk/BaseTools edk2-buildtools-r${SVNREV}
# rm -rf edk2-r${SVNREV}/BaseTools/Bin # rm -rf edk2-buildtools-r${SVNREV}/Bin
# rm -rf edk2-r${SVNREV}/ShellBinPkg # tar -cv edk2-buildtools-r${SVNREV} | xz -6 > edk2-buildtools-r${SVNREV}.tar.xz
# rm -rf edk2-r${SVNREV}/FatBinPkg Source0: edk2-buildtools-r%{SVNREV}.tar.xz
# tar -cv edk2-r${SVNREV} | xz -6 > edk2-r${SVNREV}.tar.xz
Source0: edk2-r%{SVNREV}.tar.xz
Patch1: basetools-arm.patch Patch1: basetools-arm.patch
Patch2: edk2-remove-tree-check.patch Patch2: edk2-remove-tree-check.patch
@ -32,6 +29,7 @@ BuildRequires: python2-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
Requires: edk2-tools%{?_isa} = %{version}-%{release} Requires: edk2-tools%{?_isa} = %{version}-%{release}
Requires: edk2-tools-doc%{?_isa} = %{version}-%{release}
%description %description
EDK II is a development code base for creating UEFI drivers, applications EDK II is a development code base for creating UEFI drivers, applications
@ -66,37 +64,37 @@ This package documents the tools that are needed to
build EFI executables and ROMs using the GNU tools. build EFI executables and ROMs using the GNU tools.
%prep %prep
%setup -q -n %{name}-r%{SVNREV} %setup -q -n edk2-buildtools-r%{SVNREV}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%build %build
source ./edksetup.sh export WORKSPACE=`pwd`
# Build is broken if MAKEFLAGS contains -j option. # Build is broken if MAKEFLAGS contains -j option.
unset MAKEFLAGS unset MAKEFLAGS
make -C $WORKSPACE/BaseTools make
%install %install
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
install \ install \
BaseTools/Source/C/bin/BootSectImage \ Source/C/bin/BootSectImage \
BaseTools/Source/C/bin/EfiLdrImage \ Source/C/bin/EfiLdrImage \
BaseTools/Source/C/bin/EfiRom \ Source/C/bin/EfiRom \
BaseTools/Source/C/bin/GenCrc32 \ Source/C/bin/GenCrc32 \
BaseTools/Source/C/bin/GenFfs \ Source/C/bin/GenFfs \
BaseTools/Source/C/bin/GenFv \ Source/C/bin/GenFv \
BaseTools/Source/C/bin/GenFw \ Source/C/bin/GenFw \
BaseTools/Source/C/bin/GenPage \ Source/C/bin/GenPage \
BaseTools/Source/C/bin/GenSec \ Source/C/bin/GenSec \
BaseTools/Source/C/bin/GenVtf \ Source/C/bin/GenVtf \
BaseTools/Source/C/bin/GnuGenBootSector \ Source/C/bin/GnuGenBootSector \
BaseTools/Source/C/bin/LzmaCompress \ Source/C/bin/LzmaCompress \
BaseTools/BinWrappers/PosixLike/LzmaF86Compress \ BinWrappers/PosixLike/LzmaF86Compress \
BaseTools/Source/C/bin/Split \ Source/C/bin/Split \
BaseTools/Source/C/bin/TianoCompress \ Source/C/bin/TianoCompress \
BaseTools/Source/C/bin/VfrCompile \ Source/C/bin/VfrCompile \
BaseTools/Source/C/bin/VolInfo \ Source/C/bin/VolInfo \
%{buildroot}%{_bindir} %{buildroot}%{_bindir}
ln -f %{buildroot}%{_bindir}/GnuGenBootSector \ ln -f %{buildroot}%{_bindir}/GnuGenBootSector \
@ -104,22 +102,22 @@ ln -f %{buildroot}%{_bindir}/GnuGenBootSector \
mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_datadir}/%{name}
install \ install \
BaseTools/BuildEnv \ BuildEnv \
%{buildroot}%{_datadir}/%{name} %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/%{name}/Conf mkdir -p %{buildroot}%{_datadir}/%{name}/Conf
install \ install \
BaseTools/Conf/build_rule.template \ Conf/build_rule.template \
BaseTools/Conf/tools_def.template \ Conf/tools_def.template \
BaseTools/Conf/target.template \ Conf/target.template \
%{buildroot}%{_datadir}/%{name}/Conf %{buildroot}%{_datadir}/%{name}/Conf
mkdir -p %{buildroot}%{_datadir}/%{name}/Scripts mkdir -p %{buildroot}%{_datadir}/%{name}/Scripts
install \ install \
BaseTools/Scripts/gcc4.4-ld-script \ Scripts/gcc4.4-ld-script \
%{buildroot}%{_datadir}/%{name}/Scripts %{buildroot}%{_datadir}/%{name}/Scripts
cp -R BaseTools/Source/Python %{buildroot}%{_datadir}/%{name}/Python cp -R Source/Python %{buildroot}%{_datadir}/%{name}/Python
find %{buildroot}%{_datadir}/%{name}/Python -name "*.pyd" | xargs rm find %{buildroot}%{_datadir}/%{name}/Python -name "*.pyd" | xargs rm
@ -168,31 +166,34 @@ done
%{_datadir}/%{name}/Python/ %{_datadir}/%{name}/Python/
%files tools-doc %files tools-doc
%doc BaseTools/UserManuals/BootSectImage_Utility_Man_Page.rtf %doc UserManuals/BootSectImage_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/Build_Utility_Man_Page.rtf %doc UserManuals/Build_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/EfiLdrImage_Utility_Man_Page.rtf %doc UserManuals/EfiLdrImage_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf %doc UserManuals/EfiRom_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenBootSector_Utility_Man_Page.rtf %doc UserManuals/GenBootSector_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf %doc UserManuals/GenCrc32_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf %doc UserManuals/GenDepex_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf %doc UserManuals/GenFds_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf %doc UserManuals/GenFfs_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf %doc UserManuals/GenFv_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf %doc UserManuals/GenFw_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenPage_Utility_Man_Page.rtf %doc UserManuals/GenPage_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf %doc UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf %doc UserManuals/GenSec_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/GenVtf_Utility_Man_Page.rtf %doc UserManuals/GenVtf_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf %doc UserManuals/LzmaCompress_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf %doc UserManuals/PatchPcdValue_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf %doc UserManuals/SplitFile_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf %doc UserManuals/TargetTool_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf %doc UserManuals/TianoCompress_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/Trim_Utility_Man_Page.rtf %doc UserManuals/Trim_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf %doc UserManuals/VfrCompiler_Utility_Man_Page.rtf
%doc BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf %doc UserManuals/VolInfo_Utility_Man_Page.rtf
%changelog %changelog
* Tue Jun 24 2014 Paolo Bonzini <pbonzini@redhat.com> - 20140624svn2649-1
- Use standalone .tar.xz from buildtools repo
* Tue Jun 24 2014 Paolo Bonzini <pbonzini@redhat.com> - 20140328svn15376-4 * Tue Jun 24 2014 Paolo Bonzini <pbonzini@redhat.com> - 20140328svn15376-4
- Install BuildTools/BaseEnv - Install BuildTools/BaseEnv

1
sources
View File

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