alarm/vboot-utils to r2729.10343b821-1

This commit is contained in:
Kevin Mihelich 2023-02-22 19:11:22 +00:00
parent 5b197b6168
commit 50eab01f38
2 changed files with 5 additions and 45 deletions

View file

@ -1,38 +0,0 @@
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

View file

@ -2,7 +2,7 @@
# Contributor: Justin Settle <jus10 at partlycloudy dot org> # Contributor: Justin Settle <jus10 at partlycloudy dot org>
pkgname=vboot-utils pkgname=vboot-utils
pkgver=r1908.4c84e0778 pkgver=r2729.10343b821
pkgrel=1 pkgrel=1
arch=('armv7h' 'aarch64') arch=('armv7h' 'aarch64')
pkgdesc="Chromium OS vboot utilities" pkgdesc="Chromium OS vboot utilities"
@ -11,10 +11,9 @@ license=('custom:chromiumos')
makedepends=('libyaml' 'git') makedepends=('libyaml' 'git')
provides=('cgpt') provides=('cgpt')
replaces=('cgpt') replaces=('cgpt')
source=("git+https://chromium.googlesource.com/chromiumos/platform/vboot_reference" _commit=10343b8
'0001-Remove-static-futility.patch') source=("git+https://chromium.googlesource.com/chromiumos/platform/vboot_reference#commit=$_commit")
md5sums=('SKIP' md5sums=('SKIP')
'4623286d277f73b0a5ae04c30174e520')
pkgver() { pkgver() {
cd vboot_reference cd vboot_reference
@ -23,7 +22,6 @@ pkgver() {
prepare() { prepare() {
cd vboot_reference cd vboot_reference
git apply ../0001-Remove-static-futility.patch
# remove -Werror to prevent build failure # remove -Werror to prevent build failure
sed -i 's/-Werror//g' Makefile sed -i 's/-Werror//g' Makefile
} }
@ -35,5 +33,5 @@ build() {
package() { package() {
cd vboot_reference cd vboot_reference
make DESTDIR="${pkgdir}/usr" install make DESTDIR="${pkgdir}" install
} }