X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=e1e77e0ded67f2792b94d619d08e8a0eb33f43a7;hb=26f60dd8e15bd0006b1db60984bf4b65f069f95f;hp=fe331bb74ac9709d235057d0b27fe5baa1448ec9;hpb=495464ce5bd7118fe73902b6ca9be1de0a3783e0;p=blast

diff --git a/Makefile b/Makefile
index fe331bb..e1e77e0 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ space_:= ${nul_} ${nul_}
 .PHONY: _squash_modules _squash _isosquash _iso_image
 
 ARCH := amd64
-BOOTSTRAP := http://cdn.debian.net/debian
+BOOTSTRAP := http://deb.debian.org/debian
 PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
 
 # Partition Table (2M) + Boot Partition (126M)+ Root Partition + Slack Space (1M) = 2048M
@@ -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://cdn.debian.net/debian	${release}	main
-    deb	https://deb.debian.org/debian-security/	${release}/updates	main
-    endef
-  else
-    define SOURCES := 
-    deb	http://cdn.debian.net/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
-	chroot "$${SYSROOT}" apt-get --yes install ${PACKAGES}
+	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
@@ -276,7 +271,7 @@ _config: ${CFGROOT}
 		>"$${CFGROOT}/etc/fstab"
 	chroot "$${CFGROOT}" update-initramfs -u
 
-${SQUASH}: ${CFGROOT}
+${SQUASH}: ${CFGROOT} .FORCE
 	-rm "$${SQUASH}"
 	mksquashfs "$${CFGROOT}" "$${SQUASH}" -comp xz
 
@@ -334,7 +329,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