Date: Saturday, March 4, 2017 @ 13:53:43 Author: thomas Revision: 289980
upgpkg: ovmf 1:r21243.3858b4a1ff-1 Modified: ovmf/trunk/PKGBUILD Deleted: ovmf/trunk/0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch ---------------------------------------------------------------+ 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch | 37 ---------- PKGBUILD | 15 ++-- 2 files changed, 9 insertions(+), 43 deletions(-) Deleted: 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch =================================================================== --- 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch 2017-03-04 12:59:41 UTC (rev 289979) +++ 0001-Fix-uninitialized-value-in-VfrCompiler-constructor.patch 2017-03-04 13:53:43 UTC (rev 289980) @@ -1,37 +0,0 @@ -From ab9435c71d894018c88c8f5ff89f654f2029d3ed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <[email protected]> -Date: Sat, 1 Mar 2014 20:30:57 +0100 -Subject: [PATCH] Fix uninitialized value in VfrCompiler constructor. - ---- - BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 1 + - BaseTools/Source/C/VfrCompile/VfrCompiler.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp -index dd34a1b..77b2cab 100644 ---- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp -+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp -@@ -371,6 +371,7 @@ CVfrCompiler::CVfrCompiler ( - { - mPreProcessCmd = (CHAR8 *) PREPROCESSOR_COMMAND; - mPreProcessOpt = (CHAR8 *) PREPROCESSOR_OPTIONS; -+ SET_RUN_STATUS(STATUS_UNKNOWN); - - OptionInitialization(Argc, Argv); - -diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h b/BaseTools/Source/C/VfrCompile/VfrCompiler.h -index ea20bbc..1603961 100644 ---- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h -+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h -@@ -60,6 +60,7 @@ typedef struct { - } OPTIONS; - - typedef enum { -+ STATUS_UNKNOWN = 0, - STATUS_INITIALIZED = 1, - STATUS_PREPROCESSED, - STATUS_COMPILEED, --- -1.9.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-04 12:59:41 UTC (rev 289979) +++ PKGBUILD 2017-03-04 13:53:43 UTC (rev 289980) @@ -1,7 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler <[email protected]> pkgname=ovmf -pkgver=18419 +pkgver=r21243.3858b4a1ff +epoch=1 pkgrel=1 arch=('any') pkgdesc="Tianocore UEFI firmware for qemu." @@ -8,14 +9,14 @@ url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2"; license=('custom') makedepends=('git' 'python2' 'iasl' 'nasm' 'subversion' 'perl-libwww') -source=('edk2::git+https://github.com/tianocore/edk2#commit=ddd097e33f6e6829dc0413820e9971f3bf025f87') +source=('edk2::git+https://github.com/tianocore/edk2#commit=3858b4a1ff09d3243fea8d07bd135478237cb8f7') sha256sums=('SKIP') options=(!makeflags) -_toolchain_opt=GCC49 +_toolchain_opt=GCC5 pkgver() { cd "${srcdir}"/edk2 - git svn find-rev HEAD + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { @@ -51,7 +52,9 @@ } package() { - 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/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/ovmf_code_ia32.bin + install -D -m644 "${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/ovmf_vars_ia32.bin + install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/ovmf_code_x64.bin + install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/ovmf_vars_x64.bin install -D -m644 "${srcdir}"/edk2/OvmfPkg/License.txt "${pkgdir}"/usr/share/licenses/ovmf/License.txt }
