summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-28 10:38:46 -0400
committerAndrew Cady <d@jerkface.net>2020-05-28 12:35:03 -0400
commit7db5ebece1e1a7e7cfc612b753478845a6f367ee (patch)
tree6ecaa096b0c91236edae0662aad118bd12872cb6
parent0452f9de21d89b0e6221ba38a112fd8aeb91f98f (diff)
makefile: add VERITY and VERITY_SIGN
-rw-r--r--.gitignore5
-rw-r--r--Makefile13
-rw-r--r--build-deps.control1
3 files changed, 17 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 34734ec..64eecd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,8 @@ rootfs/samizdat.patch.btrfs
48rootfs/samizdat.seed.btrfs 48rootfs/samizdat.seed.btrfs
49rootfs/seed.iso 49rootfs/seed.iso
50apt-get-update-stamp 50apt-get-update-stamp
51*.btrfs
52*.btrfs.verity
53*.btrfs.verity.log
54*.btrfs.verity.log.asc
55*.btrfs.verity.log.sig
diff --git a/Makefile b/Makefile
index f507be0..54658af 100644
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,14 @@ get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)"
174get_backing_file="$$(sudo losetup -n -O back-file -j $@~tmp)" 174get_backing_file="$$(sudo losetup -n -O back-file -j $@~tmp)"
175get_min_size="$$(btrfs inspect-internal min-dev-size --id 1 $@.mnt | (read b _; echo $$b))" 175get_min_size="$$(btrfs inspect-internal min-dev-size --id 1 $@.mnt | (read b _; echo $$b))"
176 176
177%.btrfs.verity: %.btrfs
178 sudo veritysetup format $< $@ > $@.log
179 sudo chmod 644 $@
180 h=$$(sed -ne 's/^Root hash:[ \t]*//p' $@.log) && [ "$$h" ]
181
182%.btrfs.verity.log.asc: %.btrfs.verity.log
183 sudo gpg --armor --detach-sign $^
184
177rootfs/samizdat.seed.btrfs: rootfs/samizdat.btrfs 185rootfs/samizdat.seed.btrfs: rootfs/samizdat.btrfs
178ifneq ($(shell id -u),0) 186ifneq ($(shell id -u),0)
179 $(SUDO_MAKE) $@ 187 $(SUDO_MAKE) $@
@@ -282,7 +290,8 @@ gold.iso: rootfs/seed.iso reused-child
282 --protective-msdos-label 290 --protective-msdos-label
283 mv $@~tmp $@ 291 mv $@~tmp $@
284 292
285rootfs/seed.iso: rootfs/samizdat.seed.btrfs 293rootfs/seed.iso: $(addprefix rootfs/samizdat.seed.btrf, s \
294 $(if $(VERITY), s.verity s.verity.log $(if $(VERITY_SIGN), s.verity.log.asc)))
286 rm -f $@~tmp 295 rm -f $@~tmp
287 touch $@~tmp 296 touch $@~tmp
288 fallocate -n -l 10G $@~tmp 297 fallocate -n -l 10G $@~tmp
@@ -293,7 +302,7 @@ rootfs/seed.iso: rootfs/samizdat.seed.btrfs
293 -volid SamizdatLive \ 302 -volid SamizdatLive \
294 -pathspecs on \ 303 -pathspecs on \
295 -follow link \ 304 -follow link \
296 -add /rootfs/samizdat.btrfs=$< -- \ 305 -add $^ -- \
297 -follow default 306 -follow default
298 mv $@~tmp $@ 307 mv $@~tmp $@
299 308
diff --git a/build-deps.control b/build-deps.control
index fc3eaeb..a946554 100644
--- a/build-deps.control
+++ b/build-deps.control
@@ -1,6 +1,7 @@
1Source: sami 1Source: sami
2Build-Depends: bridge-utils, 2Build-Depends: bridge-utils,
3 build-essential, 3 build-essential,
4 cryptsetup,
4 devscripts, 5 devscripts,
5 libbz2-dev, 6 libbz2-dev,
6 libncurses-dev, 7 libncurses-dev,