correct phrasing of conditional for security sources

[blast] / Makefile

diff --git a/Makefile b/Makefile
index 60b6d479b700795e23fe5f4fa43a43cf8b459d51..1d8d694ca7038f5ba7d98d8fc94cc78334744f69 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,8 @@ PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
 BOOT_MB := 62
 ROOT_MB := 959
 
+fstype := ext4
+
 config.mk:
        cp "config.example" "$@"
 
@@ -30,21 +32,28 @@ 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
 
-fstype := ext4
-
 ifdef disk
   VOLUME := ${disk}
   PBOOT := ${disk}1
@@ -152,8 +161,7 @@ else ifdef raspi
   deb  http://archive.raspberrypi.org/debian ${release} main
   endef
 
-  PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel initramfs-tools btrfs-tools
-  fstype := btrfs
+  PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel initramfs-tools
 
   _target: _umount _config
   
@@ -181,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
@@ -237,6 +246,7 @@ ${SYSROOT}/etc/apt/apt.conf.d/10norecommends: ${SYSROOT}
 ${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT} _bootstrap
        mkdir -p -m 755 "$@"
        cp keys/*.gpg "$@"
+       chmod 644 "$@"/*.gpg
 
 _install: ${SYSROOT} _aptkeys _norecommends
        printf '%s\n' "$${SOURCES}" |sort -u >"$${SYSROOT}/etc/apt/sources.list"
@@ -307,15 +317,15 @@ _partition_gpt: ${VOLUME}
 
 _sparse: ${PBOOT} ${PROOT}
 
-ifdef raspi
-_format_root: ${PROOT}
-       -umount "$${CFGROOT}/boot" "$${CFGROOT}" "${PROOT}"
-       mkfs.${fstype} -f -L FSROOT "$${PROOT}"
+ifeq "${fstype}" "ext4"
+  fsflag:=-F
 else
+  fsflag:=-f
+endif
+
 _format_root: ${PROOT}
        -umount "$${CFGROOT}/boot" "$${CFGROOT}" "${PROOT}"
-       mkfs.ext4 -F -L FSROOT "$${PROOT}"
-endif
+       mkfs.${fstype} ${fsflag} -L FSROOT "$${PROOT}"
 
 _format_boot: ${PBOOT}
        -umount "$${CFGROOT}/boot" "${PBOOT}"
@@ -380,10 +390,12 @@ _bootloader_pc: ${CFGROOT} _grub_efi32 _grub_efi64 _syslinux_bios #_syslinux_efi
 _bootloader_iso: ${CFGROOT} ${ISOROOT}
        mkdir -p "$${ISOROOT}/boot/grub/"
        cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${ISOROOT}"
-       printf '%s\n' "set timeout=10" "default=buster" \
-               "menuentry 'Debian Buster' --id 'buster' {" \
-               "linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
+       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=${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" ] && \
        printf '%s\n' "menuentry 'Install Debian' --id 'install' {" \
                "linux '/install/linux'" "initrd '/install/initrd.gz'" "}" \