summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoru <u@billy>2023-11-17 11:22:02 -0500
committeru <u@billy>2023-11-17 11:22:02 -0500
commit63a812020980025d5df90c32d9047d1720dd6f81 (patch)
tree2389189f6e478f1b5b4c901e8073e9d95e9f293a
parent8486a7ddebfe82af59e85d9a52cda099ee441482 (diff)
cleanups
-rw-r--r--rootfs/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/rootfs/Makefile b/rootfs/Makefile
index 3c7cf0a..c68e45a 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -1,4 +1,4 @@
1fsmgr := $(shell which fsmgr) 1fsmgr := $(shell command -v fsmgr)
2 2
3ifeq ($(fsmgr),) 3ifeq ($(fsmgr),)
4$(error "no fsmgr") 4$(error "no fsmgr")
@@ -8,13 +8,15 @@ sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo)
8 8
9rootfs ?= samizdat.seed.btrfs 9rootfs ?= samizdat.seed.btrfs
10patchfs ?= samizdat.patch.btrfs 10patchfs ?= samizdat.patch.btrfs
11# gold ?= samizdat-gold.btrfs
12 11
13.DEFAULT_GOAL = all 12.DEFAULT_GOAL = all
14 13
15.PHONY: all rootfs patchfs clean 14.PHONY: all rootfs patchfs clean
16all: $(rootfs) $(patchfs) 15all: $(rootfs) $(patchfs)
17 16
17_build _filesystem:
18 $(sudo) btrfs subvolume create $@
19
18clean = $(patchfs) $(rootfs) $(rootfs:%.seed.btrfs=%.btrfs) 20clean = $(patchfs) $(rootfs) $(rootfs:%.seed.btrfs=%.btrfs)
19clean := $(clean) $(clean:%=%.tmp) 21clean := $(clean) $(clean:%=%.tmp)
20 22
@@ -23,7 +25,6 @@ clean:
23 25
24rootfs: $(rootfs) 26rootfs: $(rootfs)
25patchfs: $(patchfs) 27patchfs: $(patchfs)
26gold: $(gold)
27 28
28%.patch.btrfs: %.seed.btrfs 29%.patch.btrfs: %.seed.btrfs
29 $(sudo) $(fsmgr) build $@ 30 $(sudo) $(fsmgr) build $@
@@ -34,9 +35,6 @@ gold: $(gold)
34%.btrfs: 35%.btrfs:
35 $(sudo) $(fsmgr) build $@ 36 $(sudo) $(fsmgr) build $@
36 37
37$(gold): $(rootfs)
38 $(sudo) $(fsmgr) build $@
39
40$(patchfs): $(rootfs) 38$(patchfs): $(rootfs)
41 39
42$(patchfs) $(rootfs): 40$(patchfs) $(rootfs):