Remove the (now unused; it is in ../../build/Makefile.crunch)

Makefile, update crunch.conf

Approved-By: jordan

2 files changed, 1 insertions, 51 deletions

diff --git a/release/picobsd/dial/crunch1/Makefile b/release/picobsd/dial/crunch1/Makefile
deleted file mode 100644
index 3f183480fb9b..000000000000
--- a/release/picobsd/dial/crunch1/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $FreeBSD$
-#
-NOCRYPT?=	yes
-SRC?=/usr/src
-
-all: crunch
-
-crunch:
-	if [ "${INIT}" = "init" ]; then \
-		echo "progs init getty" >crunch1.conf ; \
-	else \
-		echo "progs ${INIT}" >crunch1.conf ; \
-	fi;
-	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >>crunch1.conf
-	@crunchgen ${.CURDIR}/crunch1.conf
-	@${MAKE} -DRELEASE_CRUNCH -f crunch1.mk all NOCRYPT=yes \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY" #2>&1 >/dev/null
-
-clean:
-	rm  -f *.o *.stub *.lo *_stub.c *.mk \
-		crunch.cache \
-		crunch.mk \
-		crunch.c \
-		crunch \
-		crunch1* \
-		.tmp_* \
-		*.gz
-
-install:
-	cp crunch1 /mnt/stand/crunch
-	chmod 555 /mnt/stand/crunch
-	for i in `crunchgen -l crunch1.conf` ; \
-	do \
-		ln /mnt/stand/crunch /mnt/stand/$${i}; \
-	done
-	rm /mnt/stand/crunch
-
-.include <bsd.prog.mk>
diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch1/crunch.conf
index c6a8b5dbafc7..296f707cfb2f 100644
--- a/release/picobsd/dial/crunch1/crunch.conf
+++ b/release/picobsd/dial/crunch1/crunch.conf
@@ -7,17 +7,6 @@
 # See Makefile for details on how it's added here - you shouldn't add it
 # manually here...
 
-# source dir for SSH.
-# * You have to configure and build the port
-# * Then you have to make a symlink:
-#	cd /usr/ports/security/ssh/work/
-#	ln -s ssh-1.2.26 ssh
-# * Then you have to add OBJS=${SSH_OBJS} in the Makefile (somewhere around
-#   line 327)
-# * Then uncomment the lines refering to ssh in this file
-
-#srcdirs /usr/ports/security/ssh/work/
-
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -42,7 +31,7 @@ progs chmod chown help
 progs cp df fsck ping mv ln traceroute
 progs ifconfig kbdcontrol moused
 progs ls mkdir mount mount_msdos mount_cd9660 mount_ext2fs
-progs rm route sysctl umount
+progs rm route sysctl umount reboot
 progs vidcontrol
 ln sh -sh
 ln test [