Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/i386/floppies - migrate a bunch of the common list s...
details: https://anonhg.NetBSD.org/src/rev/8e31e35abbd3
branches: trunk
changeset: 521913:8e31e35abbd3
user: lukem <lukem%NetBSD.org@localhost>
date: Fri Feb 08 05:02:16 2002 +0000
description:
- migrate a bunch of the common list stuff to common/list.ramdisk
- use ${DISTRIBDIR} as appropriate
- use ${DISTRIBDIR}/common/list.sysinst if USE_SYSINST is defined,
removing any replicated list info
- define USE_SYSINST in the sysinst-using ramdisks
- replace MAKEDEV_DEVS with MAKEDEVTARGETS
diffstat:
distrib/i386/floppies/common/list.ramdisk | 14 +++++++++++---
distrib/i386/floppies/ramdisk-big/Makefile | 5 +++--
distrib/i386/floppies/ramdisk-big/list | 17 +++--------------
distrib/i386/floppies/ramdisk-rescuesmall/Makefile | 4 ++--
distrib/i386/floppies/ramdisk-rescuesmall/list | 9 +--------
distrib/i386/floppies/ramdisk-rescuetiny/Makefile | 8 ++++----
distrib/i386/floppies/ramdisk-rescuetiny/list | 9 +--------
distrib/i386/floppies/ramdisk-small/Makefile | 5 +++--
distrib/i386/floppies/ramdisk-small/list | 15 +--------------
distrib/i386/floppies/ramdisk-tiny/Makefile | 7 ++++---
distrib/i386/floppies/ramdisk-tiny/list | 15 +--------------
11 files changed, 34 insertions(+), 74 deletions(-)
diffs (286 lines):
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/common/list.ramdisk
--- a/distrib/i386/floppies/common/list.ramdisk Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/common/list.ramdisk Fri Feb 08 05:02:16 2002 +0000
@@ -1,10 +1,18 @@
-# $NetBSD: list.ramdisk,v 1.2 2002/02/06 16:12:18 lukem Exp $
+# $NetBSD: list.ramdisk,v 1.3 2002/02/08 05:02:16 lukem Exp $
+
+SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/@MACHINE@/stand
+
+# init invokes the shell as -sh
+ARGVLN sh -sh
+
+# libhack.o is built by Makefile & included Makefile.inc
+LIBS libhack.o -lbz2 -lutil -ll -lm
# various files that we need in /etc for the install
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/netconfig etc/netconfig
COPY ${_SRC_TOP_}/etc/services etc/services
# we need the boot block in /usr/mdec + the MBR copy
@@ -15,5 +23,5 @@
# and the common installation tools
COPY ${CURDIR}/../common/termcap.mini usr/share/misc/termcap
-# and the installation tools
+# and the boot script
CMD sed -e "s/@BOOTMODEL@/${BOOTMODEL}/" < ${CURDIR}/../common/dot.profile > .profile
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-big/Makefile
--- a/distrib/i386/floppies/ramdisk-big/Makefile Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-big/Makefile Fri Feb 08 05:02:16 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/02/05 11:15:04 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/02/08 05:02:17 lukem Exp $
BOOTMODEL= big
IMAGE= ramdisk-${BOOTMODEL}.fs
@@ -6,5 +6,6 @@
IMAGEDEPENDS= disktab.preinstall \
${_SRC_TOP_}/usr.sbin/dhcp/clientscript/dhclient-script \
${DESTDIR}/usr/mdec/biosboot_com0.sym
+USE_SYSINST= yes
-.include "../common/Makefile.ramdisk"
+.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-big/list
--- a/distrib/i386/floppies/ramdisk-big/list Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-big/list Fri Feb 08 05:02:16 2002 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: list,v 1.9 2002/02/03 16:58:46 lukem Exp $
+# $NetBSD: list,v 1.10 2002/02/08 05:02:17 lukem Exp $
#
-SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
-
-PROG sysinst
+SRCDIRS usr.bin/less
PROG bin/cat
PROG bin/chio
@@ -68,29 +66,20 @@
PROG usr/sbin/chroot
PROG usr/sbin/wiconfig
-# init invokes the shell as -sh
-ARGVLN sh -sh
-
SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ftp srcdir distrib/utils/x_ftp
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL ping6 srcdir distrib/utils/x_ping6
SPECIAL route srcdir distrib/utils/x_route
-SPECIAL sh srcdir distrib/utils/x_sh
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/i386
-# libhack.o is built by Makefile & included Makefile.inc
LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm
# various files that we need in /etc for the install
-COPY ${_SRC_TOP_}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script
+COPY ${_SRC_TOP_}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
# we need the boot block in /usr/mdec + the MBR copy
COPY ${DESTDIR}/usr/mdec/biosboot_com0.sym usr/mdec/biosboot_com0.sym
# the disktab explanation file
COPY ${CURDIR}/disktab.preinstall etc/disktab.preinstall
-
-# the lists of obsolete files used by sysinst
-CMD sh ${_SRC_TOP_}/distrib/sets/makeobsolete -b -s ${_SRC_TOP_}/distrib/sets -t ./dist
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-rescuesmall/Makefile
--- a/distrib/i386/floppies/ramdisk-rescuesmall/Makefile Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuesmall/Makefile Fri Feb 08 05:02:16 2002 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/02/03 16:22:25 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2002/02/08 05:02:17 lukem Exp $
BOOTMODEL= small
IMAGE= ramdisk-rescue${BOOTMODEL}.fs
IMAGESIZE= 1320k
-.include "../common/Makefile.ramdisk"
+.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-rescuesmall/list
--- a/distrib/i386/floppies/ramdisk-rescuesmall/list Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuesmall/list Fri Feb 08 05:02:16 2002 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: list,v 1.5 2002/02/03 16:58:47 lukem Exp $
+# $NetBSD: list,v 1.6 2002/02/08 05:02:18 lukem Exp $
#
-SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
-
PROG bin/cat
PROG bin/chio
PROG bin/chmod
@@ -58,9 +56,6 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
-# init invokes the shell as -sh
-ARGVLN sh -sh
-
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL ftp srcdir distrib/utils/x_ftp
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
@@ -68,8 +63,6 @@
SPECIAL mount srcdir distrib/utils/x_mount
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
-SPECIAL sh srcdir distrib/utils/x_sh
SPECIAL umount srcdir distrib/utils/x_umount
-# libhack.o is built by Makefile & included Makefile.inc
LIBS libhack.o -lbz2 -ltermcap -lutil -lrmt -ll -lm
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-rescuetiny/Makefile
--- a/distrib/i386/floppies/ramdisk-rescuetiny/Makefile Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuetiny/Makefile Fri Feb 08 05:02:16 2002 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2002/02/06 16:15:56 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2002/02/08 05:02:18 lukem Exp $
BOOTMODEL= tiny
IMAGE= ramdisk-rescue${BOOTMODEL}.fs
IMAGESIZE= 1440k
-MAKEDEV_DEVS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 pty0 ttyv0
-MAKEFS_FLAGS= -f 10
+MAKEDEVTARGETS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 pty0 ttyv0
+MAKEFS_FLAGS= -f 20
-.include "../common/Makefile.ramdisk"
+.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-rescuetiny/list
--- a/distrib/i386/floppies/ramdisk-rescuetiny/list Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuetiny/list Fri Feb 08 05:02:16 2002 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: list,v 1.6 2002/02/03 16:58:47 lukem Exp $
-
-SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
+# $NetBSD: list,v 1.7 2002/02/08 05:02:18 lukem Exp $
PROG bin/cat
PROG bin/chmod
@@ -55,9 +53,6 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
-# init invokes the shell as -sh
-ARGVLN sh -sh
-
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL ftp srcdir distrib/utils/x_ftp
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
@@ -65,8 +60,6 @@
SPECIAL mount srcdir distrib/utils/x_mount
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
-SPECIAL sh srcdir distrib/utils/x_sh
SPECIAL umount srcdir distrib/utils/x_umount
-# libhack.o is built by Makefile & included Makefile.inc
LIBS libhack.o -lbz2 -ltermcap -lutil -lrmt -ll -lm
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-small/Makefile
--- a/distrib/i386/floppies/ramdisk-small/Makefile Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-small/Makefile Fri Feb 08 05:02:16 2002 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/02/03 16:22:27 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2002/02/08 05:02:19 lukem Exp $
BOOTMODEL= small
IMAGE= ramdisk-${BOOTMODEL}.fs
IMAGESIZE= 1344k
+USE_SYSINST= yes
-.include "../common/Makefile.ramdisk"
+.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-small/list
--- a/distrib/i386/floppies/ramdisk-small/list Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-small/list Fri Feb 08 05:02:16 2002 +0000
@@ -1,8 +1,4 @@
-# $NetBSD: list,v 1.8 2002/02/03 16:58:47 lukem Exp $
-
-SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
-
-PROG sysinst
+# $NetBSD: list,v 1.9 2002/02/08 05:02:19 lukem Exp $
PROG bin/cat
PROG bin/chmod
@@ -47,21 +43,12 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
-# init invokes the shell as -sh
-ARGVLN sh -sh
-
SPECIAL ftp srcdir distrib/utils/x_ftp
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL more srcdir distrib/utils/more
SPECIAL mount srcdir distrib/utils/x_mount
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
-SPECIAL sh srcdir distrib/utils/x_sh
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/i386
SPECIAL umount srcdir distrib/utils/x_umount
-# libhack.o is built by Makefile & included Makefile.inc
LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lcrypt -ll -lm
-
-# the lists of obsolete files used by sysinst
-CMD sh ${_SRC_TOP_}/distrib/sets/makeobsolete -b -s ${_SRC_TOP_}/distrib/sets -t ./dist
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-tiny/Makefile
--- a/distrib/i386/floppies/ramdisk-tiny/Makefile Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-tiny/Makefile Fri Feb 08 05:02:16 2002 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2002/02/06 16:15:57 lukem Exp $
+# $NetBSD: Makefile,v 1.20 2002/02/08 05:02:20 lukem Exp $
BOOTMODEL= tiny
IMAGE= ramdisk-${BOOTMODEL}.fs
IMAGESIZE= 1440k
-MAKEDEV_DEVS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 pty0 ttyv0
+MAKEDEVTARGETS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 pty0 ttyv0
MAKEFS_FLAGS= -f 10
+USE_SYSINST= yes
-.include "../common/Makefile.ramdisk"
+.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 73d459bf38f2 -r 8e31e35abbd3 distrib/i386/floppies/ramdisk-tiny/list
--- a/distrib/i386/floppies/ramdisk-tiny/list Fri Feb 08 04:53:50 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-tiny/list Fri Feb 08 05:02:16 2002 +0000
@@ -1,8 +1,4 @@
-# $NetBSD: list,v 1.6 2002/02/03 16:22:28 lukem Exp $
-
-SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
-
-PROG sysinst
+# $NetBSD: list,v 1.7 2002/02/08 05:02:20 lukem Exp $
PROG bin/cat
PROG bin/chmod
@@ -46,20 +42,11 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
-# init invokes the shell as -sh
-ARGVLN sh -sh
-
SPECIAL ftp srcdir distrib/utils/x_ftp
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL mount srcdir distrib/utils/x_mount
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
-SPECIAL sh srcdir distrib/utils/x_sh
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/i386
SPECIAL umount srcdir distrib/utils/x_umount
-# libhack.o is built by Makefile & included Makefile.inc
LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lcrypt -ll -lm
-
-# the lists of obsolete files used by sysinst
-CMD sh ${_SRC_TOP_}/distrib/sets/makeobsolete -b -s ${_SRC_TOP_}/distrib/sets -t ./dist
Home |
Main Index |
Thread Index |
Old Index