remove cruft

4 files changed, 13 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
index c04983b..33ca92f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,22 +19,6 @@ install-submodules-stamp
 conf/br0
 conf/dnsmasq.conf
 conf/network_if-up.d_samizdat
-ssh_*.deb
-openssh-client-dbgsym_*_*.deb
-openssh-client-udeb_*_*.udeb
-openssh-client_*_*.deb
-openssh-server-dbgsym_*_*.deb
-openssh-server-udeb_*_*.udeb
-openssh-server_*_*.deb
-openssh-sftp-server-dbgsym_*_*.deb
-openssh-sftp-server_*_*.deb
-openssh-tests-dbgsym_*_*.deb
-openssh-tests_*_*.deb
-openssh_*_*.buildinfo
-openssh_*_*.changes
-ssh-askpass-gnome-dbgsym_*_*.deb
-ssh-askpass-gnome_*_*.deb
-ssh_*_all.deb
 rootfs/samizdat.btrfs
 rootfs/_build/
 /build-deps-stamp
@@ -57,3 +41,4 @@ apt-get-update-stamp
 /rootfs/*.btrfs.tmp.*
 *.img
 *.tmp
+sami-build-deps_*
diff --git a/Makefile b/Makefile
index cf5a71c..7e625e7 100644
--- a/Makefile
+++ b/Makefile
@@ -139,14 +139,8 @@ update-submodules:
 install-submodules: cmd=install
 install-submodules: update-submodules $(INSTALL_SUBMODULES)
 
-GOLD =
-ifdef GOLD
-rootfs = samizdat-gold.seed.btrfs
-patchfs =
-else
 rootfs = samizdat.seed.btrfs
 patchfs = $(patsubst %.seed.btrfs,%.patch.btrfs,$(rootfs))
-endif
 rootfs_verity = $(addprefix rootfs/,$(addsuffix .verity,$(rootfs) $(patchfs)))
 
 .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)
 
 rootfs ?= samizdat.seed.btrfs
 patchfs ?= samizdat.patch.btrfs
-# gold ?= samizdat-gold.btrfs
 
 .DEFAULT_GOAL = all
 
-.PHONY: all rootfs patchfs gold
-all: $(rootfs) $(patchfs) $(gold)
+.PHONY: all rootfs patchfs clean pristine
+all: $(rootfs) $(patchfs)
+
+clean = $(patchfs) $(rootfs) $(patsubst %.seed.btrfs, %.btrfs, $(rootfs))
+clean := $(clean) $(patsubst %, %.tmp, $(clean))
 
 clean:
-        rm -f $(patsubst %.seed.btrfs,%.btrfs,$(rootfs)) $(rootfs) $(patchfs) $(gold)
+        rm -f $(clean)
+
+
+pristine: clean
+        @# TODO: implement rm --recursive --auto-umount
+        @# TODO: consider even rm --root-command=sudo for auto-sudo.  Why not for all coreutils?
+        $(sudo) rm -i -rf _build
 
 rootfs: $(rootfs)
 patchfs: $(patchfs)
-gold: $(gold)
 
 %.patch.btrfs: %.seed.btrfs
         $(sudo) $(fsmgr) build $@
@@ -31,9 +38,6 @@ gold: $(gold)
 %.btrfs:
         $(sudo) $(fsmgr) build $@
 
-$(gold): $(rootfs)
-        $(sudo) $(fsmgr) build $@
-
 $(patchfs): $(rootfs)
 
 $(patchfs) $(rootfs):