From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 10 Sep 2019 01:46:46 +0000 (+0100)
Subject: bin/update-cross-tools: Don't try to substitute GnuPG.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/6b608a0fcf9384f1cc8a65be7ce0acef025d2070

bin/update-cross-tools: Don't try to substitute GnuPG.

It really doesn't work.  Something sees that `/usr/bin/gpg' exists, and
then expects the whole thing to work.  Don't bother.
---

diff --git a/bin/update-cross-tools b/bin/update-cross-tools
index a738af0..a287be3 100755
--- a/bin/update-cross-tools
+++ b/bin/update-cross-tools
@@ -107,7 +107,7 @@ cross_archs="arm-linux-gnueabi arm-linux-gnueabihf aarch64-linux-gnu"
 ## Make a list of extra packages we'll need to install to obtain our tools.
 cross_pkgs="
 	apt bash ccache coreutils dash eatmydata fakeroot findutils
-	gnupg gpgv gzip m4 make mawk qemu-user-static sed tar xz-utils"
+	gpgv gzip m4 make mawk qemu-user-static sed tar xz-utils"
 for a in $cross_archs; do
   for i in gcc g++ binutils; do
     cross_pkgs="$cross_pkgs $i-$a"
@@ -139,7 +139,7 @@ wanted="
 
 	/lib/$mymulti/ libnss_*.so.*
 
-	/usr/bin/ gpg gpgv gpgconf kbxutil watchgnupg
+	/usr/bin/ gpgv
 
 	/usr/bin/ qemu-*-static