diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-04-17 14:32:00 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-04-17 14:37:23 +0200 |
| commit | 298301d439f83bc1f542a7c042e5aa0179bc4761 (patch) | |
| tree | a9a765e0f5da606e1ab699437fd049b40b058368 | |
| parent | f4d5889c75684d80db4c76d69c52f410fdcc3f8e (diff) | |
| download | spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.tar spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.tar.gz spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.tar.bz2 spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.tar.lz spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.tar.xz spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.tar.zst spectrum-298301d439f83bc1f542a7c042e5aa0179bc4761.zip | |
Add missing sfdisk-field.awk Make dependencies
Fixes: ec07104 ("host/initramfs: run QEMU from Make")
Fixes: a96f09d ("host/initramfs: enable testing booting from loop")
Fixes: 6af16d0 ("host/rootfs: use initramfs in "make run"")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
| -rw-r--r-- | host/initramfs/Makefile | 4 | ||||
| -rw-r--r-- | host/rootfs/Makefile | 2 | ||||
| -rw-r--r-- | release/live/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index 15eefb8..06f69b3 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -49,7 +49,7 @@ 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 $(ROOT_FS) +build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/rootfs.verity.superblock build/rootfs.verity.roothash $(ROOT_FS) ../../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)") \ $(ROOT_FS):4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$(../../scripts/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") @@ -58,7 +58,7 @@ build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh build/roo build/loop.tar: build/live.img $(TAR) -cf $@ build/live.img -build/loop.img: ../../scripts/make-gpt.sh build/loop.ext4 +build/loop.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/loop.ext4 ../../scripts/make-gpt.sh $@.tmp \ build/loop.ext4:56a3bbc3-aefa-43d9-a64d-7b3fd59bbc4e mv $@.tmp $@ diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 700c803..e1569e5 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -163,7 +163,7 @@ 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 $(dest) +build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/rootfs.verity.superblock build/rootfs.verity.roothash $(dest) ../../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)") \ $(dest):4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$(../../scripts/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") diff --git a/release/live/Makefile b/release/live/Makefile index 8dfba28..f45870d 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -5,7 +5,7 @@ include ../../lib/common.mk dest = build/live.img -$(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh build/boot.fat build/rootfs.verity.superblock build/rootfs.verity.roothash $(ROOT_FS) $(EXT_FS) +$(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat build/rootfs.verity.superblock build/rootfs.verity.roothash $(ROOT_FS) $(EXT_FS) ../../scripts/make-gpt.sh $@.tmp \ build/boot.fat:c12a7328-f81f-11d2-ba4b-00a0c93ec93b \ 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)") \ |