X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=3b333bd6ca95a9f58af3bc49a1fb3938656e47de;hb=847892fd75bf845757ffb55dc77e81d0c63cfab8;hp=51ef4b580f7c9c1eaa22d8002c675e6a3a4046ac;hpb=075d900b9ea5830e5dcdc53e0724552d7a688b5b;p=blast diff --git a/Makefile b/Makefile index 51ef4b5..3b333bd 100644 --- a/Makefile +++ b/Makefile @@ -41,17 +41,10 @@ KEYRING := keys/debian-archive-${release}-automatic.gpg # KEYRING := keys/debian-archive-${release}-security-automatic.gpg ifndef SOURCES - ifneq "$(filter stretch jessie buster, ${release})" "" - define SOURCES := - deb http://deb.debian.org/debian ${release} main - deb https://deb.debian.org/debian-security/ ${release}/updates main - endef - else - define SOURCES := - deb http://deb.debian.org/debian ${release} main - deb https://deb.debian.org/debian-security/ ${release}-security main - endef - endif + define SOURCES := + deb http://deb.debian.org/debian ${release} main + deb https://deb.debian.org/debian-security/ ${release}/updates main + endef endif ifdef disk @@ -255,12 +248,14 @@ _install: ${SYSROOT} _aptkeys _norecommends -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 + mountpoint "$${SYSROOT}/proc" || mount -o bind /proc "$${SYSROOT}/proc" chroot "$${SYSROOT}" apt-get --yes -t "${release}" install ${PACKAGES} mkdir -p -m 755 "$${SYSROOT}/var/lib/deborphan/" chroot "$${SYSROOT}" sh -c 'printf "%s\\n" ${PACKAGES} >/var/lib/deborphan/keep' -chroot "$${SYSROOT}" sh -c 'apt-get --yes purge $$(deborphan -an |sed "s;^.* ;;g")' chroot "$${SYSROOT}" apt-get --yes --auto-remove purge -chroot "$${SYSROOT}" apt-get --yes --auto-remove upgrade + -umount "$${SYSROOT}/proc" chroot "$${SYSROOT}" apt-get clean chroot "$${SYSROOT}" rm /usr/local/sbin/invoke-rc.d chroot "$${SYSROOT}" rm /usr/sbin/udevadm