[arch-commits] Commit in ovmf/trunk (PKGBUILD)

[Thomas Bächler]

    Date: Monday, October 27, 2014 @ 00:02:57
  Author: thomas
Revision: 225387

upgpkg: ovmf 16229-1

Modified:
  ovmf/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-26 21:28:17 UTC (rev 225386)
+++ PKGBUILD	2014-10-26 23:02:57 UTC (rev 225387)
@@ -1,18 +1,17 @@
 # $Id$
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=ovmf
-pkgver=15280
+pkgver=16229
 pkgrel=1
 arch=('any')
 pkgdesc="Tianocore UEFI firmware for qemu."
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2"
 license=('custom')
-makedepends=('git' 'python2' 'iasl')
-source=('edk2::git+https://github.com/tianocore/edk2#commit=57a1b9c4252985ee5d631340fed453e73e0c9146'
-        '0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch')
-sha256sums=('SKIP'
-            '8761c79b9d3e616c42bfb9c61d72893bbe19d774fe28ce9733ff62ed92478868')
+makedepends=('git' 'python2' 'iasl' 'nasm')
+source=('edk2::git+https://github.com/tianocore/edk2#commit=956f71b611b7677bc0605b95c4e67af413aaab86')
+sha256sums=('SKIP')
 options=(!makeflags)
+_toolchain_opt=GCC49
 
 pkgver() {
   cd "${srcdir}"/edk2
@@ -24,9 +23,6 @@
   # edk2 uses python everywhere, but expects python2
   mkdir bin
   ln -s /usr/bin/python2 bin/python
-
-  cd edk2
-  patch -p1 -i "${srcdir}"/0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch
 }
 
 build() {
@@ -40,9 +36,9 @@
   export EDK_TOOLS_PATH="${srcdir}"/edk2/BaseTools
   . edksetup.sh BaseTools
 
-  # Set RELEASE target, gcc 4.8 toolchain and number of build threads
+  # Set RELEASE target, toolchain and number of build threads
   sed "s|^TARGET[ ]*=.*|TARGET = RELEASE|; \
-       s|TOOL_CHAIN_TAG[ ]*=.*|TOOL_CHAIN_TAG = GCC48|; \
+       s|TOOL_CHAIN_TAG[ ]*=.*|TOOL_CHAIN_TAG = ${_toolchain_opt}|; \
        s|MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*|MAX_CONCURRENT_THREAD_NUMBER = $(nproc)|;" -i Conf/target.txt
   # Build OVMF for ia32
   sed "s|^TARGET_ARCH[ ]*=.*|TARGET_ARCH = IA32|; \
@@ -55,7 +51,7 @@
 }
 
 package() {
-  install -D -m644 "${srcdir}"/edk2/Build/OvmfIa32/RELEASE_GCC48/FV/OVMF.fd "${pkgdir}"/usr/share/ovmf/ovmf_ia32.bin
-  install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_GCC48/FV/OVMF.fd "${pkgdir}"/usr/share/ovmf/ovmf_x64.bin
+  install -D -m644 "${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF.fd "${pkgdir}"/usr/share/ovmf/ovmf_ia32.bin
+  install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF.fd "${pkgdir}"/usr/share/ovmf/ovmf_x64.bin
   install -D -m644 "${srcdir}"/edk2/OvmfPkg/License.txt "${pkgdir}"/usr/share/licenses/ovmf/License.txt
 }