Date: Saturday, March 18, 2023 @ 16:04:01 Author: dvzrv Revision: 471493
upgpkg: efivar 38-3: Rebuild to re-sign package. Move options to make to a local bash array for easier handling. Modified: efivar/trunk/PKGBUILD ----------+ PKGBUILD | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-18 15:56:57 UTC (rev 471492) +++ PKGBUILD 2023-03-18 16:04:01 UTC (rev 471493) @@ -5,7 +5,7 @@ pkgname=efivar pkgdesc="Tools and libraries to work with EFI variables" pkgver=38 -pkgrel=2 +pkgrel=3 arch=(x86_64) url="https://github.com/rhboot/efivar"; license=(LGPL2.1) @@ -16,8 +16,8 @@ # LTO has the linker segfaulting with binutils < 2.38.0: https://github.com/rhboot/efivar/issues/196 options=(!lto) source=( - "git+https://github.com/rhinstaller/efivar.git#tag=${pkgver}?signed"; - "${pkgname}-38-ld_t.patch::https://github.com/rhboot/efivar/pull/201/commits/197a0874ea4010061b98b4b55eff65b33b1cd741.patch"; + git+$url#tag=${pkgver}?signed + $pkgname-38-ld_t.patch::https://github.com/rhboot/efivar/pull/201/commits/197a0874ea4010061b98b4b55eff65b33b1cd741.patch ) sha512sums=('SKIP' '568bc88b182875c37479c49b3dbf5b8ee6edf8090f940176e67c9aa28dd2ff6f417c70b2bef6b5df99ada2afa33db3efd295ba9de5d68b3ecc5ce1dc3361d042') @@ -26,9 +26,8 @@ validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10') # Peter Jones <[email protected]> prepare() { - cd "${pkgname}" # fix issues with linker scripts: https://github.com/rhboot/efivar/pull/201 - patch -Np1 -i ../"${pkgname}-38-ld_t.patch" + patch -Np1 -d $pkgname -i ../$pkgname-38-ld_t.patch } build() { @@ -41,12 +40,18 @@ } package() { - make DESTDIR="${pkgdir}/" \ - libdir=/usr/lib/ \ - bindir=/usr/bin/ \ - mandir=/usr/share/man/ \ - includedir=/usr/include/ \ - install -j1 V=1 \ - -C "${pkgname}" - install -vDm 644 "${pkgname}/"{README.md,TODO} -t "${pkgdir}/usr/share/doc/${pkgname}" + local make_options=( + V=1 + DESTDIR="$pkgdir/" + libdir=/usr/lib/ + bindir=/usr/bin/ + mandir=/usr/share/man/ + includedir=/usr/include/ + install + -j1 + -C $pkgname + ) + + make "${make_options[@]}" + install -vDm 644 $pkgname/{README.md,TODO} -t "$pkgdir/usr/share/doc/$pkgname/" }
