Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f372c5f9ea30950d59c4390bc2f3ba9003f134a1
commit f372c5f9ea30950d59c4390bc2f3ba9003f134a1 Author: James Buren <[email protected]> Date: Sat Nov 9 09:26:49 2013 -0600 udk-20131105-2-x86_64 * enable building of efi shell * create new subpkg to contain all the efi tools built from this source * introduce preliminary i686 efi building diff --git a/source/devel-extra/udk/FrugalBuild b/source/devel-extra/udk/FrugalBuild index 23fb2ab..fd0b704 100644 --- a/source/devel-extra/udk/FrugalBuild +++ b/source/devel-extra/udk/FrugalBuild @@ -11,16 +11,17 @@ options=('nomirror') groups=('devel-extra') archs=('!i686' 'x86_64') up2date="$pkgver" -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.xz qemu-uefi config.patch) +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.xz qemu-uefi config-i686.patch config-x86_64.patch) sha1sums=('2e50d89c8b9319d95e7a157e6e1796f90492a512' \ 'fdb3256b91800012e5f2037d3c425bd8e025ed44' \ - '81c94be96713e32150ae577712812dbc8f723591') + 'a63adfa76c5007109880e77697876037541fbd68' \ + 'fe15dc1c42b96ae61c0925fe9440ecbd2b02afc1') -subpkgs=("qemu-uefi") -subdescs=("Binary images for UEFI emulation in QEMU.") -subgroups=("lib-extra") -subrodepends=("qemu") -subarchs=("${archs[*]}") +subpkgs=("qemu-uefi" "udk-efi-tools") +subdescs=("Binary images for UEFI emulation in QEMU." "EFI tools compiled from UDK.") +subgroups=("lib-extra" "apps-extra") +subrodepends=("qemu" "") +subarchs=("${archs[*]}" "${archs[*]}") # As these are not regular binaries, DISABLE OUR BUILD FLAGS. unset CFLAGS @@ -28,22 +29,40 @@ unset CXXFLAGS unset LDFLAGS unset MAKEFLAGS +PACKAGES="OvmfPkg ShellPkg" + build() { Fcd $pkgname - Fpatchall - Fmkdir -p /usr/src/udk + Fexec patch -Np1 --binary -i ../config-$CARCH.patch || Fdie + if [ "$CARCH" = "i686" ]; then + PROCESSOR="IA32" + elif [ "$CARCH" = "x86_64" ]; then + PROCESSOR="X64" + fi + Fmkdir /usr/src/udk for i in *; do Fcprel $i /usr/src/udk done Fexec source edksetup.sh || Fdie Fexec make -C BaseTools || Fdie - Fexec BaseTools/BinWrappers/PosixLike/build -p MdeModulePkg/MdeModulePkg.dsc || Fdie - Fexec BaseTools/BinWrappers/PosixLike/build -p OvmfPkg/OvmfPkgX64.dsc || Fdie - Ffilerel Build/OvmfX64/RELEASE_GCC47/FV/OVMF.fd /usr/share/qemu/uefi.bin + for i in $PACKAGES; do + if [ -f "$i/$i${PROCESSOR/A/a}.dsc" ]; then + PROJECT="$i/$i${PROCESSOR/A/a}.dsc" + elif [ -f "$i/$i.dsc" ]; then + PROJECT="$i/$i.dsc" + else + error "Project file for $i not found!" + Fdie + fi + BaseTools/BinWrappers/PosixLike/build -p "$PROJECT" + done + Ffilerel Build/Ovmf$PROCESSOR/RELEASE_GCC47/FV/OVMF.fd /usr/share/qemu/uefi.bin + Ffilerel Build/Shell/RELEASE_GCC47/$PROCESSOR/Shell.efi /usr/lib/udk/shell.efi Fexe /usr/bin/qemu-uefi Fsplit qemu-uefi /usr/share/qemu Fsplit qemu-uefi /usr/bin + Fsplit udk-efi-tools /usr/lib/udk } # optimization OK diff --git a/source/devel-extra/udk/config-i686.patch b/source/devel-extra/udk/config-i686.patch new file mode 100644 index 0000000..9989935 --- /dev/null +++ b/source/devel-extra/udk/config-i686.patch @@ -0,0 +1,30 @@ +diff -ur a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template +--- a/BaseTools/Conf/target.template 2013-11-09 08:10:50.733723848 -0600 ++++ b/BaseTools/Conf/target.template 2013-11-09 08:32:14.922676101 -0600 +@@ -23,7 +23,7 @@ + # build. This line is required if and only if the current + # working directory does not contain one or more description + # files. +-ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc ++#ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc + + # TARGET List Optional Zero or more of the following: DEBUG, RELEASE, NOOPT + # UserDefined; separated by a space character. +@@ -31,7 +31,7 @@ + # valid targets specified in the platform description file + # will attempt to be built. The following line will build + # DEBUG platform target. +-TARGET = DEBUG ++TARGET = RELEASE + + # TARGET_ARCH List Optional What kind of architecture is the binary being target for. + # One, or more, of the following, IA32, IPF, X64, EBC, ARM +@@ -57,7 +57,7 @@ + # TAGNAME List Optional Specify the name(s) of the tools_def.txt TagName to use. + # If not specified, all applicable TagName tools will be + # used for the build. The list uses space character separation. +-TOOL_CHAIN_TAG = MYTOOLS ++TOOL_CHAIN_TAG = GCC47 + + # MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. Recommend to set this + # value to one more than the number of your compurter diff --git a/source/devel-extra/udk/config.patch b/source/devel-extra/udk/config-x86_64.patch similarity index 89% rename from source/devel-extra/udk/config.patch rename to source/devel-extra/udk/config-x86_64.patch index dda1f03..ce35ffc 100644 --- a/source/devel-extra/udk/config.patch +++ b/source/devel-extra/udk/config-x86_64.patch @@ -1,7 +1,7 @@ -diff -ur a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template ---- a/BaseTools/Conf/target.template 2013-02-01 01:41:04.000000000 -0600 -+++ b/BaseTools/Conf/target.template 2013-03-06 15:56:07.071831482 -0600 -@@ -23,7 +23,7 @@ +diff -ur a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template +--- a/BaseTools/Conf/target.template 2013-11-09 08:10:50.733723848 -0600 ++++ b/BaseTools/Conf/target.template 2013-11-09 08:31:49.097677061 -0600 +@@ -23,7 +23,7 @@ # build. This line is required if and only if the current # working directory does not contain one or more description # files. @@ -10,7 +10,7 @@ diff -ur a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template # TARGET List Optional Zero or more of the following: DEBUG, RELEASE, NOOPT # UserDefined; separated by a space character. -@@ -31,7 +31,7 @@ +@@ -31,7 +31,7 @@ # valid targets specified in the platform description file # will attempt to be built. The following line will build # DEBUG platform target. @@ -18,8 +18,8 @@ diff -ur a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template +TARGET = RELEASE # TARGET_ARCH List Optional What kind of architecture is the binary being target for. - # One, or more, of the following, IA32, IPF, X64, EBC or ARM. -@@ -46,7 +46,7 @@ + # One, or more, of the following, IA32, IPF, X64, EBC, ARM +@@ -47,7 +47,7 @@ # If not specified, then all valid architectures specified # in the platform file, for which tools are available, will be # built. @@ -28,7 +28,7 @@ diff -ur a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template # TOOL_DEFINITION_FILE Filename Optional Specify the name of the filename to use for specifying # the tools to use for the build. If not specified, -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ # TAGNAME List Optional Specify the name(s) of the tools_def.txt TagName to use. # If not specified, all applicable TagName tools will be # used for the build. The list uses space character separation. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
