Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/prep/floppies/ramdisk convert to new distrib world o...



details:   https://anonhg.NetBSD.org/src/rev/026170b20e5f
branches:  trunk
changeset: 525519:026170b20e5f
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Apr 12 14:40:53 2002 +0000

description:
convert to new distrib world order.
xxx; untested

diffstat:

 distrib/prep/floppies/ramdisk/Makefile        |   89 ++++-----------
 distrib/prep/floppies/ramdisk/disktab         |   36 ------
 distrib/prep/floppies/ramdisk/list            |  145 ++++++++++++-------------
 distrib/prep/floppies/ramdisk/mtree.conf      |   82 --------------
 distrib/prep/floppies/ramdisk/ramdiskbin.conf |   44 -------
 5 files changed, 98 insertions(+), 298 deletions(-)

diffs (truncated from 442 to 300 lines):

diff -r 315189f159f4 -r 026170b20e5f distrib/prep/floppies/ramdisk/Makefile
--- a/distrib/prep/floppies/ramdisk/Makefile    Fri Apr 12 14:27:29 2002 +0000
+++ b/distrib/prep/floppies/ramdisk/Makefile    Fri Apr 12 14:40:53 2002 +0000
@@ -1,76 +1,39 @@
-#      $NetBSD: Makefile,v 1.7 2002/04/06 18:25:29 tsutsui Exp $
-
-TOP=           ${.CURDIR}/..
+#      $NetBSD: Makefile,v 1.8 2002/04/12 14:40:53 lukem Exp $
 
-.include "${TOP}/Makefile.inc"
-IMAGE=         ramdisk.fs
-
-AUXDEPENDS=    disktab.preinstall dot.profile termcap.src
-
-CBIN=          ramdiskbin
+.include <bsd.own.mk>
+.include "${_SRC_TOP_}/distrib/Makefile.inc"
 
-MOUNT_POINT?=  /mnt
-# DEV/RDEV file system device, CDEV/RCDEV vnconfig device
-VND?=          vnd0
-VND_DEV=       /dev/${VND}a
-VND_RDEV=      /dev/r${VND}a
-VND_CDEV=      /dev/${VND}c
-VND_CRDEV=     /dev/r${VND}c
-MDEC=          ${DESTDIR}/usr/mdec
+IMAGE=         ramdisk.fs
+IMAGESIZE=     2048k
+MAKEFS_FLAGS=  -f 15
 
-LISTS=         list
-CRUNCHCONF=    ${CBIN}.conf
-MTREECONF=     mtree.conf
-
-CRUNCHGEN?=    crunchgen
-MTREE?=                mtree
-
-DISKSIZE=      2048k
-DISKTYPE=      floppyinstfs
+WARNS=         1
 DBG=           -Os -mmultiple
 
-all: ${IMAGE}
-
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
-       rm -f ${IMAGE}.tmp
-       dd if=/dev/zero of=${IMAGE}.tmp bs=${DISKSIZE} count=1
-       vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}.tmp
-       disklabel -f ${.CURDIR}/disktab -rw ${VND_CDEV} ${DISKTYPE}
-       newfs -B be -m 0 -o space -i 6144 -c 128 ${VND_RDEV}
-       mount ${VND_DEV} ${MOUNT_POINT}
-       ${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
-       TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-           KERNOBJDIR=${KERNOBJDIR} \
-           TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
-       @echo ""
-       @df -i ${MOUNT_POINT}
-       @echo ""
-       umount ${MOUNT_POINT}
-       vnconfig -u ${VND_CDEV}
-       mv -f ${IMAGE}.tmp ${IMAGE}
-
-unconfig:
-       -umount -f ${MOUNT_POINT}
-       -vnconfig -u ${VND_CDEV}
-       -rm -f ${IMAGE}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-       ${CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib -d "${DBG}" \
-           ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-       ${MAKE} -f ${CBIN}.mk all
+CRUNCHBIN=     ramdiskbin
+CRUNCHGEN_FLAGS=-d "${DBG}"
+LISTS=         ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
+MTREECONF=     ${DISTRIBDIR}/common/mtree.common
+IMAGEENDIAN=   be
+MAKEDEVTARGETS=        ramdisk
+IMAGEDEPENDS=  ${CRUNCHBIN} \
+               dot.profile termcap.src \
+               ${_SRC_TOP_}/etc/group ${_SRC_TOP_}/etc/master.passwd \
+               ${_SRC_TOP_}/etc/netconfig ${_SRC_TOP_}/etc/protocols \
+               ${_SRC_TOP_}/etc/services
 
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=       ${DISTRIBDIR}/utils/libhack
 .include       "${HACKSRC}/Makefile.inc"
-${CBIN}:       libhack.o
+${CRUNCHBIN}:  libhack.o
+
+
+realall: ${IMAGE}
 
 release:
 
-clean cleandir distclean:
-       rm -f ${IMAGE} ${IMAGE}.tmp ${CBIN} ${CBIN}.mk ${CBIN}.cache
-       rm -f *.core *.o *.cro *.c
+.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.makedev"
+.include "${DISTRIBDIR}/common/Makefile.image"
 
-.include <bsd.sys.mk>
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff -r 315189f159f4 -r 026170b20e5f distrib/prep/floppies/ramdisk/disktab
--- a/distrib/prep/floppies/ramdisk/disktab     Fri Apr 12 14:27:29 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#      $NetBSD: disktab,v 1.1 2001/01/16 16:53:58 nonaka Exp $
-#
-# Disk geometry and partition layout tables.
-# Key:
-#      dt      controller type
-#      ty      type of disk (fixed, removeable, simulated)
-#      d[0-4]  drive-type-dependent parameters
-#      ns      #sectors/track
-#      nt      #tracks/cylinder
-#      nc      #cylinders/disk
-#      sc      #sectors/cylinder, ns*nt default
-#      su      #sectors/unit, sc*nc default
-#      se      sector size, DEV_BSIZE default
-#      rm      rpm, 3600 default
-#      sf      supports bad144-style bad sector forwarding
-#      sk      sector skew per track, default 0
-#      cs      sector skew per cylinder, default 0
-#      hs      headswitch time, default 0
-#      ts      one-cylinder seek time, default 0
-#      il      sector interleave (n:1), 1 default
-#      bs      boot block size, default BBSIZE
-#      sb      superblock size, default SBSIZE
-#      o[a-h]  partition offsets in sectors
-#      p[a-h]  partition sizes in sectors
-#      b[a-h]  partition block sizes in bytes
-#      f[a-h]  partition fragment sizes in bytes
-#      t[a-h]  partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
-
-floppyinstfs|NetBSD floppy install filesystem:\
-       :ty=floppy:se#512:nt#1:rm#300:ns#64:nc#64:\
-       :pa#4096:oa#0:ba#4096:fa#512:ta=4.2BSD:\
-       :pc#4096:oc#0:
diff -r 315189f159f4 -r 026170b20e5f distrib/prep/floppies/ramdisk/list
--- a/distrib/prep/floppies/ramdisk/list        Fri Apr 12 14:27:29 2002 +0000
+++ b/distrib/prep/floppies/ramdisk/list        Fri Apr 12 14:40:53 2002 +0000
@@ -1,86 +1,85 @@
-#      $NetBSD: list,v 1.1 2001/01/16 16:53:58 nonaka Exp $
+#      $NetBSD: list,v 1.2 2002/04/12 14:40:55 lukem Exp $
+
+SRCDIRS        bin sbin usr.bin usr.sbin gnu/usr.bin
+
+PROG   bin/cat
+PROG   bin/chmod
+PROG   bin/cp
+PROG   bin/dd
+PROG   bin/df
+PROG   bin/ed
+PROG   bin/ln
+PROG   bin/ls
+PROG   bin/mkdir
+PROG   bin/mv
+PROG   bin/pax         usr/bin/tar
+PROG   bin/pwd
+PROG   bin/rcmd        usr/bin/rsh
+PROG   bin/rcp
+PROG   bin/rm
+PROG   bin/sh
+PROG   bin/stty
+PROG   bin/sync
 
-# copy the crunched binary, link to it, and kill it
-COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
-LINK   ramdiskbin                      sysinst
-LINK   ramdiskbin                      bin/cat
-LINK   ramdiskbin                      bin/chmod
-LINK   ramdiskbin                      bin/cp
-LINK   ramdiskbin                      bin/dd
-LINK   ramdiskbin                      bin/df
-LINK   ramdiskbin                      bin/ed
-LINK   ramdiskbin                      bin/ln
-LINK   ramdiskbin                      bin/ls
-LINK   ramdiskbin                      bin/mkdir
-LINK   ramdiskbin                      bin/mv
-LINK   ramdiskbin                      bin/pax
-LINK   ramdiskbin                      bin/pwd
-LINK   ramdiskbin                      bin/rcmd
-LINK   ramdiskbin                      bin/rcp
-LINK   ramdiskbin                      bin/rm
-LINK   ramdiskbin                      bin/sh
-LINK   ramdiskbin                      bin/stty
-LINK   ramdiskbin                      bin/sync
-LINK   ramdiskbin                      bin/test
-LINK   ramdiskbin                      bin/[
-LINK   ramdiskbin                      sbin/disklabel
-LINK   ramdiskbin                      sbin/dmesg
-LINK   ramdiskbin                      sbin/fsck
-LINK   ramdiskbin                      sbin/fsck_ffs
-LINK   ramdiskbin                      sbin/halt
-LINK   ramdiskbin                      sbin/ifconfig
-LINK   ramdiskbin                      sbin/init
-LINK   ramdiskbin                      sbin/mknod
-LINK   ramdiskbin                      sbin/mount
-LINK   ramdiskbin                      sbin/mount_cd9660
-LINK   ramdiskbin                      sbin/mount_ffs
-LINK   ramdiskbin                      sbin/mount_kernfs
-LINK   ramdiskbin                      sbin/mount_mfs
-LINK   ramdiskbin                      sbin/mount_msdos
-LINK   ramdiskbin                      sbin/mount_nfs
-LINK   ramdiskbin                      sbin/newfs
-LINK   ramdiskbin                      sbin/ping
-LINK   ramdiskbin                      sbin/reboot
-LINK   ramdiskbin                      sbin/restore
-LINK   ramdiskbin                      sbin/route
-LINK   ramdiskbin                      sbin/rrestore
-LINK   ramdiskbin                      sbin/shutdown
-LINK   ramdiskbin                      sbin/umount
-LINK   ramdiskbin                      usr/bin/chgrp
-LINK   ramdiskbin                      usr/bin/ftp
-LINK   ramdiskbin                      usr/bin/gunzip
-LINK   ramdiskbin                      usr/bin/gzcat
-LINK   ramdiskbin                      usr/bin/gzip
-LINK   ramdiskbin                      usr/bin/more
-LINK   ramdiskbin                      usr/bin/sed
-LINK   ramdiskbin                      usr/bin/tar
-LINK   ramdiskbin                      usr/bin/tset
-LINK   ramdiskbin                      usr/sbin/chown
-LINK   ramdiskbin                      usr/sbin/chroot
-SPECIAL        /bin/rm ramdiskbin
+PROG   sbin/disklabel
+PROG   sbin/dmesg
+PROG   sbin/fdisk
+PROG   sbin/fsck
+PROG   sbin/fsck_ffs
+PROG   sbin/ifconfig
+PROG   sbin/init
+PROG   sbin/mknod
+PROG   sbin/mount
+PROG   sbin/mount_cd9660
+PROG   sbin/mount_ffs
+PROG   sbin/mount_kernfs
+PROG   sbin/mount_msdos
+PROG   sbin/mount_nfs
+PROG   sbin/newfs      sbin/mount_mfs
+PROG   sbin/ping
+PROG   sbin/reboot     sbin/halt
+PROG   sbin/restore    sbin/rrestore
+PROG   sbin/route
+PROG   sbin/shutdown
+PROG   sbin/umount
 
-# copy the MAKEDEV script and make some devices
-COPY   ${DESTDIR}/dev/MAKEDEV          dev/MAKEDEV
-SPECIAL cd dev; sh MAKEDEV ramdisk
-SPECIAL /bin/rm dev/MAKEDEV
+PROG   usr/bin/ftp
+PROG   usr/bin/gzip    usr/bin/gunzip usr/bin/gzcat
+PROG   usr/bin/more    usr/bin/less
+PROG   usr/bin/sed
+PROG   usr/bin/tip
+PROG   usr/bin/tset
+
+PROG   usr/sbin/chown  usr/bin/chgrp
+PROG   usr/sbin/chroot
+
+# init invokes the shell as -sh
+ARGVLN sh -sh
+
+SPECIAL        dmesg           srcdir  distrib/utils/x_dmesg
+SPECIAL        ftp             srcdir  distrib/utils/x_ftp
+SPECIAL        gzip            srcdir  distrib/utils/x_gzip
+SPECIAL        ifconfig        srcdir  distrib/utils/x_ifconfig
+SPECIAL        more            srcdir  distrib/utils/more
+SPECIAL        ping            srcdir  distrib/utils/x_ping
+SPECIAL        route           srcdir  distrib/utils/x_route
+SPECIAL        sysinst         srcdir  distrib/utils/sysinst
+SPECIAL        sysinst         srcdir  distrib/utils/sysinst/arch/prep
+
+LIBS   libhack.o -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lz
 
 # and the termcap file
 COPY   ${CURDIR}/termcap.src                   usr/share/misc/termcap
 
 # various files that we need in /etc for the install
-COPY   ${CURDIR}/../../../../etc/group         etc/group
-COPY   ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
-COPY   ${CURDIR}/../../../../etc/netconfig     etc/netconfig
-COPY   ${CURDIR}/../../../../etc/protocols     etc/protocols
-COPY   ${CURDIR}/../../../../etc/services      etc/services
-SPECIAL        pwd_mkdb -p -d . etc/master.passwd
-SPECIAL        rm etc/pwd.db etc/spwd.db
+COPY   ${_SRC_TOP_}/etc/group          etc/group
+COPY   ${_SRC_TOP_}/etc/master.passwd  etc/master.passwd
+COPY   ${_SRC_TOP_}/etc/netconfig      etc/netconfig
+COPY   ${_SRC_TOP_}/etc/protocols      etc/protocols
+COPY   ${_SRC_TOP_}/etc/services       etc/services
 



Home | Main Index | Thread Index | Old Index