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

diff --git a/Makefile b/Makefile
index dc7dd52806e1aeccf2fbaef3484fd6e6d6591691..d6382ece648721355eb0270ccb115c8f805e7193 100644 (file)
--- 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}/"