From: Paul Hänsch <paul@plutz.net>
Date: Mon, 26 Aug 2019 08:26:42 +0000 (+0200)
Subject: do not install apt-keys before bootstrap, prevent crash of udisks2 postinstall
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=8a35672487eef01f33d1b65f4cad6119dc4dcd89;p=blast

do not install apt-keys before bootstrap, prevent crash of udisks2 postinstall
---

diff --git a/Makefile b/Makefile
index dc7dd52..d6382ec 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ ${SYSROOT}/etc/apt/apt.conf.d/10norecommends: ${SYSROOT}
 	printf 'APT::Install-Recommends "false";\n' >"$@"
 	chmod 644 "$@"
 
-${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT}
+${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT} _bootstrap
 	mkdir -p -m 755 "$@"
 	cp keys/*.gpg "$@"
 
@@ -199,11 +199,13 @@ _install: ${SYSROOT} _aptkeys _norecommends
 	-chroot "$${SYSROOT}" sh -c 'apt-mark showmanual |xargs apt-mark auto'
 	-chroot "$${SYSROOT}" apt-get update
 	chroot "$${SYSROOT}" ln -sf /bin/true /usr/local/sbin/invoke-rc.d
+	chroot "$${SYSROOT}" ln -sf /bin/true /usr/sbin/udevadm
 	chroot "$${SYSROOT}" apt-get --yes install ${PACKAGES}
 	chroot "$${SYSROOT}" apt-get --yes --auto-remove purge
 	-chroot "$${SYSROOT}" apt-get --yes --auto-remove upgrade
 	chroot "$${SYSROOT}" apt-get clean
 	chroot "$${SYSROOT}" rm /usr/local/sbin/invoke-rc.d
+	chroot "$${SYSROOT}" rm /usr/sbin/udevadm
 
 _copy: ${SYSROOT} ${CFGROOT}
 	cp -au "$${SYSROOT}/." "$${CFGROOT}/"