Remove vfrcompiler patch

3 files changed, 7 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5f1018b5558..3fa086e1c757 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ovmf-svn
 	pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - SVN Version
-	pkgver = 15601
+	pkgver = 15613
 	pkgrel = 1
 	url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF
 	install = ovmf.install
@@ -10,9 +10,9 @@ pkgbase = ovmf-svn
 	makedepends = subversion
 	makedepends = python2
 	makedepends = iasl
-	provides = ovmf
-	provides = ovmf-tianocore-edk2
-	provides = ovmf-tianocore-edk2-svn
+	provides = ovmf=15613
+	provides = ovmf-tianocore-edk2=15613
+	provides = ovmf-tianocore-edk2-svn=15613
 	conflicts = ovmf
 	conflicts = ovmf-tianocore-edk2
 	conflicts = ovmf-tianocore-edk2-svn
@@ -21,7 +21,6 @@ pkgbase = ovmf-svn
 	options = docs
 	options = !makeflags
 	source = http://www.openssl.org/source/openssl-0.9.8w.tar.gz
-	source = edk2-basetools-fix-vfrcompiler.patch
 	source = tianocore-edk2-svn_BaseTools::svn+https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools
 	source = tianocore-edk2-svn_MdePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/MdePkg
 	source = tianocore-edk2-svn_MdeModulePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/MdeModulePkg
@@ -36,7 +35,6 @@ pkgbase = ovmf-svn
 	source = tianocore-edk2-svn_FatBinPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/FatBinPkg
 	source = tianocore-edk2-svn_OvmfPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/OvmfPkg
 	sha1sums = 6dd276534f87aaca4bee679537fef3aaa6b43069
-	sha1sums = 63a8b1e9ac54035ffc98f5c61ea3b71361a5634e
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9f4ed9292275..d81286e3a89a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ _OPENSSL_VERSION="0.9.8w"
 _pkgname="ovmf"
 pkgname="${_pkgname}-svn"
 
-pkgver=15601
+pkgver=15613
 pkgrel=1
 pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - SVN Version"
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF"
@@ -36,12 +36,11 @@ makedepends=('subversion' 'python2' 'iasl')
 options=('!strip' 'docs' '!makeflags')
 
 conflicts=('ovmf' 'ovmf-tianocore-edk2' 'ovmf-tianocore-edk2-svn')
-provides=('ovmf' 'ovmf-tianocore-edk2' 'ovmf-tianocore-edk2-svn')
+provides=("ovmf=${pkgver}" "ovmf-tianocore-edk2=${pkgver}" "ovmf-tianocore-edk2-svn=${pkgver}")
 
 install="${_pkgname}.install"
 
-source=("http://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz"
-        'edk2-basetools-fix-vfrcompiler.patch')
+source=("http://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
 
 source+=("${_TIANO_DIR_}_BaseTools::svn+https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools")
 
@@ -54,7 +53,6 @@ for _DIR_ in PcAtChipsetPkg UefiCpuPkg OptionRomPkg CryptoPkg SecurityPkg ShellP
 done
 
 sha1sums=('6dd276534f87aaca4bee679537fef3aaa6b43069'
-          '63a8b1e9ac54035ffc98f5c61ea3b71361a5634e'
           'SKIP'
           'SKIP'
           'SKIP'
@@ -119,10 +117,6 @@ _prepare_tianocore_sources() {
 	mkdir -p "${_UDK_DIR}/Conf/"
 	mkdir -p "${_UDK_DIR}/Build/"
 	
-	msg "Fix EDK2 Basetools VfrCompiler issue"
-	patch -Np1 --binary -i "${srcdir}/edk2-basetools-fix-vfrcompiler.patch" || true
-	echo
-	
 	msg "Use python2 for UDK BaseTools"
 	sed 's|python |python2 |g' -i "${EDK_TOOLS_PATH}/BinWrappers/PosixLike"/* || true
 	sed 's|python |python2 |g' -i "${EDK_TOOLS_PATH}/Tests/GNUmakefile"
diff --git a/edk2-basetools-fix-vfrcompiler.patch b/edk2-basetools-fix-vfrcompiler.patch
deleted file mode 100644
index 6ac119e4aa68..000000000000
--- a/edk2-basetools-fix-vfrcompiler.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Reza Jelveh <reza.jel...@tuhh.de>

-

-Contributed-under: TianoCore Contribution Agreement 1.0

-Signed-off-by: Reza Jelveh <reza.jel...@tuhh.de>

----

- BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 2 ++

- BaseTools/Source/C/VfrCompile/VfrCompiler.h   | 3 ++-

- 2 files changed, 4 insertions(+), 1 deletion(-)

-

-diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp 

-b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp

-index dd34a1b..ee10605 100644

---- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp

-+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp

-@@ -372,6 +372,8 @@ CVfrCompiler::CVfrCompiler (

-   mPreProcessCmd = (CHAR8 *) PREPROCESSOR_COMMAND;

-   mPreProcessOpt = (CHAR8 *) PREPROCESSOR_OPTIONS;

- 

-+  SET_RUN_STATUS (STATUS_STARTED);

-+

-   OptionInitialization(Argc, Argv);

- 

-   if ((IS_RUN_STATUS(STATUS_FAILED)) || (IS_RUN_STATUS(STATUS_DEAD))) {

-diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h 

-b/BaseTools/Source/C/VfrCompile/VfrCompiler.h

-index ea20bbc..3261e9c 100644

---- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h

-+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h

-@@ -60,7 +60,8 @@ typedef struct {

- } OPTIONS;

- 

- typedef enum {

--  STATUS_INITIALIZED = 1,

-+  STATUS_STARTED = 0,

-+  STATUS_INITIALIZED,

-   STATUS_PREPROCESSED,

-   STATUS_COMPILEED,

-   STATUS_GENBINARY,

--- 

-1.9.2