Date: Monday, January 17, 2022 @ 18:01:44 Author: dvzrv Revision: 434615
upgpkg: efivar 38-2: Rebuild to apply upstream patch for linker issues. Upstream fixed the ld problem, so we can drop a custom (not very good) patch: https://github.com/rhboot/efivar/pull/201 Modified: efivar/trunk/PKGBUILD Deleted: efivar/trunk/efivar-38-linker.patch ------------------------+ PKGBUILD | 12 ++++++------ efivar-38-linker.patch | 32 -------------------------------- 2 files changed, 6 insertions(+), 38 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-17 17:36:59 UTC (rev 434614) +++ PKGBUILD 2022-01-17 18:01:44 UTC (rev 434615) @@ -5,7 +5,7 @@ pkgname=efivar pkgdesc="Tools and libraries to work with EFI variables" pkgver=38 -pkgrel=1 +pkgrel=2 arch=(x86_64) url="https://github.com/rhboot/efivar"; license=(LGPL2.1) @@ -17,18 +17,18 @@ options=(!lto) source=( "git+https://github.com/rhinstaller/efivar.git#tag=${pkgver}?signed"; - "${pkgname}-38-linker.patch" + "${pkgname}-38-ld_t.patch::https://github.com/rhboot/efivar/pull/201/commits/197a0874ea4010061b98b4b55eff65b33b1cd741.patch"; ) sha512sums=('SKIP' - 'd870de5a44e3a718acea5aa87b53a2a955dc35d8f04a30fbb440edb6f68b1890ec5767c5a6439201567866af319a7fddde8acb181111bcb2c7acb6c70b262a76') + '568bc88b182875c37479c49b3dbf5b8ee6edf8090f940176e67c9aa28dd2ff6f417c70b2bef6b5df99ada2afa33db3efd295ba9de5d68b3ecc5ce1dc3361d042') b2sums=('SKIP' - 'f41f0b04f5b3840e49ce07fc444a0119d06f31fcf9d2be9e065832a13d3906827025447a7147870082545c14871b23d099b394751815def4ed8ef0946cb76426') + 'ccddc04ab83d4dcf570d5a89e43fc27d36e2010513b36d9eb2fcdea71ceb5dba96a064a1cbca9ffdecf17fb5b9cb22cfe89eae4ee3a188547a4ab6fa6b4e2983') validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10') # Peter Jones <[email protected]> prepare() { cd "${pkgname}" - # fix issues with linker scripts: https://github.com/rhboot/efivar/pull/195 - patch -Np1 -i ../"${pkgname}-38-linker.patch" + # fix issues with linker scripts: https://github.com/rhboot/efivar/pull/201 + patch -Np1 -i ../"${pkgname}-38-ld_t.patch" } build() { Deleted: efivar-38-linker.patch =================================================================== --- efivar-38-linker.patch 2022-01-17 17:36:59 UTC (rev 434614) +++ efivar-38-linker.patch 2022-01-17 18:01:44 UTC (rev 434615) @@ -1,32 +0,0 @@ -From 3d6e168c7ffa8bcebfc2b9965e4af4b86e9384fa Mon Sep 17 00:00:00 2001 -From: David Runge <[email protected]> -Date: Sat, 15 Jan 2022 13:23:17 +0100 -Subject: [PATCH] Add script flag for files containing output sections - -src/include/rules.mk: -Extend foreach loop that populates LDS with the linker scriptfile flag -(`-T`), as linking otherwise fails on LDSCRIPTS providing files with -output sections: - -``` -/usr/bin/ld: warning: guids.lds contains output sections; did you forget -T? -``` - -Signed-off-by: David Runge <[email protected]> ---- - src/include/rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/include/rules.mk b/src/include/rules.mk -index f309f863..12986dee 100644 ---- a/src/include/rules.mk -+++ b/src/include/rules.mk -@@ -37,7 +37,7 @@ family = $(foreach FAMILY_SUFFIX,$(FAMILY_SUFFIXES),$($(1)_$(FAMILY_SUFFIX))) - - %.so : - $(CCLD) $(CCLDFLAGS) $(CPPFLAGS) $(SOFLAGS) \ -- $(foreach LDS,$(LDSCRIPTS),$(LD_DASH_T) $(LDS)) \ -+ $(foreach LDS,$(LDSCRIPTS),$(LD_DASH_T) -T $(LDS)) \ - -o $@ $^ $(LDLIBS) - ln -vfs $@ [email protected] -
