X-Git-Url: http://git.plutz.net/?p=blast;a=blobdiff_plain;f=Makefile;h=60b6d479b700795e23fe5f4fa43a43cf8b459d51;hp=59ab22860743f1a035b567f4747ac5c8d64cda1d;hb=HEAD;hpb=babf70f600416d4ac4466bf24925dfb311f0385f diff --git a/Makefile b/Makefile index 59ab228..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 @@ -336,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