From 430af796b62e3edb3bf864b676ca69daaeccb2da Mon Sep 17 00:00:00 2001 From: kth5 Date: Tue, 16 Jul 2024 08:26:16 +0200 Subject: [PATCH] * update efivar to 39-1 --- efivar/PKGBUILD | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/efivar/PKGBUILD b/efivar/PKGBUILD index 5cffdab3de..0b685953af 100644 --- a/efivar/PKGBUILD +++ b/efivar/PKGBUILD @@ -5,45 +5,42 @@ pkgname=efivar pkgdesc="Tools and libraries to work with EFI variables" -pkgver=38 -pkgrel=3 +pkgver=39 +_commit=a77a4ffec000ad5dfc5d6394d208784672acda82 # refs/tags/39 +pkgrel=1 arch=(x86_64 riscv64) url="https://github.com/rhboot/efivar" -license=(LGPL2.1) +license=(LGPL-2.1-or-later) depends=(glibc) -makedepends=(git mandoc) -checkdepends=(grub) -provides=(libefiboot.so libefisec.so libefivar.so) -# LTO has the linker segfaulting with binutils < 2.38.0: https://github.com/rhboot/efivar/issues/196 -options=(!lto) -source=( - git+$url#tag=${pkgver}?signed - $pkgname-38-ld_t.patch::https://github.com/rhboot/efivar/pull/201/commits/197a0874ea4010061b98b4b55eff65b33b1cd741.patch - $pkgname-march.patch +makedepends=( + git + mandoc ) -sha512sums=('SKIP' - '568bc88b182875c37479c49b3dbf5b8ee6edf8090f940176e67c9aa28dd2ff6f417c70b2bef6b5df99ada2afa33db3efd295ba9de5d68b3ecc5ce1dc3361d042' - '4705c12cfc6f6ea98d43107eeead9858fc662576000d0303a78a3314bcfbdf2acc1fee0e225bcac42d3076924f6d474364911e1018b701b4bf063290d70343c7') -b2sums=('SKIP' - 'ccddc04ab83d4dcf570d5a89e43fc27d36e2010513b36d9eb2fcdea71ceb5dba96a064a1cbca9ffdecf17fb5b9cb22cfe89eae4ee3a188547a4ab6fa6b4e2983' - 'cb625b747d79a9f42ecfca18818731678eac1bbcdf1f7e938f3433d83e36507bdcf8f3d1d23bb684785138bce0a49d00b06b40be629678ac1af6ca806a154957') +checkdepends=(grub) +provides=( + libefiboot.so + libefisec.so + libefivar.so +) +source=( + "git+$url#tag=$_commit?signed" +) +sha512sums=('SKIP') +b2sums=('SKIP') validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10') # Peter Jones -prepare() { - # fix issues with linker scripts: https://github.com/rhboot/efivar/pull/201 - patch -Np1 -d $pkgname -i ../$pkgname-38-ld_t.patch - - # -march=native is x86 only - patch -Np1 -d $pkgname -i ../$pkgname-march.patch +pkgver() { + cd $pkgname + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { # disable -Werror by default by setting ERRORS to empty string - make ERRORS='' all -C "${pkgname}" + make ERRORS='' all -C $pkgname } check() { - make GRUB_PREFIX=grub test -k -C "${pkgname}" || echo "grub related tests are flaky" + make GRUB_PREFIX=grub test -k -j1 -C $pkgname } package() {