From: rahnds <rahnds@openbsd.org>
Date: Thu, 6 Feb 1997 06:20:14 +0000 (+0000)
Subject: Now with the miniroot using the rd driver, the inst and kc may become
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2c15f12b024a79c5e9b32740614d082af0bf9558;p=openbsd

Now with the miniroot using the rd driver, the inst and kc may become
obsolete, but currently the miniroot uses this directory.
---

diff --git a/distrib/powerpc/inst-common/Makefile.inc b/distrib/powerpc/inst-common/Makefile.inc
index 28e7b7e6002..eeded287978 100644
--- a/distrib/powerpc/inst-common/Makefile.inc
+++ b/distrib/powerpc/inst-common/Makefile.inc
@@ -4,36 +4,28 @@
 
 # TOP is assumed to be defined by Makefile including this one.
 
-CBIN=		raminst
+CBIN?=		raminst
 COMMONDIR=	${TOP}/inst-common
 
-MOUNT_POINT?=	${TOP}/inst/fs
+MOUNT_POINT?=	${TOP}/${BASE}/fs
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list
-CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
+CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
 MTREE=		${COMMONDIR}/mtree.conf
 
-all: ${CBIN}
-	rm -rf ${MOUNT_POINT}
-	mkdir -p ${MOUNT_POINT}
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
-	mkcdfs ${IMAGE} ${MOUNT_POINT}
-
-unconfig:
-	-/bin/rm -f ${IMAGE}
-	-/bin/rm -rf ${MOUNT_POINT}
-
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
 
+do_files:
+	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
-	/bin/rm -rf ${MOUNT_POINT}
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/powerpc/inst-common/list b/distrib/powerpc/inst-common/list
index 253709c187b..ec9ebb4636a 100644
--- a/distrib/powerpc/inst-common/list
+++ b/distrib/powerpc/inst-common/list
@@ -13,6 +13,8 @@ LINK	raminst			bin/ed
 LINK	raminst			bin/expr
 LINK	raminst			bin/ln
 LINK	raminst			bin/ls
+LINK	raminst			bin/kill
+LINK	raminst			bin/hostname
 LINK	raminst			bin/mkdir
 LINK	raminst			bin/mv
 LINK	raminst			bin/pwd
@@ -21,6 +23,7 @@ LINK	raminst			bin/rm
 LINK	raminst			bin/sh
 LINK	bin/sh			bin/-sh
 LINK	raminst			bin/stty
+LINK	raminst			bin/sleep
 LINK	raminst			bin/sync
 LINK	raminst			bin/test
 LINK	raminst			bin/[
@@ -34,27 +37,26 @@ LINK	raminst			sbin/mknod
 LINK	raminst			sbin/mount
 LINK	raminst			sbin/mount_cd9660
 LINK	raminst			sbin/mount_ffs
+LINK	raminst			sbin/mount_kernfs
 LINK	raminst			sbin/mount_nfs
 LINK	raminst			sbin/mount_mfs
 LINK	raminst			sbin/newfs
 LINK	raminst			sbin/reboot
 LINK	raminst			sbin/route
-LINK	raminst			sbin/shutdown
 LINK	raminst			sbin/slattach
 LINK	raminst			sbin/umount
 LINK	raminst			usr/bin/chgrp
+LINK	raminst			usr/bin/cut
 LINK	raminst			usr/bin/ftp
-LINK	raminst			usr/bin/gunzip
-LINK	raminst			usr/bin/gzcat
+LINK	raminst			usr/bin/egrep
+LINK	raminst			usr/bin/grep
 LINK	raminst			usr/bin/gzip
 LINK	raminst			usr/bin/more
-LINK	raminst			usr/bin/printf
 LINK	raminst			usr/bin/sed
-LINK	raminst			usr/bin/strings
+LINK	raminst			usr/bin/sort
 LINK	raminst			usr/bin/pax
 LINK	raminst			usr/bin/tip
 LINK	raminst			usr/sbin/chown
-LINK	raminst			usr/sbin/chroot
 SPECIAL	/bin/rm raminst
 
 # copy the MAKEDEV script and make some devices