From 7a3d39395e87311790b7ace16cb4e09d6458bc8b Mon Sep 17 00:00:00 2001 From: abs Date: Sun, 25 Jan 2009 22:08:37 +0000 Subject: [PATCH] Use the cutdown distrib/common/services and distrib/common/protocols rather than the full fat etc versions --- distrib/acorn26/instkernel/Makefile | 4 ++-- distrib/acorn26/instkernel/list | 4 ++-- distrib/acorn32/ramdisk/Makefile | 4 ++-- distrib/acorn32/ramdisk/list | 4 ++-- distrib/alpha/instkernel/ramdisk/Makefile | 4 ++-- distrib/alpha/instkernel/ramdisk/list | 4 ++-- distrib/amd64/ramdisks/common/Makefile.ramdisk | 4 ++-- distrib/amd64/ramdisks/common/list.ramdisk | 4 ++-- distrib/amiga/floppies/inst-common/list | 18 +++++++++--------- distrib/arc/ramdisk/Makefile | 4 ++-- distrib/arc/ramdisk/list | 4 ++-- distrib/atari/floppies/install/list | 4 ++-- distrib/bebox/floppies/ramdisk/list | 12 ++++++------ distrib/cats/ramdisk/Makefile | 4 ++-- distrib/cats/ramdisk/list | 4 ++-- distrib/cobalt/ramdisk/Makefile | 4 ++-- distrib/cobalt/ramdisk/list | 4 ++-- distrib/dreamcast/ramdisk/Makefile | 4 ++-- distrib/dreamcast/ramdisk/list | 4 ++-- distrib/evbarm/instkernel/ramdisk/Makefile | 4 ++-- distrib/evbarm/instkernel/ramdisk/list | 4 ++-- distrib/evbmips/instkernel/ramdisk/Makefile | 4 ++-- distrib/evbmips/instkernel/ramdisk/list | 4 ++-- distrib/evbppc/ramdisk/Makefile | 4 ++-- distrib/evbppc/ramdisk/list | 4 ++-- distrib/evbsh3/rom/ramdiskcommon/list | 8 ++++---- distrib/ews4800mips/floppies/ramdisk/Makefile | 4 ++-- distrib/ews4800mips/floppies/ramdisk/list | 4 ++-- distrib/hp300/ramdisk/Makefile | 4 ++-- distrib/hp300/ramdisk/list | 4 ++-- distrib/hp700/ramdisk/Makefile | 4 ++-- distrib/hp700/ramdisk/list | 4 ++-- distrib/i386/ramdisks/common/Makefile.ramdisk | 4 ++-- distrib/i386/ramdisks/common/list.ramdisk | 4 ++-- distrib/ibmnws/netboot/ramdisk/Makefile | 4 ++-- distrib/ibmnws/netboot/ramdisk/list | 4 ++-- distrib/landisk/ramdisk/Makefile | 7 ++++--- distrib/landisk/ramdisk/list | 12 ++++++------ distrib/mac68k/instkernel/ramdisk/Makefile | 4 ++-- distrib/mac68k/instkernel/ramdisk/list | 4 ++-- distrib/macppc/floppies/ramdisk/Makefile | 4 ++-- distrib/macppc/floppies/ramdisk/list | 4 ++-- distrib/miniroot/Makefile | 4 ++-- distrib/miniroot/list | 4 ++-- distrib/mipsco/ramdisk/Makefile | 4 ++-- distrib/mipsco/ramdisk/list | 4 ++-- distrib/mvme68k/ramdisk/Makefile | 4 ++-- distrib/mvme68k/ramdisk/list | 4 ++-- distrib/newsmips/floppies/ramdisk/Makefile | 4 ++-- distrib/newsmips/floppies/ramdisk/list | 4 ++-- distrib/ofppc/ramdisks/common/Makefile.ramdisk | 4 ++-- distrib/ofppc/ramdisks/common/list.ramdisk | 4 ++-- distrib/sandpoint/ramdisk/Makefile | 4 ++-- distrib/sandpoint/ramdisk/list | 4 ++-- distrib/sgimips/ramdisk/Makefile | 4 ++-- distrib/sgimips/ramdisk/list | 4 ++-- distrib/shark/instkernel/ramdisk/Makefile | 4 ++-- distrib/shark/instkernel/ramdisk/list | 4 ++-- distrib/sparc64/instfs/Makefile.instfs | 4 ++-- distrib/sparc64/instfs/list | 4 ++-- distrib/sun2/miniroot/Makefile | 7 ++++--- distrib/sun2/miniroot/list | 16 ++++++++-------- distrib/sun3/miniroot/Makefile | 7 ++++--- distrib/sun3/miniroot/list | 16 ++++++++-------- distrib/vax/inst-common/list | 18 +++++++++--------- distrib/vax/ramdisk/Makefile | 4 ++-- distrib/vax/ramdisk/list | 4 ++-- distrib/x68k/floppies/ramdisk/Makefile | 4 ++-- distrib/x68k/floppies/ramdisk/list | 4 ++-- distrib/zaurus/ramdisk/Makefile | 4 ++-- distrib/zaurus/ramdisk/list | 4 ++-- 71 files changed, 184 insertions(+), 181 deletions(-) diff --git a/distrib/acorn26/instkernel/Makefile b/distrib/acorn26/instkernel/Makefile index bbe7cee15f62..616dbbabe02d 100644 --- a/distrib/acorn26/instkernel/Makefile +++ b/distrib/acorn26/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/05/15 19:16:18 dogcow Exp $ +# $NetBSD: Makefile,v 1.9 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -18,7 +18,7 @@ MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile termcap.src \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/acorn26/instkernel/list b/distrib/acorn26/instkernel/list index 7c97f5351f57..de1ab0b2bc15 100644 --- a/distrib/acorn26/instkernel/list +++ b/distrib/acorn26/instkernel/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.8 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -65,7 +65,7 @@ ARGVLN sh -sh COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/acorn32/ramdisk/Makefile b/distrib/acorn32/ramdisk/Makefile index 579362e939f8..3c3a030941d5 100644 --- a/distrib/acorn32/ramdisk/Makefile +++ b/distrib/acorn32/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/05/12 09:00:30 he Exp $ +# $NetBSD: Makefile,v 1.17 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -18,7 +18,7 @@ MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile termcap.vt100 \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services IMAGE_RELEASEDIR= installation/misc diff --git a/distrib/acorn32/ramdisk/list b/distrib/acorn32/ramdisk/list index 30897d45a4cb..8a7aed1958a0 100644 --- a/distrib/acorn32/ramdisk/list +++ b/distrib/acorn32/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.15 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -65,7 +65,7 @@ LIBS -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/alpha/instkernel/ramdisk/Makefile b/distrib/alpha/instkernel/ramdisk/Makefile index 1fe7cee96686..e6ad580a5397 100644 --- a/distrib/alpha/instkernel/ramdisk/Makefile +++ b/distrib/alpha/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/05/10 23:22:28 dogcow Exp $ +# $NetBSD: Makefile,v 1.24 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -22,7 +22,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DISTRIBDIR}/utils/script-installer/dot.commonutils \ ${DISTRIBDIR}/utils/script-installer/dot.instutils \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services INSTNOTESDIR!= cd ${DISTRIBDIR}/notes/alpha && ${PRINTOBJDIR} diff --git a/distrib/alpha/instkernel/ramdisk/list b/distrib/alpha/instkernel/ramdisk/list index 7f10451f3e99..bf31f039e7ae 100644 --- a/distrib/alpha/instkernel/ramdisk/list +++ b/distrib/alpha/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.25 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.26 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -68,7 +68,7 @@ COPY ${DESTDIR}/usr/mdec/bootxx_ffs usr/mdec/bootxx_ffs # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${NETBSDSRCDIR}/distrib/common/services etc/services diff --git a/distrib/amd64/ramdisks/common/Makefile.ramdisk b/distrib/amd64/ramdisks/common/Makefile.ramdisk index 7856c2e37cdf..bc440d2135f6 100644 --- a/distrib/amd64/ramdisks/common/Makefile.ramdisk +++ b/distrib/amd64/ramdisks/common/Makefile.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.3 2008/02/01 13:43:12 tsutsui Exp $ +# $NetBSD: Makefile.ramdisk,v 1.4 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,7 +23,7 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/mbr_ext \ ${DESTDIR}/usr/mdec/mbr_bootsel \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini PARSELISTENV+= BOOTMODEL=${BOOTMODEL:Q} diff --git a/distrib/amd64/ramdisks/common/list.ramdisk b/distrib/amd64/ramdisks/common/list.ramdisk index 27390e52c477..d02c591dbc1d 100644 --- a/distrib/amd64/ramdisks/common/list.ramdisk +++ b/distrib/amd64/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.5 2008/02/01 13:43:12 tsutsui Exp $ +# $NetBSD: list.ramdisk,v 1.6 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin libexec @@ -12,7 +12,7 @@ LIBS libhack.o -lbz2 -lutil -ll -lm COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # we need the boot block in /usr/mdec + the MBR copy diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list index 3fce52e0c4e7..029ab24204bc 100644 --- a/distrib/amiga/floppies/inst-common/list +++ b/distrib/amiga/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.13 2007/03/03 06:40:05 apb Exp $ +# $NetBSD: list,v 1.14 2009/01/25 22:08:37 abs Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -65,14 +65,14 @@ SPECIAL /bin/rm dev/MAKEDEV COPY ${DESTDIR}/usr/mdec/* usr/mdec # various files that we need in /etc for the install -COPY ${DESTDIR}/etc/group etc -COPY ${DESTDIR}/etc/master.passwd etc -COPY ${DESTDIR}/etc/passwd etc -COPY ${DESTDIR}/etc/protocols etc -COPY ${DESTDIR}/etc/netconfig etc -COPY ${DESTDIR}/etc/pwd.db etc -COPY ${DESTDIR}/etc/services etc -COPY ${DESTDIR}/etc/spwd.db etc +COPY ${DESTDIR}/etc/group etc +COPY ${DESTDIR}/etc/master.passwd etc +COPY ${DESTDIR}/etc/passwd etc +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc +COPY ${DESTDIR}/etc/netconfig etc +COPY ${DESTDIR}/etc/pwd.db etc +COPY ${NETBSDSRCDIR}/distrib/common/services etc +COPY ${DESTDIR}/etc/spwd.db etc # and the common installation tools COPY ${TOPDIR}/inst-common/dot.commonutils .commonutils diff --git a/distrib/arc/ramdisk/Makefile b/distrib/arc/ramdisk/Makefile index f20be4f76d8a..21481367c7bd 100644 --- a/distrib/arc/ramdisk/Makefile +++ b/distrib/arc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/02/02 04:23:06 tsutsui Exp $ +# $NetBSD: Makefile,v 1.17 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ MAKEDEVTARGETS= minimal IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini SMALLPROG_INET6=1 diff --git a/distrib/arc/ramdisk/list b/distrib/arc/ramdisk/list index 7c56dc5be089..cb6d8f80f7d8 100644 --- a/distrib/arc/ramdisk/list +++ b/distrib/arc/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.13 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.14 2009/01/25 22:08:37 abs Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin @@ -77,7 +77,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/atari/floppies/install/list b/distrib/atari/floppies/install/list index 832c59909f3b..7b4fe886d647 100644 --- a/distrib/atari/floppies/install/list +++ b/distrib/atari/floppies/install/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.9 2009/01/03 18:11:26 tsutsui Exp $ +# $NetBSD: list,v 1.10 2009/01/25 22:08:37 abs Exp $ PROG bin/cat PROG bin/chmod @@ -55,7 +55,7 @@ SPECIAL umount srcdir distrib/utils/x_umount # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # we need the boot block code in /usr/mdec diff --git a/distrib/bebox/floppies/ramdisk/list b/distrib/bebox/floppies/ramdisk/list index 59b3e593b91b..cc9593b4845a 100644 --- a/distrib/bebox/floppies/ramdisk/list +++ b/distrib/bebox/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2007/03/03 06:40:05 apb Exp $ +# $NetBSD: list,v 1.11 2009/01/25 22:08:37 abs Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -58,11 +58,11 @@ SPECIAL cd dev; sh MAKEDEV ramdisk SPECIAL /bin/rm dev/MAKEDEV # 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/protocols etc/protocols -COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig -COPY ${CURDIR}/../../../../etc/services etc/services +COPY ${CURDIR}/../../../../etc/group etc/group +COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/services etc/services SPECIAL pwd_mkdb -p -d ./ etc/master.passwd # and the common installation tools diff --git a/distrib/cats/ramdisk/Makefile b/distrib/cats/ramdisk/Makefile index a00a97580978..a7d11b32a112 100644 --- a/distrib/cats/ramdisk/Makefile +++ b/distrib/cats/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2009/01/21 14:43:14 he Exp $ +# $NetBSD: Makefile,v 1.12 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini diff --git a/distrib/cats/ramdisk/list b/distrib/cats/ramdisk/list index 74a113b35691..9841418cbd5d 100644 --- a/distrib/cats/ramdisk/list +++ b/distrib/cats/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2009/01/21 14:43:14 he Exp $ +# $NetBSD: list,v 1.11 2009/01/25 22:08:37 abs Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin @@ -74,7 +74,7 @@ COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-sc COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/cobalt/ramdisk/Makefile b/distrib/cobalt/ramdisk/Makefile index f39a17e50342..5958f74eb059 100644 --- a/distrib/cobalt/ramdisk/Makefile +++ b/distrib/cobalt/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 07:36:30 tsutsui Exp $ +# $NetBSD: Makefile,v 1.3 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ MAKEDEVTARGETS= minimal IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini \ ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script diff --git a/distrib/cobalt/ramdisk/list b/distrib/cobalt/ramdisk/list index f101ffb1611a..7bce8c3352ac 100644 --- a/distrib/cobalt/ramdisk/list +++ b/distrib/cobalt/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.3 2008/09/13 07:36:30 tsutsui Exp $ +# $NetBSD: list,v 1.4 2009/01/25 22:08:37 abs Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin @@ -79,7 +79,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 diff --git a/distrib/dreamcast/ramdisk/Makefile b/distrib/dreamcast/ramdisk/Makefile index d467556cd136..abc26bc0a59f 100644 --- a/distrib/dreamcast/ramdisk/Makefile +++ b/distrib/dreamcast/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/01/09 10:05:27 tsutsui Exp $ +# $NetBSD: Makefile,v 1.5 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini #SMALLPROG_INET6=1 diff --git a/distrib/dreamcast/ramdisk/list b/distrib/dreamcast/ramdisk/list index 549eab9dce09..185428a9f5a6 100644 --- a/distrib/dreamcast/ramdisk/list +++ b/distrib/dreamcast/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.6 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.7 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -69,7 +69,7 @@ LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/evbarm/instkernel/ramdisk/Makefile b/distrib/evbarm/instkernel/ramdisk/Makefile index e81f39480320..fd0daa7564bd 100644 --- a/distrib/evbarm/instkernel/ramdisk/Makefile +++ b/distrib/evbarm/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/05/10 23:22:29 dogcow Exp $ +# $NetBSD: Makefile,v 1.5 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${DESTDIR}/usr/share/misc/termcap \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/evbarm/instkernel/ramdisk/list b/distrib/evbarm/instkernel/ramdisk/list index 37710353e882..c09426711319 100644 --- a/distrib/evbarm/instkernel/ramdisk/list +++ b/distrib/evbarm/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2008/05/21 18:05:29 rafal Exp $ +# $NetBSD: list,v 1.8 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -73,7 +73,7 @@ COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-sc COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/evbmips/instkernel/ramdisk/Makefile b/distrib/evbmips/instkernel/ramdisk/Makefile index 2ce5a9a7cae5..113f5da6fdf3 100644 --- a/distrib/evbmips/instkernel/ramdisk/Makefile +++ b/distrib/evbmips/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/05/10 23:22:29 dogcow Exp $ +# $NetBSD: Makefile,v 1.3 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,7 +23,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${DESTDIR}/usr/share/misc/termcap \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 pty0 ttyv0 diff --git a/distrib/evbmips/instkernel/ramdisk/list b/distrib/evbmips/instkernel/ramdisk/list index 1fc1f7f06010..e3b8132075ea 100644 --- a/distrib/evbmips/instkernel/ramdisk/list +++ b/distrib/evbmips/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.3 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.4 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -62,7 +62,7 @@ ARGVLN sh -sh COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/evbppc/ramdisk/Makefile b/distrib/evbppc/ramdisk/Makefile index 4469f418d24c..78d9702d0fdc 100644 --- a/distrib/evbppc/ramdisk/Makefile +++ b/distrib/evbppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/05/10 23:22:29 dogcow Exp $ +# $NetBSD: Makefile,v 1.4 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -18,7 +18,7 @@ IMAGEENDIAN= be IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.src \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 pty0 ttyv0 diff --git a/distrib/evbppc/ramdisk/list b/distrib/evbppc/ramdisk/list index 23db8bc73c5e..d485de708fda 100644 --- a/distrib/evbppc/ramdisk/list +++ b/distrib/evbppc/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.6 2009/01/25 17:48:05 abs Exp $ +# $NetBSD: list,v 1.7 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -69,7 +69,7 @@ LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/evbsh3/rom/ramdiskcommon/list b/distrib/evbsh3/rom/ramdiskcommon/list index 5d8afdc066da..e74fe5f212f9 100644 --- a/distrib/evbsh3/rom/ramdiskcommon/list +++ b/distrib/evbsh3/rom/ramdiskcommon/list @@ -1,12 +1,12 @@ -# $NetBSD: list,v 1.5 2007/03/03 06:40:06 apb Exp $ +# $NetBSD: list,v 1.6 2009/01/25 22:08:37 abs Exp $ # various files that we need in /etc for the install COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd #COPY ${CURDIR}/../../../../etc/etc.evbsh3/rc etc/rc COPY ${CURDIR}/../../../../etc/group etc/group -COPY ${CURDIR}/../../../../etc/protocols etc/protocols -COPY ${CURDIR}/../../../../etc/services etc/services -COPY ${CURDIR}/../../../../etc/gettytab etc/gettytab +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/services etc/services +COPY ${CURDIR}/../../../../etc/gettytab etc/gettytab #COPY ${CURDIR}/localtime etc/localtime COPY ${CURDIR}/../../../../etc/hosts etc/hosts COPY ${CURDIR}/../../../../etc/etc.evbsh3/ttys etc/ttys diff --git a/distrib/ews4800mips/floppies/ramdisk/Makefile b/distrib/ews4800mips/floppies/ramdisk/Makefile index 4adfbb037bba..859c81c3589b 100644 --- a/distrib/ews4800mips/floppies/ramdisk/Makefile +++ b/distrib/ews4800mips/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/05/10 23:22:29 dogcow Exp $ +# $NetBSD: Makefile,v 1.5 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -21,7 +21,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/boot \ ${DESTDIR}/usr/mdec/bootxx_ustarfs \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/ews4800mips/floppies/ramdisk/list b/distrib/ews4800mips/floppies/ramdisk/list index 9f45cc0e8ee8..a3a332f0d7e9 100644 --- a/distrib/ews4800mips/floppies/ramdisk/list +++ b/distrib/ews4800mips/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.3 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.4 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -77,7 +77,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile index 10e7ee5e0a26..952d54e197ec 100644 --- a/distrib/hp300/ramdisk/Makefile +++ b/distrib/hp300/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2008/05/26 12:25:34 he Exp $ +# $NetBSD: Makefile,v 1.26 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.mini \ ${DESTDIR}/usr/mdec/installboot ${DESTDIR}/usr/mdec/uboot.lif \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 1e34a91eb08f..62f78bb8f032 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.18 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -61,7 +61,7 @@ COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot 555 COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/hp700/ramdisk/Makefile b/distrib/hp700/ramdisk/Makefile index 3da847cd888b..792e3887d642 100644 --- a/distrib/hp700/ramdisk/Makefile +++ b/distrib/hp700/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/07/17 07:01:30 skrll Exp $ +# $NetBSD: Makefile,v 1.5 2009/01/25 22:08:37 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ MAKEDEVTARGETS= all IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.src \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services SMALLPROG_INET6=1 diff --git a/distrib/hp700/ramdisk/list b/distrib/hp700/ramdisk/list index 95277203f1ae..dfc7d36184a1 100644 --- a/distrib/hp700/ramdisk/list +++ b/distrib/hp700/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2008/05/06 15:09:45 skrll Exp $ +# $NetBSD: list,v 1.8 2009/01/25 22:08:37 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -72,7 +72,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/i386/ramdisks/common/Makefile.ramdisk b/distrib/i386/ramdisks/common/Makefile.ramdisk index 05bc7773f6ba..2abae37fa64b 100644 --- a/distrib/i386/ramdisks/common/Makefile.ramdisk +++ b/distrib/i386/ramdisks/common/Makefile.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.4 2008/02/01 13:43:12 tsutsui Exp $ +# $NetBSD: Makefile.ramdisk,v 1.5 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,7 +23,7 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/mbr_ext \ ${DESTDIR}/usr/mdec/mbr_bootsel \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini PARSELISTENV+= BOOTMODEL=${BOOTMODEL:Q} diff --git a/distrib/i386/ramdisks/common/list.ramdisk b/distrib/i386/ramdisks/common/list.ramdisk index e2611aa39e72..04f61c928658 100644 --- a/distrib/i386/ramdisks/common/list.ramdisk +++ b/distrib/i386/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.8 2008/11/04 14:21:39 joerg Exp $ +# $NetBSD: list.ramdisk,v 1.9 2009/01/25 22:08:38 abs Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -68,7 +68,7 @@ LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # we need the boot block in /usr/mdec + the MBR copy diff --git a/distrib/ibmnws/netboot/ramdisk/Makefile b/distrib/ibmnws/netboot/ramdisk/Makefile index 5576ed888e2d..cfe5d917179e 100644 --- a/distrib/ibmnws/netboot/ramdisk/Makefile +++ b/distrib/ibmnws/netboot/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/05/10 23:22:30 dogcow Exp $ +# $NetBSD: Makefile,v 1.4 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ MAKEDEVTARGETS= std md0 pty0 ttyv0 IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.src \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services SMALLPROG_INET6=1 diff --git a/distrib/ibmnws/netboot/ramdisk/list b/distrib/ibmnws/netboot/ramdisk/list index a8a6122cba09..4938908808e3 100644 --- a/distrib/ibmnws/netboot/ramdisk/list +++ b/distrib/ibmnws/netboot/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.5 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.6 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -64,7 +64,7 @@ LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index 74291cc1cd50..14b080a10d46 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2008/04/14 17:24:56 skrll Exp $ +# $NetBSD: Makefile,v 1.2 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,8 +19,9 @@ IMAGEENDIAN= le IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ - ${NETBSDSRCDIR}/etc/services + ${NETBSDSRCDIR}/etc/netconfig \ + ${NETBSDSRCDIR}/distrib/common/protocols \ + ${NETBSDSRCDIR}/distrib/common/services IMAGETAR_RELEASEDIR= installation/netboot diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index 8fa764ed34b2..a06518f4dff5 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.1 2008/04/14 17:24:56 skrll Exp $ +# $NetBSD: list,v 1.2 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -61,11 +61,11 @@ ARGVLN sh -sh # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 -COPY ${NETBSDSRCDIR}/etc/group etc/group -COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols -COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/services etc/services +COPY ${NETBSDSRCDIR}/etc/group etc/group +COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools COPY ${CURDIR}/termcap.mini usr/share/misc/termcap diff --git a/distrib/mac68k/instkernel/ramdisk/Makefile b/distrib/mac68k/instkernel/ramdisk/Makefile index a72354bc629e..a410be8c9573 100644 --- a/distrib/mac68k/instkernel/ramdisk/Makefile +++ b/distrib/mac68k/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/05/10 23:22:30 dogcow Exp $ +# $NetBSD: Makefile,v 1.29 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${DISTRIBDIR}/mac68k/miniroot/termcap \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services .ifndef NOTESOBJDIR diff --git a/distrib/mac68k/instkernel/ramdisk/list b/distrib/mac68k/instkernel/ramdisk/list index 660432c26b2b..c44d2efa22f5 100644 --- a/distrib/mac68k/instkernel/ramdisk/list +++ b/distrib/mac68k/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.19 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.20 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin gnu/usr.bin/binutils @@ -72,7 +72,7 @@ LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${NETBSDSRCDIR}/distrib/common/services etc/services diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile index 51f5a79b4f60..48c6439e60df 100644 --- a/distrib/macppc/floppies/ramdisk/Makefile +++ b/distrib/macppc/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/05/10 23:22:30 dogcow Exp $ +# $NetBSD: Makefile,v 1.33 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,7 +20,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.src \ ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/usr/mdec/bootxx \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services SMALLPROG_INET6=1 diff --git a/distrib/macppc/floppies/ramdisk/list b/distrib/macppc/floppies/ramdisk/list index f66f07b8134f..360b4ae3d30c 100644 --- a/distrib/macppc/floppies/ramdisk/list +++ b/distrib/macppc/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.29 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.30 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -79,7 +79,7 @@ COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index 98e9831dec56..b0227a9e961b 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2008/09/19 17:23:32 tsutsui Exp $ +# $NetBSD: Makefile,v 1.67 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -15,7 +15,7 @@ IMAGE= miniroot.fs IMAGEDEPENDS= ${CRUNCHBIN} install.sub install.sh upgrade.sh \ ${KERNSRCDIR}/conf/osrelease.sh \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services PARSELISTENV= ARCHDIR=${ARCHDIR:Q} \ DISTRIBREV=${DISTRIBREV:Q} \ diff --git a/distrib/miniroot/list b/distrib/miniroot/list index a6ee381d5313..aa45d5b03e91 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.25 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.26 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -64,7 +64,7 @@ LIBS -lrmt -ledit -lutil -lcurses -ltermcap -lbz2 -lcrypt -lintl -ll -lm -lkvm - COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the installation scripts diff --git a/distrib/mipsco/ramdisk/Makefile b/distrib/mipsco/ramdisk/Makefile index 59cdf4860c2d..5183f045ee74 100644 --- a/distrib/mipsco/ramdisk/Makefile +++ b/distrib/mipsco/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/05/10 23:22:31 dogcow Exp $ +# $NetBSD: Makefile,v 1.16 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -22,7 +22,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/installboot \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx_ffs \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services IMAGETAR_RELEASEDIR= installation/netboot diff --git a/distrib/mipsco/ramdisk/list b/distrib/mipsco/ramdisk/list index f68473d41e50..895f353d7e26 100644 --- a/distrib/mipsco/ramdisk/list +++ b/distrib/mipsco/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.8 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -69,7 +69,7 @@ COPY ${DESTDIR}/usr/mdec/bootxx_ffs usr/mdec/bootxx_ffs COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile index a950939afe5f..a92af8dc35ab 100644 --- a/distrib/mvme68k/ramdisk/Makefile +++ b/distrib/mvme68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2008/05/14 08:08:31 he Exp $ +# $NetBSD: Makefile,v 1.27 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/bootsd ${DESTDIR}/usr/mdec/bootst \ ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/usr/mdec/stboot \ ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index 8794eda88edb..94890f9a8537 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.16 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -50,7 +50,7 @@ LIBS libhack.o -lutil -lz -ll -lrmt -lprop COPY ${CURDIR}/rd.fstab etc/fstab COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services COPY ${DESTDIR}/usr/mdec/bootsd bootsd COPY ${DESTDIR}/usr/mdec/bootst bootst diff --git a/distrib/newsmips/floppies/ramdisk/Makefile b/distrib/newsmips/floppies/ramdisk/Makefile index 0d1c23861578..9861383b30f7 100644 --- a/distrib/newsmips/floppies/ramdisk/Makefile +++ b/distrib/newsmips/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/05/10 23:22:31 dogcow Exp $ +# $NetBSD: Makefile,v 1.27 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,7 +20,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.src \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/newsmips/floppies/ramdisk/list b/distrib/newsmips/floppies/ramdisk/list index c3c6b7cc6c5e..700ccd671473 100644 --- a/distrib/newsmips/floppies/ramdisk/list +++ b/distrib/newsmips/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.19 2008/05/06 15:32:06 dyoung Exp $ +# $NetBSD: list,v 1.20 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -74,7 +74,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/ofppc/ramdisks/common/Makefile.ramdisk b/distrib/ofppc/ramdisks/common/Makefile.ramdisk index 53659af8413c..6f50c77970dc 100644 --- a/distrib/ofppc/ramdisks/common/Makefile.ramdisk +++ b/distrib/ofppc/ramdisks/common/Makefile.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.1 2008/01/02 11:39:02 mrg Exp $ +# $NetBSD: Makefile.ramdisk,v 1.2 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ dot.profile termcap.mini \ ${DESTDIR}/usr/mdec/ofwboot \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services PARSELISTENV+= BOOTMODEL=${BOOTMODEL:Q} diff --git a/distrib/ofppc/ramdisks/common/list.ramdisk b/distrib/ofppc/ramdisks/common/list.ramdisk index e20b384a6831..7483ccd88993 100644 --- a/distrib/ofppc/ramdisks/common/list.ramdisk +++ b/distrib/ofppc/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.2 2008/01/23 23:15:37 garbled Exp $ +# $NetBSD: list.ramdisk,v 1.3 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin libexec @@ -12,7 +12,7 @@ LIBS libhack.o -lbz2 -lutil -ll -lm COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # we need the boot block in /usr/mdec + the MBR copy diff --git a/distrib/sandpoint/ramdisk/Makefile b/distrib/sandpoint/ramdisk/Makefile index 5affbf0358ab..f84988e99fb3 100644 --- a/distrib/sandpoint/ramdisk/Makefile +++ b/distrib/sandpoint/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/10/25 14:48:00 nisimura Exp $ +# $NetBSD: Makefile,v 1.3 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ MAKEDEVTARGETS= std md0 wd0 pty0 IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile termcap.src \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/sandpoint/ramdisk/list b/distrib/sandpoint/ramdisk/list index b97dd55815b9..09e92e562de8 100644 --- a/distrib/sandpoint/ramdisk/list +++ b/distrib/sandpoint/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.2 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.3 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -69,7 +69,7 @@ LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/sgimips/ramdisk/Makefile b/distrib/sgimips/ramdisk/Makefile index cd9ad531bde5..20d1637fb385 100644 --- a/distrib/sgimips/ramdisk/Makefile +++ b/distrib/sgimips/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/05/10 23:22:32 dogcow Exp $ +# $NetBSD: Makefile,v 1.11 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -22,7 +22,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/aoutboot ${DESTDIR}/usr/mdec/ip2xboot \ ${DESTDIR}/usr/mdec/ip3xboot \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services IMAGETAR_RELEASEDIR= installation/netboot diff --git a/distrib/sgimips/ramdisk/list b/distrib/sgimips/ramdisk/list index 630e1727de1f..619d32478b2f 100644 --- a/distrib/sgimips/ramdisk/list +++ b/distrib/sgimips/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.9 2009/01/25 22:08:38 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand @@ -69,7 +69,7 @@ COPY ${DESTDIR}/usr/mdec/ip3xboot usr/mdec/ip3xboot COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${NETBSDSRCDIR}/distrib/common/services etc/services diff --git a/distrib/shark/instkernel/ramdisk/Makefile b/distrib/shark/instkernel/ramdisk/Makefile index 5ef5e8c4df70..c788bd7cd73b 100644 --- a/distrib/shark/instkernel/ramdisk/Makefile +++ b/distrib/shark/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/07/30 14:03:17 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2009/01/25 22:08:38 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${DESTDIR}/usr/share/misc/termcap \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script diff --git a/distrib/shark/instkernel/ramdisk/list b/distrib/shark/instkernel/ramdisk/list index 8037bddd14ec..a4cbcab99037 100644 --- a/distrib/shark/instkernel/ramdisk/list +++ b/distrib/shark/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.11 2009/01/25 22:08:39 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -68,7 +68,7 @@ LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 diff --git a/distrib/sparc64/instfs/Makefile.instfs b/distrib/sparc64/instfs/Makefile.instfs index f73994f6cedb..5a5721515a12 100644 --- a/distrib/sparc64/instfs/Makefile.instfs +++ b/distrib/sparc64/instfs/Makefile.instfs @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.instfs,v 1.6 2007/05/10 23:22:32 dogcow Exp $ +# $NetBSD: Makefile.instfs,v 1.7 2009/01/25 22:08:39 abs Exp $ INSTFSDIR= ${.CURDIR}/../instfs @@ -17,5 +17,5 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${INSTFSDIR}/disktab.preinstall ${INSTFSDIR}/dot.profile \ ${INSTFSDIR}/termcap.mini \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services diff --git a/distrib/sparc64/instfs/list b/distrib/sparc64/instfs/list index 38cf2615d8a1..3486e0bed125 100644 --- a/distrib/sparc64/instfs/list +++ b/distrib/sparc64/instfs/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.9 2009/01/25 22:08:39 abs Exp $ SRCDIRS bin sbin libexec usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -83,7 +83,7 @@ LIBS -ledit -lutil -lcurses -ltermcap -lrmt -lbz2 -lcrypt -ll -lm -lpcap -lz -lp COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 diff --git a/distrib/sun2/miniroot/Makefile b/distrib/sun2/miniroot/Makefile index 9a46154b6d56..cfe931895e37 100644 --- a/distrib/sun2/miniroot/Makefile +++ b/distrib/sun2/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2008/10/25 22:27:34 apb Exp $ +# $NetBSD: Makefile,v 1.28 2009/01/25 22:08:39 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -28,8 +28,9 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DESTDIR}/dev/MAKEDEV ${DESTDIR}/dev/MAKEDEV.local \ ${DESTDIR}/etc/disktab ${DESTDIR}/etc/group \ ${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \ - ${DESTDIR}/etc/passwd ${DESTDIR}/etc/protocols \ - ${DESTDIR}/etc/pwd.db ${DESTDIR}/etc/services \ + ${DESTDIR}/etc/passwd \ + ${NETBSDSRCDIR}/distrib/common/protocols \ + ${DESTDIR}/etc/pwd.db ${NETBSDSRCDIR}/distrib/common/services \ ${DESTDIR}/etc/spwd.db \ ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/usr/mdec/bootyy \ ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/usr/mdec/tapeboot \ diff --git a/distrib/sun2/miniroot/list b/distrib/sun2/miniroot/list index 246db4e85acb..308ae9ce9746 100644 --- a/distrib/sun2/miniroot/list +++ b/distrib/sun2/miniroot/list @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.8 2008/10/30 12:39:16 tsutsui Exp $ +# $NetBSD: list,v 1.9 2009/01/25 22:08:39 abs Exp $ # # The PROM provides a default kernel name of "vmunix" @@ -20,13 +20,13 @@ COPY ${DESTDIR}/usr/mdec/ufsboot usr/mdec/ufsboot LINK usr/mdec/ufsboot ufsboot # various files that we need in /etc for the install -COPY ${DESTDIR}/etc/group etc/group -COPY ${DESTDIR}/etc/master.passwd etc/master.passwd -COPY ${DESTDIR}/etc/netconfig etc/netconfig -COPY ${DESTDIR}/etc/passwd etc/passwd -COPY ${DESTDIR}/etc/protocols etc/protocols -COPY ${DESTDIR}/etc/pwd.db etc/pwd.db -COPY ${DESTDIR}/etc/spwd.db etc/spwd.db +COPY ${DESTDIR}/etc/group etc/group +COPY ${DESTDIR}/etc/master.passwd etc/master.passwd +COPY ${DESTDIR}/etc/netconfig etc/netconfig +COPY ${DESTDIR}/etc/passwd etc/passwd +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${DESTDIR}/etc/pwd.db etc/pwd.db +COPY ${DESTDIR}/etc/spwd.db etc/spwd.db COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # some /etc files get special handling (for MFS /tmp yuck) diff --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile index 590acdd1b535..d8e79c0109df 100644 --- a/distrib/sun3/miniroot/Makefile +++ b/distrib/sun3/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2008/10/25 22:27:34 apb Exp $ +# $NetBSD: Makefile,v 1.39 2009/01/25 22:08:39 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -29,8 +29,9 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DESTDIR}/dev/MAKEDEV ${DESTDIR}/dev/MAKEDEV.local \ ${DESTDIR}/etc/disktab ${DESTDIR}/etc/group \ ${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \ - ${DESTDIR}/etc/passwd ${DESTDIR}/etc/protocols \ - ${DESTDIR}/etc/pwd.db ${DESTDIR}/etc/services \ + ${DESTDIR}/etc/passwd \ + ${NETBSDSRCDIR}/distrib/common/protocols \ + ${DESTDIR}/etc/pwd.db ${NETBSDSRCDIR}/distrib/common/services \ ${DESTDIR}/etc/spwd.db \ ${DESTDIR}/usr/mdec/bootxx \ ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/usr/mdec/tapeboot \ diff --git a/distrib/sun3/miniroot/list b/distrib/sun3/miniroot/list index 0700c2dfd153..e6fdf309d458 100644 --- a/distrib/sun3/miniroot/list +++ b/distrib/sun3/miniroot/list @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.17 2008/10/30 12:39:16 tsutsui Exp $ +# $NetBSD: list,v 1.18 2009/01/25 22:08:39 abs Exp $ # COPY ${KERNEL3} netbsd.sun3 @@ -19,13 +19,13 @@ COPY ${DESTDIR}/usr/mdec/ufsboot usr/mdec/ufsboot LINK usr/mdec/ufsboot ufsboot # various files that we need in /etc for the install -COPY ${DESTDIR}/etc/group etc/group -COPY ${DESTDIR}/etc/master.passwd etc/master.passwd -COPY ${DESTDIR}/etc/netconfig etc/netconfig -COPY ${DESTDIR}/etc/passwd etc/passwd -COPY ${DESTDIR}/etc/protocols etc/protocols -COPY ${DESTDIR}/etc/pwd.db etc/pwd.db -COPY ${DESTDIR}/etc/spwd.db etc/spwd.db +COPY ${DESTDIR}/etc/group etc/group +COPY ${DESTDIR}/etc/master.passwd etc/master.passwd +COPY ${DESTDIR}/etc/netconfig etc/netconfig +COPY ${DESTDIR}/etc/passwd etc/passwd +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${DESTDIR}/etc/pwd.db etc/pwd.db +COPY ${DESTDIR}/etc/spwd.db etc/spwd.db COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # some /etc files get special handling (for MFS /tmp yuck) diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list index 92eb8a1737a8..eacb8e0fcbd7 100644 --- a/distrib/vax/inst-common/list +++ b/distrib/vax/inst-common/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2007/03/03 06:40:10 apb Exp $ +# $NetBSD: list,v 1.9 2009/01/25 22:08:39 abs Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -53,14 +53,14 @@ COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV all # various files that we need in /etc for the install -COPY ${DESTDIR}/etc/group etc -COPY ${DESTDIR}/etc/master.passwd etc -COPY ${DESTDIR}/etc/passwd etc -COPY ${DESTDIR}/etc/protocols etc -COPY ${DESTDIR}/etc/netconfig etc -COPY ${DESTDIR}/etc/pwd.db etc -COPY ${DESTDIR}/etc/services etc -COPY ${DESTDIR}/etc/spwd.db etc +COPY ${DESTDIR}/etc/group etc +COPY ${DESTDIR}/etc/master.passwd etc +COPY ${DESTDIR}/etc/passwd etc +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc +COPY ${DESTDIR}/etc/netconfig etc +COPY ${DESTDIR}/etc/pwd.db etc +COPY ${NETBSDSRCDIR}/distrib/common/services etc +COPY ${DESTDIR}/etc/spwd.db etc # and the common installation tools COPY ${TOPDIR}/inst-common/termcap.vt usr/share/misc/termcap diff --git a/distrib/vax/ramdisk/Makefile b/distrib/vax/ramdisk/Makefile index e93def02fe26..b0a308333b34 100644 --- a/distrib/vax/ramdisk/Makefile +++ b/distrib/vax/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/05/10 23:22:32 dogcow Exp $ +# $NetBSD: Makefile,v 1.21 2009/01/25 22:08:39 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,7 +20,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.profile termcap.vt100 \ ${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services # Use stubs to eliminate some large stuff from libc diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list index 162a7543933c..2d8ce7aefeab 100644 --- a/distrib/vax/ramdisk/list +++ b/distrib/vax/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.18 2009/01/25 22:08:39 abs Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -72,7 +72,7 @@ LINK usr/mdec/xxboot usr/mdec/sdboot COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools diff --git a/distrib/x68k/floppies/ramdisk/Makefile b/distrib/x68k/floppies/ramdisk/Makefile index d9798b53bb2d..af590dd14cb6 100644 --- a/distrib/x68k/floppies/ramdisk/Makefile +++ b/distrib/x68k/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2009/01/17 03:53:01 isaki Exp $ +# $NetBSD: Makefile,v 1.31 2009/01/25 22:08:39 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,7 +23,7 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/mboot \ ${DESTDIR}/usr/mdec/sdboot_ufs \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols SMALLPROG_INET6=1 .if ${USE_INET6} != "no" diff --git a/distrib/x68k/floppies/ramdisk/list b/distrib/x68k/floppies/ramdisk/list index bf6acda6e8a1..5bcc0cb00726 100644 --- a/distrib/x68k/floppies/ramdisk/list +++ b/distrib/x68k/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.20 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.21 2009/01/25 22:08:39 abs Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/x68k/stand @@ -69,7 +69,7 @@ LIBS libhack.o -lz -lutil -lcurses -ltermcap -lcrypt -ll -lm -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/group etc/group -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${CURDIR}/services etc/services diff --git a/distrib/zaurus/ramdisk/Makefile b/distrib/zaurus/ramdisk/Makefile index 83fe8e697986..f084324fba66 100644 --- a/distrib/zaurus/ramdisk/Makefile +++ b/distrib/zaurus/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/04/10 15:45:29 nonaka Exp $ +# $NetBSD: Makefile,v 1.3 2009/01/25 22:08:39 abs Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ - ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ + ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/distrib/common/protocols \ ${NETBSDSRCDIR}/distrib/common/services \ ${NETBSDSRCDIR}/distrib/common/termcap.mini diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list index f64f3ab4b6c2..bb533ab0afe7 100644 --- a/distrib/zaurus/ramdisk/list +++ b/distrib/zaurus/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.3 2008/05/06 15:32:07 dyoung Exp $ +# $NetBSD: list,v 1.4 2009/01/25 22:08:39 abs Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin @@ -75,7 +75,7 @@ COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-sc COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/etc/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools