X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=431590c47b39fdf9c597f797586e44769ebc47e2;hb=031d282c295fefead2e6609561a11e3140e144cc;hp=5ea6b7c89d90bd0d1daa07a965be32c22b423613;hpb=b8e9b846cc0508d32553eb4260874fe21f4e6de3;p=bootimage

diff --git a/Makefile b/Makefile
index 5ea6b7c..431590c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,18 +46,29 @@ stretch_%.squashfs: stretch_%_config/
 	rm "$@" || true
 	mksquashfs "$<" "$@" -comp xz
 
-/dev/sd%: partitions vmlinuz initrd.img syslinux.cfg .FORCE
-	mkdir mount
+/dev/sd%: partitions .FORCE
 	sfdisk ${@} <partitions
-	mkfs.ext3 -L SQUASHBOOT ${@}1
-	mkfs.btrfs -L SQUASHCLIENT ${@}2
 	dd of=${@} if=/usr/lib/syslinux/mbr/mbr.bin
-	mount -t ext3 ${@}1 mount
-	cp -L vmlinuz initrd.img *.squashfs syslinux.cfg mount/
+
+/dev/sd%1: /dev/sd% vmlinuz initrd.img syslinux.cfg .FORCE
+	mkdir -p mount
+	mkfs.ext3 -FL SQUASHBOOT ${@}
+	mount -t ext3 ${@} mount
+	cp -L vmlinuz initrd.img *.squashfs syslinux.cfg Makefile partitions mount/
 	cp $(addprefix /usr/lib/syslinux/modules/bios/, menu.c32 libutil.c32) mount/
 	extlinux -i mount/
 	umount mount/
-	mount -t btrfs ${@}2 mount
+	sync
+
+/dev/sd%2: /dev/sd% .FORCE
+	mkswap -L SWAP ${@}
+	sync
+
+/dev/sd%3: /dev/sd% .FORCE
+	mkdir -p mount
+	mkfs.btrfs -fL SQUASHCLIENT ${@}
+	mount -t btrfs ${@} mount
 	btrfs subvolume create mount/home
 	chmod 0755 mount/home
 	umount mount/
+	sync