summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatol Pomozov2018-03-03 11:11:16 -0800
committerAnatol Pomozov2018-03-03 11:11:16 -0800
commit98ac0cc49409a87c2b7f63ca947f7b9a9a0e9573 (patch)
tree35ba6c9f38a3e0f4e9a8997f1bebdcb73806055f
parent0c806d7d60edeb6b29e53f70d10be2e4ee9372ba (diff)
downloadaur-98ac0cc49409a87c2b7f63ca947f7b9a9a0e9573.tar.gz
updpkg
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
-rw-r--r--no_static.patch22
3 files changed, 14 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 574f6c1f96f..00d3c843470 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Jan 6 06:33:50 UTC 2018
+# Sat Mar 3 19:11:05 UTC 2018
pkgbase = vboot-utils
pkgdesc = Chromium OS verified boot utilities
- pkgver = 64.10176
+ pkgver = 66.10452
pkgrel = 1
url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference
arch = i686
@@ -12,10 +12,10 @@ pkgbase = vboot-utils
makedepends = trousers
depends = libutil-linux
depends = openssl
- source = https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/refs/heads/release-R64-10176.B.tar.gz
+ source = https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/refs/heads/release-R66-10452.B.tar.gz
source = no_static.patch
- sha1sums = SKIP
- sha1sums = 4fa3b0d34579718a22e06fb44e089c8601522e89
+ sha1sums = ded3cfbe21f4cb0f1f9dd194e8dd72d7a8ed23fb
+ sha1sums = b45016e2f1a9833d24d68a3d35a043258cab9405
pkgname = vboot-utils
diff --git a/PKGBUILD b/PKGBUILD
index 1ed2598bc91..83fecfd20e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=vboot-utils
pkgdesc='Chromium OS verified boot utilities'
-pkgver=64.10176
+pkgver=66.10452
_tag=release-R${pkgver/\./-}.B
pkgrel=1
arch=(i686 x86_64)
@@ -13,8 +13,8 @@ depends=(libutil-linux openssl)
makedepends=(libyaml trousers)
source=(https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/refs/heads/$_tag.tar.gz
no_static.patch)
-sha1sums=('SKIP'
- '4fa3b0d34579718a22e06fb44e089c8601522e89')
+sha1sums=('ded3cfbe21f4cb0f1f9dd194e8dd72d7a8ed23fb'
+ 'b45016e2f1a9833d24d68a3d35a043258cab9405')
prepare() {
patch -p1 < ./no_static.patch
diff --git a/no_static.patch b/no_static.patch
index ff69f91e821..5bac160d1f6 100644
--- a/no_static.patch
+++ b/no_static.patch
@@ -1,18 +1,8 @@
-commit 27dedfb68d079a8053f76d7eb83ed5fc7a810365
-Author: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date: Sat Dec 9 10:32:22 2017 -0800
-
- Remove static binary build
-
- It fails to build at Arch as there is no static version of libcrypto
-
- Change-Id: I36fd4917a834171a3c6cc37b85f6df212d9722aa
-
diff --git a/Makefile b/Makefile
-index 013c6d8a..06d4d765 100644
+index 1f3e7f66..2103127f 100644
--- a/Makefile
+++ b/Makefile
-@@ -647,8 +647,6 @@ SIGNING_COMMON = scripts/image_signing/common_minimal.sh
+@@ -643,8 +643,6 @@ SIGNING_COMMON = scripts/image_signing/common_minimal.sh
# The unified firmware utility will eventually replace all the others
FUTIL_BIN = ${BUILD}/futility/futility
@@ -21,21 +11,21 @@ index 013c6d8a..06d4d765 100644
# These are the executables that are now built in to futility. We'll create
# symlinks for these so the old names will still work.
-@@ -1125,12 +1123,7 @@ signing_install: ${SIGNING_SCRIPTS} ${SIGNING_SCRIPTS_DEV} ${SIGNING_COMMON}
+@@ -1112,12 +1110,7 @@ signing_install: ${SIGNING_SCRIPTS} ${SIGNING_SCRIPTS_DEV} ${SIGNING_COMMON}
# new Firmware Utility
.PHONY: futil
-futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
-
--${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS}
+-${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS} -lpthread
-${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
- @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n"
- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
+futil: ${FUTIL_BIN}
- ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20}
+ ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS}
${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}
-@@ -1138,10 +1131,10 @@ ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}
+@@ -1125,10 +1118,10 @@ ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}
${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
.PHONY: futil_install