make apt keyring readable by apt user

[blast] / Makefile

diff --git a/Makefile b/Makefile
index 6c97122f826ea692a5dcae51f2510df16b5f4228..708fbcba028d5f848ebbf5f3ff18091af9b3b260 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ else ifdef subvol
   _config: _copy
 
   ${subvol}: _config
-       btrfs sub snap "${CFG_ROOT}" "$@"
+       btrfs sub snap "${CFGROOT}" "$@"
 
 else ifdef squash
   SQUASH := ${squash}
@@ -152,8 +152,8 @@ 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 nilfs-tools
-  fstype := nilfs2
+  PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel initramfs-tools btrfs-tools
+  fstype := btrfs
 
   _target: _umount _config
   
@@ -237,6 +237,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"
@@ -257,7 +258,6 @@ _install: ${SYSROOT} _aptkeys _norecommends
 
 _copy: ${SYSROOT} ${CFGROOT}
        sync
-       find "$${SYSROOT}" -lname '' -exec ln -sf /dev/null '{}' \;
        cp -au "$${SYSROOT}/." "$${CFGROOT}/"
 
 _config: ${CFGROOT}
@@ -311,7 +311,7 @@ _sparse: ${PBOOT} ${PROOT}
 ifdef raspi
 _format_root: ${PROOT}
        -umount "$${CFGROOT}/boot" "$${CFGROOT}" "${PROOT}"
-       mkfs.nilfs2 -f -L FSROOT "$${PROOT}"
+       mkfs.${fstype} -f -L FSROOT "$${PROOT}"
 else
 _format_root: ${PROOT}
        -umount "$${CFGROOT}/boot" "$${CFGROOT}" "${PROOT}"
@@ -381,10 +381,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' "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' {" \
                "linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
-               >"$${ISOROOT}/boot/grub/grub.cfg"
+               >>"$${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'" "}" \
@@ -396,6 +398,7 @@ _efi_mount: ${PBOOT}
        mount -t vfat -o loop "$${PBOOT}" "efi/"
 
 _efi_umount: _efi_mount
+       sync
        umount efi/ && rmdir efi/
 
 .PHONY: _syslinux_mbr _grub_mbr
@@ -433,7 +436,6 @@ _img_mount: ${CFGROOT}
        mountpoint "$${CFGROOT}" \
        || mount -o loop,offset="$$((${BOOT_MB} + 2))"M,sizelimit=${ROOT_MB}M \
                 -t ${fstype} "$${VOLUME}" "$${CFGROOT}"
-       sync
        chmod 755 "$${CFGROOT}"
        mkdir -p -m 755 "$${CFGROOT}/boot"
        mountpoint "$${CFGROOT}/boot" \
@@ -441,9 +443,11 @@ _img_mount: ${CFGROOT}
                 -t vfat "$${VOLUME}" "$${CFGROOT}/boot"
 
 _umount_boot: ${CFGROOT} _config
+       sync
        -umount "$${CFGROOT}/boot"
 
 _umount_root: _umount_boot _config
+       sync
        umount "$${CFGROOT}" && rmdir "$${CFGROOT}"
 
 _umount: _umount_boot _umount_root