diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-02-22 12:44:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-22 12:50:02 +0000 |
| commit | 01498855f84ee87d66e6295efcaf7a32d67f4dad (patch) | |
| tree | 25c5f3e1f17d5e23094b7a132e56e390c930dd20 /host/rootfs/Makefile | |
| parent | 8dc2fa52cae39fae0af9ac0738b7a2fade83d4ec (diff) | |
| download | spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.tar spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.tar.gz spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.tar.bz2 spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.tar.lz spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.tar.xz spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.tar.zst spectrum-01498855f84ee87d66e6295efcaf7a32d67f4dad.zip | |
nix: centralise source cleaning
This was getting very repetitive. Having a single copy of the sources shared between builds will also save on store space, and means we don't need to support overriding the path to the scripts directory in Makefiles. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'host/rootfs/Makefile')
| -rw-r--r-- | host/rootfs/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 9559c06..4c187b0 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -6,7 +6,6 @@ # QEMU_KVM = qemu-system-x86_64 -enable-kvm. QEMU_KVM = qemu-kvm -SCRIPTS = ../../scripts VERITYSETUP = veritysetup # tar2ext4 will leave half a filesystem behind if it's interrupted @@ -134,10 +133,10 @@ build/rootfs.verity.roothash: build/rootfs.verity build/rootfs.verity.superblock: build/rootfs.verity tail -n +2 build/rootfs.verity > $@ -build/live.img: $(SCRIPTS)/format-uuid.sh $(SCRIPTS)/make-gpt.sh build/rootfs.verity.superblock build/rootfs.verity.roothash build/rootfs.ext4 - $(SCRIPTS)/make-gpt.sh $@.tmp \ - build/rootfs.verity.superblock:2c7357ed-ebd2-46d9-aec1-23d437ec2bf5:$$($(SCRIPTS)/format-uuid.sh "$$(dd if=build/rootfs.verity.roothash bs=32 skip=1 count=1 status=none)") \ - build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$($(SCRIPTS)/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") +build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh build/rootfs.verity.superblock build/rootfs.verity.roothash build/rootfs.ext4 + ../../scripts/make-gpt.sh $@.tmp \ + build/rootfs.verity.superblock:2c7357ed-ebd2-46d9-aec1-23d437ec2bf5:$$(../../scripts/format-uuid.sh "$$(dd if=build/rootfs.verity.roothash bs=32 skip=1 count=1 status=none)") \ + build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$(../../scripts/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") mv $@.tmp $@ run: build/live.img $(EXT_FS) build/rootfs.verity.roothash |