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

[Jonas Witschel]

    Date: Tuesday, March 23, 2021 @ 19:37:55
  Author: diabonas
Revision: 901339

upgpkg: shim 15.3-1: upstream release

- gnu-efi must now be built as a vendored Git submodule, using the system
  gnu-efi libraries is no longer supported (so EFI_PATH can be removed as
  well).
- HTTP boot is now enabled by default, so the ENABLE_HTTPBOOT configuration
  option does not exist any more.
- Add a check() function to run the new unit tests.
- The README has been moved to README.md.

Modified:
  shim/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-23 19:32:05 UTC (rev 901338)
+++ PKGBUILD	2021-03-23 19:37:55 UTC (rev 901339)
@@ -1,19 +1,25 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=shim
-pkgver=15
-pkgrel=5
+pkgver=15.3
+pkgrel=1
 pkgdesc="EFI preloader (unsigned EFI binaries)"
 arch=('any')
 url="https://github.com/rhboot/shim"
 license=('BSD')
-makedepends=('git' 'gnu-efi')
-source=("git+https://github.com/rhboot/shim#tag=${pkgver}?signed")
-md5sums=('SKIP')
+makedepends=('git')
+checkdepends=('xxd')
+source=("git+https://github.com/rhboot/shim#tag=${pkgver}?signed"
+        'rhboot-gnu-efi::git+https://github.com/rhboot/gnu-efi.git')
+md5sums=('SKIP'
+         'SKIP')
 validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10') # Peter Jones <pjones at redhat.com>
 
 prepare() {
   cd "$pkgname"
+  git submodule init
+  git config submodule.gnu-efi.url "$srcdir/rhboot-gnu-efi"
+  git submodule update
   # -Werror, not even once
   sed -e 's/-Werror //g' -i Makefile Make.defaults
 }
@@ -22,13 +28,18 @@
   cd "$pkgname"
   # TODO: evaluate setting DEFAULT_LOADER to e.g. loader.efi:
   # this would require changing grub's default, but would allow us to unify
-  make EFI_PATH='/usr/lib/' EFIDIR='ARCH' ENABLE_HTTPBOOT='1'
+  make EFIDIR='ARCH'
 }
 
+check() {
+  cd "$pkgname"
+  make test
+}
+
 package() {
   cd "$pkgname"
   make DATATARGETDIR="/usr/share/${pkgname}" DESTDIR="$pkgdir/" install-as-data
   install -vDm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -vDm 644 {BUILDING,README,README.{fallback,tpm},TODO} \
+  install -vDm 644 {BUILDING,README.{md,fallback,tpm},TODO} \
     -t "${pkgdir}/usr/share/doc/${pkgname}"
 }