upgpkg: efitools-git 1.9.2.r0.392836a-1

Add fix for parallel builds

3 files changed, 45 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9df7723a3dd..8e1f00ebdfa5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,9 @@ pkgbase = efitools-git
 	provides = efitools
 	conflicts = efitools
 	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
+	source = Make.rules-use-correct-prerequisite-for-blacklist.esl.patch
 	sha512sums = SKIP
+	sha512sums = 62dd458f96b05eb1f07661bda4aaf48abd1aa6646137ca02538903a8b01575ca7651c17ca44b70b46276cc6a04be44deb7d9bcb740c0c4e79cf8f36bb53ddbc2
 
 pkgname = efitools-git
 
diff --git a/Make.rules-use-correct-prerequisite-for-blacklist.esl.patch b/Make.rules-use-correct-prerequisite-for-blacklist.esl.patch
new file mode 100644
index 000000000000..cc7bfea70a9a
--- /dev/null
+++ b/Make.rules-use-correct-prerequisite-for-blacklist.esl.patch
@@ -0,0 +1,34 @@
+From ecb252d9fd18556d3f7ed4b00aac789e901af9c8 Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas@gmx.de>
+Date: Mon, 28 Jan 2019 19:21:26 +0100
+Subject: [PATCH] Make.rules: use correct prerequisite for %-blacklist.esl
+
+Fixes occasional errors of the form
+
+./cert-to-efi-sig-list PK.crt PK-blacklist.esl
+make: ./cert-to-efi-sig-list: Command not found
+make: *** [Make.rules:75: PK-blacklist.esl] Error 127
+
+when using parallel jobs.
+
+Signed-off-by: Jonas Witschel <diabonas@gmx.de>
+---
+ Make.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.rules b/Make.rules
+index 903a5a4..1c579f0 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -71,7 +71,7 @@ endif
+ %.hash: %.efi hash-to-efi-sig-list
+ 	./hash-to-efi-sig-list $< $@
+ 
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ 	./cert-to-efi-sig-list $< $@
+ 
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list
+-- 
+2.20.1
+
diff --git a/PKGBUILD b/PKGBUILD
index be53cbc794ff..41d58884aeda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,21 @@ depends=('openssl')
 makedepends=('git' 'gnu-efi-libs' 'help2man' 'perl-file-slurp' 'sbsigntools')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("git+$url")
-sha512sums=('SKIP')
+source=("git+$url"
+        'Make.rules-use-correct-prerequisite-for-blacklist.esl.patch')
+sha512sums=('SKIP'
+            '62dd458f96b05eb1f07661bda4aaf48abd1aa6646137ca02538903a8b01575ca7651c17ca44b70b46276cc6a04be44deb7d9bcb740c0c4e79cf8f36bb53ddbc2')
 
 pkgver() {
 	cd "${pkgname%-git}"
 	printf '%s' "$(git describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
+prepare() {
+	cd "${pkgname%-git}"
+	patch --strip=1 --input="$srcdir/Make.rules-use-correct-prerequisite-for-blacklist.esl.patch"
+}
+
 build() {
 	cd "${pkgname%-git}"
 	make