Switch to single edk2 git repo

2 files changed, 15 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c794087449a..0efbaa11222f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Dec 16 17:52:39 UTC 2015
 pkgbase = ovmf-git
 	pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version
-	pkgver = 659.1bf35ac
+	pkgver = 17363.e7e1201
 	pkgrel = 1
 	url = https://tianocore.github.io/ovmf/
 	install = ovmf.install
@@ -17,38 +19,14 @@ pkgbase = ovmf-git
 	conflicts = ovmf
 	conflicts = ovmf-bin
 	conflicts = ovmf-svn
-	noextract = openssl-1.0.2d.tar.gz
+	noextract = openssl-1.0.2e.tar.gz
 	options = !strip
 	options = docs
 	options = !makeflags
-	source = https://www.openssl.org/source/openssl-1.0.2d.tar.gz
-	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-IntelFrameworkPkg::git+https://github.com/tianocore/edk2-IntelFrameworkPkg.git#branch=master
-	source = edk2-IntelFrameworkModulePkg::git+https://github.com/tianocore/edk2-IntelFrameworkModulePkg.git#branch=master
-	source = edk2-PcAtChipsetPkg::git+https://github.com/tianocore/edk2-PcAtChipsetPkg.git#branch=master
-	source = edk2-UefiCpuPkg::git+https://github.com/tianocore/edk2-UefiCpuPkg.git#branch=master
-	source = edk2-OptionRomPkg::git+https://github.com/tianocore/edk2-OptionRomPkg.git#branch=master
-	source = edk2-CryptoPkg::git+https://github.com/tianocore/edk2-CryptoPkg.git#branch=master
-	source = edk2-SecurityPkg::git+https://github.com/tianocore/edk2-SecurityPkg.git#branch=master
-	source = edk2-ShellPkg::git+https://github.com/tianocore/edk2-ShellPkg.git#branch=master
-	source = edk2-FatBinPkg::git+https://github.com/tianocore/edk2-FatBinPkg.git#branch=master
-	source = edk2-OvmfPkg::git+https://github.com/tianocore/edk2-OvmfPkg.git#branch=master
-	sha1sums = d01d17b44663e8ffa6a33a5a30053779d9593c3d
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
+	source = edk2::git+https://github.com/tianocore/edk2.git#branch=master
+	source = https://www.openssl.org/source/openssl-1.0.2e.tar.gz
 	sha1sums = SKIP
+	sha1sums = 2c5691496761cb18f98476eefa4d35c835448fb6
 
 pkgname = ovmf-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f4f8a45240c9..ed0f1a624b09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,13 +18,13 @@ _COMPILER="GCC49"
 ################
 
 ################
-_OPENSSL_VERSION="1.0.2d"
+_OPENSSL_VERSION="1.0.2e"
 ################
 
 _pkgname="ovmf"
 pkgname="${_pkgname}-git"
 
-pkgver=659.1bf35ac
+pkgver=17363.e7e1201
 pkgrel=1
 pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version"
 url="https://tianocore.github.io/ovmf/"
@@ -40,36 +40,17 @@ provides=('ovmf' 'ovmf-bin' 'ovmf-svn')
 
 install="${_pkgname}.install"
 
-source=("https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
-
-for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
-	source+=("${_TIANO_DIR_}-${_DIR_}::git+${_TIANOCORE_GIT_URL}-${_DIR_}.git#branch=master")
-done
-
-for _DIR_ in PcAtChipsetPkg UefiCpuPkg OptionRomPkg CryptoPkg SecurityPkg ShellPkg FatBinPkg OvmfPkg ; do
-	source+=("${_TIANO_DIR_}-${_DIR_}::git+${_TIANOCORE_GIT_URL}-${_DIR_}.git#branch=master")
-done
-
-sha1sums=('d01d17b44663e8ffa6a33a5a30053779d9593c3d'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP')
+source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master"
+        "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
+
+sha1sums=('SKIP'
+          '2c5691496761cb18f98476eefa4d35c835448fb6')
 
 noextract=("openssl-${_OPENSSL_VERSION}.tar.gz")
 
 pkgver() {
 	
-	cd "${srcdir}/${_TIANO_DIR_}-OvmfPkg/"
+	cd "${srcdir}/${_TIANO_DIR_}/"
 	echo "$(git rev-list --count HEAD).$(git describe --always)" | sed -e 's|-|\.|g'
 	
 }
@@ -93,20 +74,6 @@ _setup_env_vars() {
 
 _prepare_tianocore_sources() {
 	
-	msg "Delete old UDK BUILD dir"
-	rm -rf "${_UDK_DIR}/" || true
-	
-	msg "Create UDK BUILD dir"
-	mkdir -p "${_UDK_DIR}/"
-	
-	for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
-		mv "${srcdir}/${_TIANO_DIR_}-${_DIR_}" "${_UDK_DIR}/${_DIR_}"
-	done
-	
-	for _DIR_ in PcAtChipsetPkg UefiCpuPkg OptionRomPkg CryptoPkg SecurityPkg ShellPkg FatBinPkg OvmfPkg ; do
-		mv "${srcdir}/${_TIANO_DIR_}-${_DIR_}" "${_UDK_DIR}/${_DIR_}"
-	done
-	
 	cd "${_UDK_DIR}/"
 	
 	msg "Cleanup UDK config files"
@@ -123,11 +90,6 @@ _prepare_tianocore_sources() {
 	sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Source/C/Makefiles/header.makefile" || true
 	sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
 	
-	msg "Fix GCC >=4.7 error - gcc: error: unrecognized command line option '-melf_x86_64'"
-	sed 's| -m64 --64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
-	sed 's|--64 | |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
-	sed 's| -m64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
-	
 	msg "Remove GCC -g debug option and add -O0 -mabi=ms -maccumulate-outgoing-args"
 	sed 's|DEFINE GCC_ALL_CC_FLAGS            = -g |DEFINE GCC_ALL_CC_FLAGS            = -O0 -mabi=ms -maccumulate-outgoing-args |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true
 	sed 's|DEFINE GCC44_ALL_CC_FLAGS            = -g |DEFINE GCC44_ALL_CC_FLAGS            = -O0 -mabi=ms -maccumulate-outgoing-args |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true