From 47bbe36e1c7208265e17ff5deb567c2b09f8059a Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 18 Mar 2018 21:10:18 +0000 Subject: [PATCH] alarm/vboot-utils to r1908.4c84e0778-1 --- .../0001-Remove-static-futility.patch | 38 +++++++++++++++++++ alarm/vboot-utils/PKGBUILD | 9 +++-- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 alarm/vboot-utils/0001-Remove-static-futility.patch diff --git a/alarm/vboot-utils/0001-Remove-static-futility.patch b/alarm/vboot-utils/0001-Remove-static-futility.patch new file mode 100644 index 000000000..cae6b3a84 --- /dev/null +++ b/alarm/vboot-utils/0001-Remove-static-futility.patch @@ -0,0 +1,38 @@ +From 59166c9aacda115ea2feb2e3f6a01c23f5e91fc2 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +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/alarm/vboot-utils/PKGBUILD b/alarm/vboot-utils/PKGBUILD index 0200941cc..113460929 100644 --- a/alarm/vboot-utils/PKGBUILD +++ b/alarm/vboot-utils/PKGBUILD @@ -4,7 +4,7 @@ buildarch=12 pkgname=vboot-utils -pkgver=r1787.8b7142525 +pkgver=r1908.4c84e0778 pkgrel=1 arch=('armv7h' 'aarch64') pkgdesc="Chromium OS vboot utilities" @@ -13,8 +13,10 @@ license=('custom:chromiumos') makedepends=('libyaml' 'git') provides=('cgpt') replaces=('cgpt') -source=("git+https://chromium.googlesource.com/chromiumos/platform/vboot_reference") -md5sums=('SKIP') +source=("git+https://chromium.googlesource.com/chromiumos/platform/vboot_reference" + '0001-Remove-static-futility.patch') +md5sums=('SKIP' + '4623286d277f73b0a5ae04c30174e520') pkgver() { cd vboot_reference @@ -23,6 +25,7 @@ pkgver() { prepare() { cd vboot_reference + git apply ../0001-Remove-static-futility.patch # remove -Werror to prevent build failure sed -i 's/-Werror//g' Makefile }