Rename to uefi-shell-git

2 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92845fb87ce1..e6687f1c618e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,29 @@
-pkgbase = uefi-shell-svn
-	pkgdesc = UEFI Shell v2 - from Tianocore EDK2 - SVN Version
-	pkgver = 17582
+pkgbase = uefi-shell-git
+	pkgdesc = UEFI Shell v2 - from Tianocore EDK2 - GIT Version
+	pkgver = 681.85807a5
 	pkgrel = 1
 	url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg
 	install = uefi-shell.install
 	arch = x86_64
 	arch = i686
 	license = BSD
-	makedepends = subversion
+	makedepends = git
 	makedepends = python2
 	makedepends = nasm
-	provides = uefi-shell=17582
+	provides = uefi-shell
+	provides = uefi-shell-svn
 	conflicts = uefi-shell
+	conflicts = uefi-shell-svn
 	options = !strip
 	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 = edk2-BaseTools::git+https://github.com/tianocore/edk2-BaseTools.git#branch=master
+	source = edk2-MdePkg::git+https://github.com/tianocore/edk2-MdePkg.git#branch=master
+	source = edk2-MdeModulePkg::git+https://github.com/tianocore/edk2-MdeModulePkg.git#branch=master
+	source = edk2-ShellPkg::git+https://github.com/tianocore/edk2-ShellPkg.git#branch=master
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 
-pkgname = uefi-shell-svn
+pkgname = uefi-shell-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8f7620b40053..3dcbeea162be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 _SHELL_IA32_ARCH_X64="1"
 
 ###############
-_TIANOCORE_SVN_URL="https://svn.code.sf.net/p/edk2/code/trunk/edk2"
-_TIANO_DIR_="tianocore-edk2-svn"
+_TIANOCORE_GIT_URL="https://github.com/tianocore/edk2"
+_TIANO_DIR_="edk2"
 ###############
 
 ###############
@@ -24,28 +24,28 @@ _COMPILER="GCC49"
 ###############
 
 _pkgname="uefi-shell"
-pkgname="${_pkgname}-svn"
+pkgname="${_pkgname}-git"
 
-pkgver=17582
+pkgver=681.85807a5
 pkgrel=1
-pkgdesc="UEFI Shell v2 - from Tianocore EDK2 - SVN Version"
+pkgdesc="UEFI Shell v2 - from Tianocore EDK2 - GIT Version"
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg"
 arch=('x86_64' 'i686')
 license=('BSD')
 
-makedepends=('subversion' 'python2' 'nasm')
+makedepends=('git' 'python2' 'nasm')
 
 options=('!strip' '!makeflags')
 
-conflicts=('uefi-shell')
-provides=("uefi-shell=${pkgver}")
+conflicts=('uefi-shell' 'uefi-shell-svn')
+provides=('uefi-shell' 'uefi-shell-svn')
 
 install="${_pkgname}.install"
 
 source=()
 
 for _DIR_ in BaseTools MdePkg MdeModulePkg ShellPkg ; do
-	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+	source+=("${_TIANO_DIR_}-${_DIR_}::git+${_TIANOCORE_GIT_URL}-${_DIR_}.git#branch=master")
 done
 
 sha1sums=('SKIP'
@@ -55,15 +55,15 @@ sha1sums=('SKIP'
 
 pkgver() {
 	
-	cd "${srcdir}/${_TIANO_DIR_}_${_TIANOCORE_PKG}Pkg/"
-	echo "$(svnversion)" | tr -d [A-z]
+	cd "${srcdir}/${_TIANO_DIR_}-${_TIANOCORE_PKG}Pkg/"
+	echo "$(git rev-list --count HEAD).$(git describe --always)" | sed -e 's|-|\.|g'
 	
 }
 
 _setup_env_vars() {
 	
 	msg "Setup UDK PATH ENV variables"
-	export _UDK_DIR="${srcdir}/${_TIANO_DIR_}_build"
+	export _UDK_DIR="${srcdir}/${_TIANO_DIR_}"
 	export EDK_TOOLS_PATH="${_UDK_DIR}/BaseTools"
 	
 }
@@ -77,7 +77,7 @@ _prepare_tianocore_sources() {
 	mkdir -p "${_UDK_DIR}/"
 	
 	for _DIR_ in BaseTools MdePkg MdeModulePkg ShellPkg ; do
-		mv "${srcdir}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+		mv "${srcdir}/${_TIANO_DIR_}-${_DIR_}" "${_UDK_DIR}/${_DIR_}"
 	done
 	
 	cd "${_UDK_DIR}/"