[arch-commits] Commit in ovmf/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Wednesday, January 8, 2020 @ 20:59:48
  Author: anatolik
Revision: 372835

Use upstream tag name for package versioning

Modified:
  ovmf/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-08 20:56:11 UTC (rev 372834)
+++ PKGBUILD	2020-01-08 20:59:48 UTC (rev 372835)
@@ -1,6 +1,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+_edk_ver=201911
 pkgname=ovmf
-pkgver=r26976.bd85bf54c2
+pkgver=$_edk_ver
 epoch=1
 pkgrel=1
 arch=('any')
@@ -7,13 +9,13 @@
 pkgdesc="Tianocore UEFI firmware for qemu."
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2"
 license=('custom')
-makedepends=('git' 'python' 'iasl' 'nasm' 'subversion' 'perl-libwww' 'bc')
-_commit=edk2-stable201911
+makedepends=('python' 'iasl' 'nasm' 'subversion' 'perl-libwww' 'bc')
 _openssl_ver=1.1.1b # it should be 1.1.1d here but it has a compilation issue https://github.com/openssl/openssl/issues/9858
-source=(edk2::git+https://github.com/tianocore/edk2#commit=$_commit
+_edk2_tag=edk2-stable${_edk_ver}
+source=(https://github.com/tianocore/edk2/archive/${_edk2_tag}.zip
         https://www.openssl.org/source/openssl-$_openssl_ver.tar.gz{,.asc}
         60-edk2-ovmf-x86_64.json) # FS#64175 ; the file content should match https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
-sha256sums=('SKIP'
+sha256sums=('c6f691aa91afbaab811a369fe729f61d8e5b58bb5ad79a45446c9ee849c1a60b'
             '5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b'
             'SKIP'
             'b8f189f09593298c53e8b2afceadb17610b047fde51f4658e7373caeb3d0b856')
@@ -21,17 +23,12 @@
 options=(!makeflags)
 _toolchain_opt=GCC5
 
-pkgver() {
-  cd "${srcdir}"/edk2
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
 prepare() {
   # edk2 uses python everywhere, but expects python2
   #mkdir -p bin
   #ln -sf /usr/bin/python2 bin/python
-  rm -rf "$srcdir"/edk2/CryptoPkg/Library/OpensslLib/openssl
-  ln -sf "$srcdir"/openssl-$_openssl_ver $srcdir/edk2/CryptoPkg/Library/OpensslLib/openssl
+  rm -rf "$srcdir"/edk2-${_edk2_tag}/CryptoPkg/Library/OpensslLib/openssl
+  ln -sf "$srcdir"/openssl-$_openssl_ver $srcdir/edk2-${_edk2_tag}/CryptoPkg/Library/OpensslLib/openssl
 }
 
 build() {
@@ -40,9 +37,9 @@
     false
   fi
   export PATH="${srcdir}/bin:$PATH"
-  cd edk2
+  cd edk2-${_edk2_tag}
   make -C BaseTools
-  export EDK_TOOLS_PATH="${srcdir}"/edk2/BaseTools
+  export EDK_TOOLS_PATH="${srcdir}"/edk2-${_edk2_tag}/BaseTools
   . edksetup.sh BaseTools
 
   ./BaseTools/BinWrappers/PosixLike/build -t $_toolchain_opt -a X64 -p OvmfPkg/OvmfPkgX64.dsc -n $(nproc) -b RELEASE -D FD_SIZE_2MB -D NETWORK_IP6_ENABLE -D TPM2_ENABLE -D SECURE_BOOT_ENABLE -D HTTP_BOOT_ENABLE -D TLS_ENABLE
@@ -52,10 +49,10 @@
 }
 
 package() {
-  #install -D -m644 "${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_CODE.fd
-  #install -D -m644 "${srcdir}"/edk2/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_VARS.fd
-  install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_CODE.fd
-  install -D -m644 "${srcdir}"/edk2/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_VARS.fd
-  install -D -m644 "${srcdir}"/edk2/OvmfPkg/License.txt "${pkgdir}"/usr/share/licenses/ovmf/License.txt
+  #install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_CODE.fd
+  #install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/ia32/OVMF_VARS.fd
+  install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_CODE.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_CODE.fd
+  install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/OVMF_VARS.fd "${pkgdir}"/usr/share/ovmf/x64/OVMF_VARS.fd
+  install -D -m644 "${srcdir}"/edk2-${_edk2_tag}/OvmfPkg/License.txt "${pkgdir}"/usr/share/licenses/ovmf/License.txt
   install -D -m644 "${srcdir}"/60-edk2-ovmf-x86_64.json "${pkgdir}"/usr/share/qemu/firmware/60-edk2-ovmf-x86_64.json
 }