X-Git-Url: http://git.plutz.net/?p=blast;a=blobdiff_plain;f=Makefile;h=60b6d479b700795e23fe5f4fa43a43cf8b459d51;hp=51ef4b580f7c9c1eaa22d8002c675e6a3a4046ac;hb=HEAD;hpb=075d900b9ea5830e5dcdc53e0724552d7a688b5b

diff --git a/Makefile b/Makefile
index 51ef4b5..7af8ad8 100644
--- a/Makefile
+++ b/Makefile
@@ -36,22 +36,13 @@ ifndef release
   release := bullseye
 endif
 
-KEYRING := keys/debian-archive-${release}-stable.gpg
 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 +246,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
@@ -334,7 +327,7 @@ _format_boot: ${PBOOT}
 _format: _format_root _format_boot
 
 _iso_image: ${ISOROOT}
-	grub-mkrescue -o "$${ISO}" "$${ISOROOT}"
+	grub-mkrescue --compress=xz -o "$${ISO}" "$${ISOROOT}"
 
 .PHONY: _syslinux_efi32 _syslinux_efi64 _syslinux_bios
 .PHONY: _grub_efi32 _grub_efi64