small adaptations

diff --git a/targets/raspberrypi.mk b/targets/raspberrypi.mk
index 13cf1501396a03d69c6b2a0aedaa5b915911f9a9..8037b73f9e02b4f46f16e1dab7728c3b2ab70c29 100644 (file)
--- a/targets/raspberrypi.mk
+++ b/targets/raspberrypi.mk
@@ -9,12 +9,11 @@ ARCH := arm64
 VOLUME := ${raspi}
 PBOOT := rpi_boot.img
 PROOT := rpi_root.img
-SYSROOT := sys_root_${release}_${ARCH}/
 CFGROOT := img_mount/
 
 define SOURCES := 
 deb    http://deb.debian.org/debian    ${release}      main    non-free-firmware
-deb    https://deb.debian.org/debian-security/ ${release}/updates      main
+deb    https://deb.debian.org/debian-security/ ${release}-security     main
 endef
 
 PACKAGES += firmware-brcm80211 bluez-firmware initramfs-tools e2fsprogs raspi-firmware linux-image-arm64
@@ -40,6 +39,8 @@ _umount: _copy _config _bootloader_raspi _raspberry_fstab
 _target: _umount
 clean: _raspberry_clean
 
+export VOLUME PBOOT SQUASH
+
 img_mount/:
        mkdir -p -m 755 "$@"
        chmod 755 "$@"
@@ -70,7 +71,7 @@ _partition_raspi: ${VOLUME}
                ${BOOT_MB} "$$((${BOOT_MB} + 2))" ${ROOT_MB} | sfdisk "$${VOLUME}"
 
 _raspberry_fstab:
-       printf '%%s\n' \
+       printf '%s\n' \
               'LABEL=FSROOT / ${fstype} auto,nofail,rw 0 0' \
               'LABEL=BOOT /boot/firmware vfat auto,nofail,ro 0 0' \
               >"$${CFGROOT}/etc/fstab"