summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO52
-rw-r--r--PKGBUILD34
2 files changed, 43 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8fc4d8e4b66d..6bece6d05ca0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,41 @@
-pkgbase = ovmf-svn
- pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - SVN Version
- pkgver = 17722
+pkgbase = ovmf-git
+ pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version
+ pkgver = 659.1bf35ac
pkgrel = 1
url = https://tianocore.github.io/ovmf/
install = ovmf.install
arch = x86_64
arch = i686
license = BSD
- makedepends = subversion
+ makedepends = git
makedepends = python2
makedepends = iasl
makedepends = nasm
- provides = ovmf=17722
- provides = ovmf-tianocore-edk2=17722
- provides = ovmf-tianocore-edk2-svn=17722
+ provides = ovmf=659.1bf35ac
+ provides = ovmf-bin
+ provides = ovmf-svn
conflicts = ovmf
- conflicts = ovmf-tianocore-edk2
- conflicts = ovmf-tianocore-edk2-svn
- noextract = openssl-1.0.2c.tar.gz
+ conflicts = ovmf-bin
+ conflicts = ovmf-svn
+ noextract = openssl-1.0.2d.tar.gz
options = !strip
options = docs
options = !makeflags
- source = https://www.openssl.org/source/openssl-1.0.2c.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
- sha1sums = 6e4a5e91159eb32383296c7c83ac0e59b83a0a44
+ 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
@@ -50,5 +50,5 @@ pkgbase = ovmf-svn
sha1sums = SKIP
sha1sums = SKIP
-pkgname = ovmf-svn
+pkgname = ovmf-git
diff --git a/PKGBUILD b/PKGBUILD
index 2435f1e7660f..26d28d249556 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Andre Osku Schmidt (oskude) <(andre.osku.schmidt) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
################
-_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"
################
################
@@ -18,39 +18,39 @@ _COMPILER="GCC49"
################
################
-_OPENSSL_VERSION="1.0.2c"
+_OPENSSL_VERSION="1.0.2d"
################
_pkgname="ovmf"
-pkgname="${_pkgname}-svn"
+pkgname="${_pkgname}-git"
-pkgver=17722
+pkgver=659.1bf35ac
pkgrel=1
-pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - SVN Version"
+pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version"
url="https://tianocore.github.io/ovmf/"
arch=('x86_64' 'i686')
license=('BSD')
-makedepends=('subversion' 'python2' 'iasl' 'nasm')
+makedepends=('git' 'python2' 'iasl' 'nasm')
options=('!strip' 'docs' '!makeflags')
-conflicts=('ovmf' 'ovmf-tianocore-edk2' 'ovmf-tianocore-edk2-svn')
-provides=("ovmf=${pkgver}" "ovmf-tianocore-edk2=${pkgver}" "ovmf-tianocore-edk2-svn=${pkgver}")
+conflicts=('ovmf' 'ovmf-bin' 'ovmf-svn')
+provides=("ovmf=${pkgver}" '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_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+ 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_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
+ source+=("${_TIANO_DIR_}-${_DIR_}::git+${_TIANOCORE_GIT_URL}-${_DIR_}.git#branch=master")
done
-sha1sums=('6e4a5e91159eb32383296c7c83ac0e59b83a0a44'
+sha1sums=('d01d17b44663e8ffa6a33a5a30053779d9593c3d'
'SKIP'
'SKIP'
'SKIP'
@@ -69,8 +69,8 @@ noextract=("openssl-${_OPENSSL_VERSION}.tar.gz")
pkgver() {
- cd "${srcdir}/${_TIANO_DIR_}_OvmfPkg/"
- echo "$(svnversion)" | tr -d [A-z]
+ cd "${srcdir}/${_TIANO_DIR_}-OvmfPkg/"
+ echo "$(git rev-list --count HEAD).$(git describe --always)" | sed -e 's|-|\.|g'
}
@@ -86,7 +86,7 @@ _bail_out() {
_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"
}
@@ -100,11 +100,11 @@ _prepare_tianocore_sources() {
mkdir -p "${_UDK_DIR}/"
for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
- mv "${srcdir}/${_TIANO_DIR_}_${_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}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}"
+ mv "${srcdir}/${_TIANO_DIR_}-${_DIR_}" "${_UDK_DIR}/${_DIR_}"
done
cd "${_UDK_DIR}/"