Bump pkgver

2 files changed, 22 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 915dcc3d8f84..e2da8768b499 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 = 14610
+	pkgver = 14662
 	pkgrel = 1
 	url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF
 	install = ovmf.install
@@ -20,19 +20,19 @@ pkgbase = ovmf-svn
 	options = docs
 	options = !makeflags
 	source = http://www.openssl.org/source/openssl-0.9.8w.tar.gz
-	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
-	source = tianocore-edk2-svn/IntelFrameworkModulePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/IntelFrameworkModulePkg
-	source = tianocore-edk2-svn/PcAtChipsetPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/PcAtChipsetPkg
-	source = tianocore-edk2-svn/UefiCpuPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/UefiCpuPkg
-	source = tianocore-edk2-svn/OptionRomPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/OptionRomPkg
-	source = tianocore-edk2-svn/CryptoPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/CryptoPkg
-	source = tianocore-edk2-svn/SecurityPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/SecurityPkg
-	source = tianocore-edk2-svn/ShellPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellPkg
-	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
+	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
+	source = tianocore-edk2-svn_IntelFrameworkModulePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/IntelFrameworkModulePkg
+	source = tianocore-edk2-svn_PcAtChipsetPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/PcAtChipsetPkg
+	source = tianocore-edk2-svn_UefiCpuPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/UefiCpuPkg
+	source = tianocore-edk2-svn_OptionRomPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/OptionRomPkg
+	source = tianocore-edk2-svn_CryptoPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/CryptoPkg
+	source = tianocore-edk2-svn_SecurityPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/SecurityPkg
+	source = tianocore-edk2-svn_ShellPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellPkg
+	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 = SKIP
 	sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 31f4fc30288b..cad60df6887f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _OPENSSL_VERSION="0.9.8w"
 _pkgname="ovmf"
 pkgname="${_pkgname}-svn"
 
-pkgver=14610
+pkgver=14662
 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"
@@ -39,11 +39,11 @@ install="${_pkgname}.install"
 source=("http://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
 
 for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
-	source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
 done
 
 for _DIR_ in PcAtChipsetPkg UefiCpuPkg OptionRomPkg CryptoPkg SecurityPkg ShellPkg FatBinPkg OvmfPkg ; do
-	source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
 done
 
 sha1sums=('6dd276534f87aaca4bee679537fef3aaa6b43069'
@@ -64,8 +64,10 @@ sha1sums=('6dd276534f87aaca4bee679537fef3aaa6b43069'
 noextract=("openssl-${_OPENSSL_VERSION}.tar.gz")
 
 pkgver() {
-	cd "${srcdir}/OvmfPkg/"
+	
+	cd "${srcdir}/${_TIANO_DIR_}_OvmfPkg/"
 	echo "$(svnversion)" | tr -d [A-z]
+	
 }
 
 _bail_out() {
@@ -94,11 +96,11 @@ _prepare_tianocore_sources() {
 	mkdir -p "${_UDK_DIR}/"
 	
 	for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
-		mv "${srcdir}/${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+		mv "${srcdir}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}"
 	done
 	
 	for _DIR_ in PcAtChipsetPkg UefiCpuPkg OptionRomPkg CryptoPkg SecurityPkg ShellPkg FatBinPkg OvmfPkg ; do
-		mv "${srcdir}/${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+		mv "${srcdir}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}"
 	done
 	
 	cd "${_UDK_DIR}/"