Use edk2/Basetools, and include OVMF_CODE.fd and OVMF_VARS.fd

3 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb7382910569..0af717284046 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 = 15668
+	pkgver = 15686
 	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=15668
-	provides = ovmf-tianocore-edk2=15668
-	provides = ovmf-tianocore-edk2-svn=15668
+	provides = ovmf=15686
+	provides = ovmf-tianocore-edk2=15686
+	provides = ovmf-tianocore-edk2-svn=15686
 	conflicts = ovmf
 	conflicts = ovmf-tianocore-edk2
 	conflicts = ovmf-tianocore-edk2-svn
@@ -23,7 +23,7 @@ pkgbase = ovmf-svn
 	source = http://www.openssl.org/source/openssl-0.9.8za.tar.gz
 	source = edk2-basetools-add-gcc4.9-support.patch
 	source = edk2-ovmfpkg-add-gcc4.9-support.patch
-	source = tianocore-edk2-svn_BaseTools::svn+https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools
+	source = tianocore-edk2-svn_BaseTools::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/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
 	source = tianocore-edk2-svn_IntelFrameworkPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/IntelFrameworkPkg
diff --git a/PKGBUILD b/PKGBUILD
index a11608cefec3..b4ba22f6f5de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ _OPENSSL_VERSION="0.9.8za"
 _pkgname="ovmf"
 pkgname="${_pkgname}-svn"
 
-pkgver=15668
+pkgver=15686
 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"
@@ -44,9 +44,7 @@ source=("http://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz"
         'edk2-basetools-add-gcc4.9-support.patch'
         'edk2-ovmfpkg-add-gcc4.9-support.patch')
 
-source+=("${_TIANO_DIR_}_BaseTools::svn+https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools")
-
-for _DIR_ in MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
+for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
 	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
 done
 
@@ -241,14 +239,18 @@ package() {
 	
 	_setup_env_vars
 	
-	install -d "${pkgdir}/usr/share/ovmf/"
-	
 	if [[ "${CARCH}" == "x86_64" ]]; then
 		msg "Install the OVMF X64 image"
-		install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_X64_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF.fd" "${pkgdir}/usr/share/ovmf/ovmf_x64.bin"
+		install -d "${pkgdir}/usr/share/ovmf/x64/"
+		install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_X64_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF.fd" "${pkgdir}/usr/share/ovmf/x64/ovmf_x64.bin"
+		install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_X64_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF_CODE.fd" "${pkgdir}/usr/share/ovmf/x64/ovmf_code_x64.bin"
+		install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_X64_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF_VARS.fd" "${pkgdir}/usr/share/ovmf/x64/ovmf_vars_x64.bin"
 	fi
 	
 	msg "Install the OVMF IA32 image"
-	install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_IA32_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF.fd" "${pkgdir}/usr/share/ovmf/ovmf_ia32.bin"
+	install -d "${pkgdir}/usr/share/ovmf/ia32/"
+	install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_IA32_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF.fd" "${pkgdir}/usr/share/ovmf/ia32/ovmf_ia32.bin"
+	install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_IA32_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF_CODE.fd" "${pkgdir}/usr/share/ovmf/ia32/ovmf_code_ia32.bin"
+	install -D -m0644 "${_UDK_DIR}/Build/${_UDK_OVMF_IA32_PKG}/${_UDK_TARGET}_${_COMPILER}/FV/OVMF_VARS.fd" "${pkgdir}/usr/share/ovmf/ia32/ovmf_vars_ia32.bin"
 	
 }
diff --git a/ovmf.install b/ovmf.install
index 1408dd1c4c9b..e69b0ff76793 100644
--- a/ovmf.install
+++ b/ovmf.install
@@ -3,21 +3,17 @@ post_install() {
 	cat << EOF
     
     NOTE:
-    The OVMF X64 UEFI image has been moved to /usr/share/ovmf/ovmf_x64.bin
-    The OVMF IA32 UEFI image has been moved to /usr/share/ovmf/ovmf_ia32.bin
-    
-    OVMF now support NV VAR storage within the OVMF image if QEMU flash (-pflash) is supported
-    This requires write access by QEMU to the OVMF image
-    For more info see http://sourceforge.net/p/tianocore/edk2/ci/e58e5bcd23badac8ef91d3bcc73baac3ca27e2ae/
+    The OVMF X64 UEFI image has been moved to /usr/share/ovmf/x64/ovmf_x64.bin
+    The OVMF IA32 UEFI image has been moved to /usr/share/ovmf/x64/ovmf_ia32.bin
     
     To test OVMF X64 in QEMU (use v1.5+) run:
     
-    \$ cp /usr/share/ovmf/ovmf_x64.bin ~/ovmf_x64.bin
+    \$ cp /usr/share/ovmf/x64/ovmf_x64.bin ~/ovmf_x64.bin
     \$ qemu-system-x86_64 -enable-kvm -net none -m 1500 -pflash ~/ovmf_x64.bin
     
     To test OVMF IA32 in QEMU (use v1.5+) run:
     
-    \$ cp /usr/share/ovmf/ovmf_ia32.bin ~/ovmf_ia32.bin
+    \$ cp /usr/share/ovmf/ia32/ovmf_ia32.bin ~/ovmf_ia32.bin
     \$ qemu-system-i386 -enable-kvm -net none -m 1024 -pflash ~/ovmf_ia32.bin
     
 EOF