1. Clean the intermediate files when building the default fixit floppy

   (demonstration) target.
2. Add the kcopy and filesystem floppy configuration files from Rod.

diff --git a/contrib/crunch/examples/Makefile b/contrib/crunch/examples/Makefile
index a1681e9..5fcbf86 100644 (file)
--- a/contrib/crunch/examples/Makefile
+++ b/contrib/crunch/examples/Makefile
@@ -11,7 +11,7 @@ OUTMK=        $(CRUNCHED).mk
 OUTPUTS=  $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache
 
 NOMAN=
 OUTPUTS=  $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache
 
 NOMAN=

-CLEANFILES+=$(CRUNCHED) *.o *.lo *_stub.c
+CLEANFILES+=$(CRUNCHED) *.o *.lo *_stub.c $(OUTMK)

 CLEANDIRFILES+=$(OUTPUTS)
 
 all: $(CRUNCHED)
 CLEANDIRFILES+=$(OUTPUTS)
 
 all: $(CRUNCHED)

diff --git a/contrib/crunch/examples/filesystem.conf b/contrib/crunch/examples/filesystem.conf
new file mode 100644 (file)
index 0000000..e45fd16
--- /dev/null
+++ b/contrib/crunch/examples/filesystem.conf
@@ -0,0 +1,21 @@
+#      $Id$
+
+srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin
+
+# /bin
+progs sh expr ls mkdir rm sync test
+ln test [
+
+# /sbin
+progs disklabel fdisk halt init mount mount_pcfs newfs umount
+
+# /usr/bin
+progs cpio gzip
+ln gzip gunzip
+ln gzip gzcat
+ln gzip zcat
+
+# /usr/sbin
+progs bad144
+
+libs -lutil

diff --git a/contrib/crunch/examples/kcopy.conf b/contrib/crunch/examples/kcopy.conf
new file mode 100644 (file)
index 0000000..3e14ab6
--- /dev/null
+++ b/contrib/crunch/examples/kcopy.conf
@@ -0,0 +1,12 @@
+#      $Id$
+
+srcdirs /usr/src/bin /usr/src/sbin
+
+# Programs from bin/
+progs sh cp echo test
+ln test [
+#
+# Programs from sbin/
+progs mount mount_isofs mount_pcfs fsck halt init umount
+
+libs -lutil -lcrypt