diff options
-rw-r--r-- | .gitignore | 17 | ||||
-rw-r--r-- | Makefile | 6 | ||||
m--------- | openssh | 0 | ||||
-rw-r--r-- | rootfs/Makefile | 20 |
4 files changed, 13 insertions, 30 deletions
@@ -19,22 +19,6 @@ install-submodules-stamp | |||
19 | conf/br0 | 19 | conf/br0 |
20 | conf/dnsmasq.conf | 20 | conf/dnsmasq.conf |
21 | conf/network_if-up.d_samizdat | 21 | conf/network_if-up.d_samizdat |
22 | ssh_*.deb | ||
23 | openssh-client-dbgsym_*_*.deb | ||
24 | openssh-client-udeb_*_*.udeb | ||
25 | openssh-client_*_*.deb | ||
26 | openssh-server-dbgsym_*_*.deb | ||
27 | openssh-server-udeb_*_*.udeb | ||
28 | openssh-server_*_*.deb | ||
29 | openssh-sftp-server-dbgsym_*_*.deb | ||
30 | openssh-sftp-server_*_*.deb | ||
31 | openssh-tests-dbgsym_*_*.deb | ||
32 | openssh-tests_*_*.deb | ||
33 | openssh_*_*.buildinfo | ||
34 | openssh_*_*.changes | ||
35 | ssh-askpass-gnome-dbgsym_*_*.deb | ||
36 | ssh-askpass-gnome_*_*.deb | ||
37 | ssh_*_all.deb | ||
38 | rootfs/samizdat.btrfs | 22 | rootfs/samizdat.btrfs |
39 | rootfs/_build/ | 23 | rootfs/_build/ |
40 | /build-deps-stamp | 24 | /build-deps-stamp |
@@ -57,3 +41,4 @@ apt-get-update-stamp | |||
57 | /rootfs/*.btrfs.tmp.* | 41 | /rootfs/*.btrfs.tmp.* |
58 | *.img | 42 | *.img |
59 | *.tmp | 43 | *.tmp |
44 | sami-build-deps_* | ||
@@ -139,14 +139,8 @@ update-submodules: | |||
139 | install-submodules: cmd=install | 139 | install-submodules: cmd=install |
140 | install-submodules: update-submodules $(INSTALL_SUBMODULES) | 140 | install-submodules: update-submodules $(INSTALL_SUBMODULES) |
141 | 141 | ||
142 | GOLD = | ||
143 | ifdef GOLD | ||
144 | rootfs = samizdat-gold.seed.btrfs | ||
145 | patchfs = | ||
146 | else | ||
147 | rootfs = samizdat.seed.btrfs | 142 | rootfs = samizdat.seed.btrfs |
148 | patchfs = $(patsubst %.seed.btrfs,%.patch.btrfs,$(rootfs)) | 143 | patchfs = $(patsubst %.seed.btrfs,%.patch.btrfs,$(rootfs)) |
149 | endif | ||
150 | rootfs_verity = $(addprefix rootfs/,$(addsuffix .verity,$(rootfs) $(patchfs))) | 144 | rootfs_verity = $(addprefix rootfs/,$(addsuffix .verity,$(rootfs) $(patchfs))) |
151 | 145 | ||
152 | .PHONY: rootfs rootfs-deps | 146 | .PHONY: rootfs rootfs-deps |
diff --git a/openssh b/openssh deleted file mode 160000 | |||
Subproject a2645185d49edbdeb1d0a44a26cc69d43232b2f | |||
diff --git a/rootfs/Makefile b/rootfs/Makefile index 09dba42..3975b3b 100644 --- a/rootfs/Makefile +++ b/rootfs/Makefile | |||
@@ -8,19 +8,26 @@ sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo) | |||
8 | 8 | ||
9 | rootfs ?= samizdat.seed.btrfs | 9 | rootfs ?= samizdat.seed.btrfs |
10 | patchfs ?= samizdat.patch.btrfs | 10 | patchfs ?= 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 gold | 14 | .PHONY: all rootfs patchfs clean pristine |
16 | all: $(rootfs) $(patchfs) $(gold) | 15 | all: $(rootfs) $(patchfs) |
16 | |||
17 | clean = $(patchfs) $(rootfs) $(patsubst %.seed.btrfs, %.btrfs, $(rootfs)) | ||
18 | clean := $(clean) $(patsubst %, %.tmp, $(clean)) | ||
17 | 19 | ||
18 | clean: | 20 | clean: |
19 | rm -f $(patsubst %.seed.btrfs,%.btrfs,$(rootfs)) $(rootfs) $(patchfs) $(gold) | 21 | rm -f $(clean) |
22 | |||
23 | |||
24 | pristine: clean | ||
25 | @# TODO: implement rm --recursive --auto-umount | ||
26 | @# TODO: consider even rm --root-command=sudo for auto-sudo. Why not for all coreutils? | ||
27 | $(sudo) rm -i -rf _build | ||
20 | 28 | ||
21 | rootfs: $(rootfs) | 29 | rootfs: $(rootfs) |
22 | patchfs: $(patchfs) | 30 | patchfs: $(patchfs) |
23 | gold: $(gold) | ||
24 | 31 | ||
25 | %.patch.btrfs: %.seed.btrfs | 32 | %.patch.btrfs: %.seed.btrfs |
26 | $(sudo) $(fsmgr) build $@ | 33 | $(sudo) $(fsmgr) build $@ |
@@ -31,9 +38,6 @@ gold: $(gold) | |||
31 | %.btrfs: | 38 | %.btrfs: |
32 | $(sudo) $(fsmgr) build $@ | 39 | $(sudo) $(fsmgr) build $@ |
33 | 40 | ||
34 | $(gold): $(rootfs) | ||
35 | $(sudo) $(fsmgr) build $@ | ||
36 | |||
37 | $(patchfs): $(rootfs) | 41 | $(patchfs): $(rootfs) |
38 | 42 | ||
39 | $(patchfs) $(rootfs): | 43 | $(patchfs) $(rootfs): |