roundshot

commit 4495152f6238bbbf96e59d11c07425620c8d87e2
parent 26b7cb902193ae8e48efda1fca54930a4b967756
Author: parazyd <parazyd@dyne.org>
Date:   Fri, 15 Dec 2017 17:21:41 +0100

Grab the Debian gpgv-static binary. We don't need to compile this.

Diffstat:
M
initramfs/Makefile
 | 
25
+++++--------------------
M
initramfs/config.mk
 | 
4
++--

2 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/initramfs/Makefile b/initramfs/Makefile
@@ -29,25 +29,10 @@ endif
 gnupg:
 ifeq ($(GNUPG),1)
 	wget -c $(GNUPG_URL)
-	tar xf $(shell basename $(GNUPG_URL))
-	export PATH="$(TC_PATH)/bin:$(PATH)" && \
-		cd $(shell basename -s .tar.bz2 $(GNUPG_URL)) && \
-		CC=$(TC_NAME)gcc CFLAGS="-Os -static" LDFLAGS="-s -static" \
-		./configure \
-			--disable-nls \
-			--disable-rpath \
-			--disable-selinux-support \
-			--enable-minimal \
-			--disable-card-support \
-			--disable-agent-support \
-			--disable-exec \
-			--disable-photo-viewers \
-			--disable-keyserver-helpers \
-			--with-included-regex && \
-		echo "all:" > doc/Makefile && \
-		make -j9 && \
-		cp -f g10/gpg $(PWD)/build/bin && \
-		cp -f g10/gpgv $(PWD)/build/bin
+	ar x $(shell basename $(GNUPG_URL))
+	tar xf data.tar.xz
+	cp -f usr/bin/gpgv-static $(PWD)/build/bin/gpgv
+	rm -rf usr data.tar.xz control.tar.xz debian-binary
 endif
 
 initramfs.cpio.bz2:
@@ -55,7 +40,7 @@ initramfs.cpio.bz2:
 		find . -print0 | cpio --null -ov --format=newc | bzip2 --best > $(PWD)/$@
 
 clean:
-	rm -rf build busybox-* gnupg-*
+	rm -rf build busybox-* gpgv-*
 
 distclean: clean
 	rm -f initramfs.cpio.bz2
diff --git a/initramfs/config.mk b/initramfs/config.mk
@@ -9,8 +9,8 @@ DROPBEAR_VERSION = 2017.75
 DROPBEAR_URL = https://matt.ucc.asn.au/dropbear/releases/dropbear-$(DROPBEAR_VERSION).tar.bz2
 
 GNUPG = 1
-GNUPG_VERSION = 1.4.22
-GNUPG_URL = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$(GNUPG_VERSION).tar.bz2
+GNUPG_VERSION = 2.2.3-1
+GNUPG_URL = http://ftp.debian.org/debian/pool/main/g/gnupg2/gpgv-static_$(GNUPG_VERSION)_armhf.deb
 
 TC_PATH = $(PWD)/../toolchain/arm-linux-musleabihf
 TC_NAME = arm-linux-musleabihf-