default packages

[blast] / Makefile

diff --git a/Makefile b/Makefile
index e11557ba4d019671f3da77ef9f3107556c6855a5..3b333bd6ca95a9f58af3bc49a1fb3938656e47de 100644 (file)
--- 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
-  ifdef $(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
 
@@ -369,7 +364,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