X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=d3df8948676fddd954501536501c938c105710b6;hb=5fe346a2c4f9e18587f028a7cd81f6ca30e0ae2d;hp=adec7d705cdb54597f062e3e7c4298c278fc0627;hpb=94825873e9d1651ddd885049306cb44319bf9f41;p=blast

diff --git a/Makefile b/Makefile
index adec7d7..d3df894 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@ space_:= ${nul_} ${nul_}
 .PHONY: _format _mount _sparse _umount _partcopy _mbr
 
 ARCH := amd64
-KEYRING := keys/debian-archive-stretch-stable.gpg
 BOOTSTRAP := http://cdn.debian.net/debian
 PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
 
@@ -28,8 +27,11 @@ else
   include ${config}
 endif
 
-ifndef release
+ifdef release
+  KEYRING := keys/debian-archive-${release}-stable.gpg
+else
   release := stretch
+  KEYRING := keys/debian-archive-stretch-stable.gpg
 endif
 
 define SOURCES := 
@@ -94,6 +96,23 @@ else ifdef squash
   _config: _copy _squash_modules
   _squash: _config
 
+else ifdef iso
+  ISO := iso
+  SQUASH := rootfs.squash
+  SYSROOT := sys_root_${release}/
+  CFGROOT := cfg_root/
+
+  PACKAGES += squashfs-tools
+  
+  _target: _isohybrid _install _config
+  
+  _bootstrap:
+  _install: _bootstrap
+  _copy: _install
+  _config: _copy _squash_modules
+  _squash: _config
+  _isohybrid: _squash
+
 else ifdef raspi
   VOLUME := ${raspi}
   PBOOT := rpi_boot.img
@@ -189,21 +208,23 @@ ${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 "$@"
 
 _install: ${SYSROOT} _aptkeys _norecommends
-	printf '%s\n' "$${SOURCES}" >"$${SYSROOT}/etc/apt/sources.list"
+	printf '%s\n' "$${SOURCES}" |sort -u >"$${SYSROOT}/etc/apt/sources.list"
 	-cp /etc/resolv.conf "$${SYSROOT}/etc/"
 	-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}/"