aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2020-05-08 21:23:13 +0200
committerMilan P. Stanić <mps@arvanta.net>2020-05-08 21:26:33 +0200
commitedc193322116c48ad86129ed6dd4feead5321a3e (patch)
tree3026d5a8b9cbac4a4207485dd6d8dfa56484a1de
parent945d97906ebb95e7d333e11bc7abbae7497a0665 (diff)
downloadaports-edc193322116c48ad86129ed6dd4feead5321a3e.tar.bz2
aports-edc193322116c48ad86129ed6dd4feead5321a3e.tar.xz
community/vboot-utils: remove building static futility
add patch from Arch Linux Alarm to disable build of static futility binary
-rw-r--r--community/vboot-utils/0001-Remove-static-futility.patch38
-rw-r--r--community/vboot-utils/APKBUILD9
2 files changed, 44 insertions, 3 deletions
diff --git a/community/vboot-utils/0001-Remove-static-futility.patch b/community/vboot-utils/0001-Remove-static-futility.patch
new file mode 100644
index 0000000000..cae6b3a847
--- /dev/null
+++ b/community/vboot-utils/0001-Remove-static-futility.patch
@@ -0,0 +1,38 @@
+From 59166c9aacda115ea2feb2e3f6a01c23f5e91fc2 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 18 Mar 2018 14:46:01 -0600
+Subject: [PATCH] Remove static futility
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1f3e7f664..75168b146 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1112,7 +1112,7 @@ signing_install: ${SIGNING_SCRIPTS} ${SIGNING_SCRIPTS_DEV} ${SIGNING_COMMON}
+ # new Firmware Utility
+
+ .PHONY: futil
+-futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
++futil: ${FUTIL_BIN}
+
+ ${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS} -lpthread
+ ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
+@@ -1125,10 +1125,10 @@ ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}
+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
+
+ .PHONY: futil_install
+-futil_install: ${FUTIL_BIN} ${FUTIL_STATIC_BIN}
++futil_install: ${FUTIL_BIN}
+ @${PRINTF} " INSTALL futility\n"
+ ${Q}mkdir -p ${UB_DIR}
+- ${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN} ${FUTIL_STATIC_BIN}
++ ${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN}
+ ${Q}for prog in ${FUTIL_SYMLINKS}; do \
+ ln -sf futility "${UB_DIR}/$$prog"; done
+
+--
+2.16.2
+
diff --git a/community/vboot-utils/APKBUILD b/community/vboot-utils/APKBUILD
index 6542bd467a..764389bf28 100644
--- a/community/vboot-utils/APKBUILD
+++ b/community/vboot-utils/APKBUILD
@@ -2,7 +2,8 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=vboot-utils
pkgver=6310032
-pkgrel=1
+_release=0~R63-10032.B
+pkgrel=2
pkgdesc="Chromium OS vboot utilities"
url="https://github.com/coreboot/vboot"
arch="all !ppc64le !s390x !mips !mips64"
@@ -10,8 +11,9 @@ license="custom:chromiumos"
options="!check" # test fails but package works
makedepends="yaml-dev xz-dev fts-dev openssl-dev util-linux-dev bash linux-headers"
subpackages="cgpt $pkgname-doc"
-source="http://cdn-fastly.deb.debian.org/debian/pool/main/v/vboot-utils/vboot-utils_0~R63-10032.B.orig.tar.gz
+source="http://cdn-fastly.deb.debian.org/debian/pool/main/v/vboot-utils/vboot-utils_$_release.orig.tar.gz
no-static.patch
+ 0001-Remove-static-futility.patch
"
builddir="$srcdir"
@@ -36,4 +38,5 @@ cgpt() {
mv "$pkgdir"/usr/bin/cgpt "$subpkgdir"/usr/sbin/
}
sha512sums="48c0cf858f74cbb0020212ac619ed93ac011530e4f25518e05301f710bb78eba532ee901e79a04d6808122ef589fdf4c6a0f53656350d2f9bf717c588fc795fc vboot-utils_0~R63-10032.B.orig.tar.gz
-64c5e219ea247b1d81a7e8d10ee99fe2d008ee8579bcc41734861a808b9b2c35f889b0732223b85e87052caa712408894b5364f675e1d22fba63a697b27193d3 no-static.patch"
+64c5e219ea247b1d81a7e8d10ee99fe2d008ee8579bcc41734861a808b9b2c35f889b0732223b85e87052caa712408894b5364f675e1d22fba63a697b27193d3 no-static.patch
+baaa5c262352d76542cd1012fa66ce75a1251430181cf0063316a3a632dc248539a619ebd4d5da546281170dd944f256682502399cc6b367057c2167a486bebf 0001-Remove-static-futility.patch"