Bump pkgver

2 files changed, 11 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81e4f46bdbbd..a89b88e12e5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = uefi-shell-svn
 	pkgdesc = UEFI Shell v2 - from Tianocore EDK2 - SVN Version
-	pkgver = 14601
+	pkgver = 14662
 	pkgrel = 1
 	url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg
 	install = uefi-shell.install
@@ -14,10 +14,10 @@ pkgbase = uefi-shell-svn
 	options = !strip
 	options = docs
 	options = !makeflags
-	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/ShellPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellPkg
+	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_ShellPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellPkg
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5033029a3d53..27e9939ca29f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _COMPILER="GCC47"
 _pkgname="uefi-shell"
 pkgname="${_pkgname}-svn"
 
-pkgver=14601
+pkgver=14662
 pkgrel=1
 pkgdesc="UEFI Shell v2 - from Tianocore EDK2 - SVN Version"
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg"
@@ -32,7 +32,7 @@ provides=('uefi-shell')
 install="${_pkgname}.install"
 
 for _DIR_ in BaseTools MdePkg MdeModulePkg ShellPkg ; do
-	source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
 done
 
 sha1sums=('SKIP'
@@ -47,8 +47,10 @@ sha1sums=('SKIP'
 [[ "${CARCH}" == "i686" ]] && _TIANO_S_ARCH="ia32"
 
 pkgver() {
-	cd "${srcdir}/${_TIANOCORE_PKG}Pkg/"
+	
+	cd "${srcdir}/${_TIANO_DIR_}_${_TIANOCORE_PKG}Pkg/"
 	echo "$(svnversion)" | tr -d [A-z]
+	
 }
 
 _setup_env_vars() {
@@ -68,7 +70,7 @@ _prepare_tianocore_sources() {
 	mkdir -p "${_UDK_DIR}/"
 	
 	for _DIR_ in BaseTools MdePkg MdeModulePkg ShellPkg ; do
-		mv "${srcdir}/${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+		mv "${srcdir}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}"
 	done
 	
 	cd "${_UDK_DIR}/"