diff options
-rw-r--r-- | distrib/arc/ramdisk/Makefile | 15 | ||||
-rw-r--r-- | distrib/arc/ramdisk/list | 22 |
2 files changed, 24 insertions, 13 deletions
diff --git a/distrib/arc/ramdisk/Makefile b/distrib/arc/ramdisk/Makefile index d333340ccad..0750c1178d3 100644 --- a/distrib/arc/ramdisk/Makefile +++ b/distrib/arc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1997/05/24 10:25:13 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 1997/05/24 14:21:00 pefo Exp $ # NOTE! We don't do crunched yet! @@ -8,8 +8,8 @@ TOP= ${.CURDIR}/.. BSD_RD= bsd.rd IMAGE= mr.fs CBIN?= instbin -CRUNCHCONF?= ${.CURDIR}/${CBIN}.conf LISTS= ${.CURDIR}/list +UTILS?= ${.CURDIR}/../../miniroot MOUNT_POINT= /mnt MTREE= ${.CURDIR}/mtree.conf @@ -79,8 +79,11 @@ unconfig: install: cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} - crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} +${CBIN}.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + +${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf + crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c make -f ${CBIN}.mk all @@ -91,8 +94,8 @@ do_files: REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} clean cleandir: - /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c \ - bsd ${BSD_RD} ${BSD_RD}.elf rdsetroot + /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \ + *.o *.lo *.c bsd ${BSD_RD} ${BSD_RD}.elf rdsetroot beforeinstall: cp ${BSD.RD} ${DESTDIR}/snapshot diff --git a/distrib/arc/ramdisk/list b/distrib/arc/ramdisk/list index 343f543bf1c..94a04b9c21a 100644 --- a/distrib/arc/ramdisk/list +++ b/distrib/arc/ramdisk/list @@ -1,11 +1,13 @@ -# $OpenBSD: list,v 1.3 1997/05/19 10:33:21 pefo Exp $ +# $OpenBSD: list,v 1.4 1997/05/24 14:21:00 pefo Exp $ + +SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin +SRCDIRS usr.bin/vi usr.sbin/pppd # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin LINK instbin bin/cat LINK instbin bin/chmod LINK instbin bin/cp -LINK instbin bin/cpio bin/pax bin/tar LINK instbin bin/dd LINK instbin bin/df LINK instbin bin/ed @@ -14,10 +16,11 @@ LINK instbin bin/hostname LINK instbin bin/ln LINK instbin bin/ls LINK instbin bin/mkdir +LINK instbin bin/mt LINK instbin bin/mv -LINK instbin bin/pwd +LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sh bin/pdksh +LINK instbin bin/pdksh bin/sh LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -25,7 +28,7 @@ LINK instbin bin/test bin/[ LINK instbin sbin/disklabel LINK instbin sbin/fdisk LINK instbin sbin/fsck sbin/fsck_ffs -LINK instbin sbin/halt sbin/reboot +LINK instbin sbin/reboot sbin/halt LINK instbin sbin/ifconfig LINK instbin sbin/init LINK instbin sbin/mknod @@ -44,7 +47,7 @@ LINK instbin sbin/slattach LINK instbin sbin/scsi LINK instbin sbin/umount LINK instbin usr/bin/cut -LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep +LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep LINK instbin usr/bin/elf2ecoff LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat @@ -53,10 +56,15 @@ LINK instbin usr/bin/rsh LINK instbin usr/bin/sed LINK instbin usr/bin/sort LINK instbin usr/bin/tip -LINK instbin usr/bin/vi LINK instbin usr/sbin/chat LINK instbin usr/sbin/chown usr/sbin/chgrp LINK instbin usr/sbin/pppd +SYMLINK ../../instbin usr/sbin/chown usr/bin/chgrp +SYMLINK ../../instbin usr/bin/ftp +SYMLINK ../../instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +SYMLINK ../../instbin usr/bin/sed +SYMLINK ../../instbin usr/bin/build usr/bin/vi + SPECIAL /bin/rm instbin # `internal' crunchgen links |