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

diff --git a/Makefile b/Makefile
index cd430aa..fe331bb 100644
--- a/Makefile
+++ b/Makefile
@@ -32,17 +32,26 @@ else
   include ${config}
 endif
 
-ifdef release
-  KEYRING := keys/debian-archive-${release}-stable.gpg
-else
-  release := stretch
-  KEYRING := keys/debian-archive-stretch-stable.gpg
+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
-define SOURCES := 
-deb	http://cdn.debian.net/debian ${release} main
-endef
+  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
 endif
 
 ifdef disk
@@ -180,7 +189,8 @@ ifdef modules
   include $(addsuffix .mk, $(addprefix modules/, $(subst ${comma_},${space_},${modules})))
 endif
 
-ifeq "${ARCH}" "amd64"
+ifeq "$(findstring linux-image, ${PACKAGES})" "linux-image"
+else ifeq "${ARCH}" "amd64"
   PACKAGES += linux-image-amd64
 else ifeq "${ARCH}" "i386"
   PACKAGES += linux-image-686
@@ -359,7 +369,7 @@ _grub_efi64: ${CFGROOT}
 	grub-mkimage -p / -O x86_64-efi fat part_gpt normal linux all_video >"$${CFGROOT}/boot/EFI/BOOT/BOOTX64.EFI"
 
 ${CFGROOT}/boot/cmdline.txt: ${CFGROOT}
-	printf 'root=/dev/mmcblk0p2 rootfstype=${fstype} fsck.repair=yes rootwait' >"$@"
+	printf 'root=/dev/mmcblk0p2 rootfstype=${fstype} fsck.repair=yes rootwait net.ifnames=0' >"$@"
 
 _bootloader_raspi: ${CFGROOT} ${CFGROOT}/boot/cmdline.txt
 
@@ -382,8 +392,8 @@ _bootloader_iso: ${CFGROOT} ${ISOROOT}
 	cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${ISOROOT}"
 	printf '%s\n' "insmod all_video" "set gfxmode=auto" "load_video" "insmod gfxterm" \
 		>"$${ISOROOT}/boot/grub/grub.cfg"
-	printf '%s\n' "set timeout=10" "default=buster" \
-		"menuentry 'Debian Buster' --id 'buster' {" \
+	printf '%s\n' "set timeout=10" "default=${release}" \
+		"menuentry 'Debian ${release}' --id '${release}' {" \
 		"linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
 		>>"$${ISOROOT}/boot/grub/grub.cfg"
 	-[ -f "$${ISOROOT}/install/initrd.gz" -a -f "$${ISOROOT}/install/linux" ] && \