raspi filesystem experiments

diff --git a/Makefile b/Makefile
index 6c97122f826ea692a5dcae51f2510df16b5f4228..453fa6af0fe4c3f48a31251b0903fcae49c223ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
   
@@ -257,7 +257,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 +310,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}"
@@ -396,6 +395,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 +433,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 +440,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