use samizdat.seed.btrfs as image name

1 files changed, 4 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index d0dd637..b6a1188 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,8 @@ update-submodules:
 install-submodules: cmd=install
 install-submodules: update-submodules $(INSTALL_SUBMODULES)
 
-rootfs = samizdat.btrfs
-patchfs = $(patsubst %.btrfs,%.patch.btrfs,$(rootfs))
+rootfs = samizdat.seed.btrfs
+patchfs = $(patsubst %.seed.btrfs,%.patch.btrfs,$(rootfs))
 rootfs_verity = rootfs/$(rootfs).verity
 
 .PHONY: rootfs rootfs-deps
@@ -216,7 +216,6 @@ get_min_size="$$(btrfs inspect-internal min-dev-size --id 1 $@.mnt | (read b _;
         mv $@~tmp $@
         sudo chmod 644 $@
 
-
 root_hash = $(shell sed -ne 's/^Root hash: *//p' < $<.log)
 
 veritymount: rootfs/samizdat.seed.btrfs.verity.sh
@@ -228,22 +227,8 @@ veritymount: rootfs/samizdat.seed.btrfs.verity.sh
 %.verity.log.asc: %.verity.log
         sudo gpg --armor --detach-sign $^
 
-rootfs/samizdat.seed.btrfs: rootfs/samizdat.btrfs
-ifneq ($(shell id -u),0)
-        $(SUDO_MAKE) $@
-else
-        @while umount $$PWD/$@~tmp; do continue; done
-        cp --reflink $< $@~tmp
-        btrfstune -f -S0 $@~tmp
-        test -d $@.mnt || mkdir $@.mnt
-        mount -t btrfs -o rw $@~tmp $@.mnt
-        #bash -c "time btrfs fi defrag -c -r $@.mnt"
-        s=$(get_min_size) && (set -x; btrfs fi resize 1:$$s $@.mnt && truncate -s "$$s" $@~tmp)
-        umount $@.mnt
-        losetup -f $<
-        btrfstune -S1 $@~tmp
-        mv $@~tmp $@
-endif
+rootfs/%.btrfs:
+        $(SUDO_MAKE) -C rootfs $(notdir $@)
 
 debian_dist := $(shell lsb_release -cs)