From 3be06e9652f36a6e31b0462695ea140cade6a6d7 Mon Sep 17 00:00:00 2001 From: lukem Date: Tue, 18 Jan 2005 12:38:45 +0000 Subject: [PATCH] Only use ping6 and rtsol if ${USE_INET6} != "no". Part of PR 28994. --- distrib/amd64/floppies/ramdisk/Makefile | 6 +++++- distrib/amd64/floppies/ramdisk/list | 5 +---- distrib/amd64/floppies/ramdisk/list.inet6 | 6 ++++++ distrib/cats/ramdisk/Makefile | 6 +++++- distrib/cats/ramdisk/list | 5 +---- distrib/cats/ramdisk/list.inet6 | 6 ++++++ distrib/i386/floppies/ramdisk-big/Makefile | 6 +++++- distrib/i386/floppies/ramdisk-big/list | 5 +---- distrib/i386/floppies/ramdisk-big/list.inet6 | 6 ++++++ distrib/ibmnws/netboot/ramdisk/Makefile | 6 +++++- distrib/ibmnws/netboot/ramdisk/list | 5 +---- distrib/ibmnws/netboot/ramdisk/list.inet6 | 6 ++++++ distrib/macppc/floppies/ramdisk/Makefile | 6 +++++- distrib/macppc/floppies/ramdisk/list | 5 +---- distrib/macppc/floppies/ramdisk/list.inet6 | 6 ++++++ distrib/x68k/floppies/ramdisk/Makefile | 6 +++++- distrib/x68k/floppies/ramdisk/list | 5 +---- distrib/x68k/floppies/ramdisk/list.inet6 | 6 ++++++ 18 files changed, 72 insertions(+), 30 deletions(-) create mode 100644 distrib/amd64/floppies/ramdisk/list.inet6 create mode 100644 distrib/cats/ramdisk/list.inet6 create mode 100644 distrib/i386/floppies/ramdisk-big/list.inet6 create mode 100644 distrib/ibmnws/netboot/ramdisk/list.inet6 create mode 100644 distrib/macppc/floppies/ramdisk/list.inet6 create mode 100644 distrib/x68k/floppies/ramdisk/list.inet6 diff --git a/distrib/amd64/floppies/ramdisk/Makefile b/distrib/amd64/floppies/ramdisk/Makefile index 15332f974a62..bee2737e0dab 100644 --- a/distrib/amd64/floppies/ramdisk/Makefile +++ b/distrib/amd64/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/11/10 00:43:20 fvdl Exp $ +# $NetBSD: Makefile,v 1.6 2005/01/18 12:38:45 lukem Exp $ IMAGE= ramdisk.fs IMAGESIZE= 2304k @@ -7,4 +7,8 @@ IMAGEDEPENDS= disktab.preinstall \ USE_SYSINST= yes SMALLPROG_INET6=1 +.if ${USE_INET6} != "no" +LISTS+= ${.CURDIR}/list.inet6 +.endif + .include "${.CURDIR}/../common/Makefile.ramdisk" diff --git a/distrib/amd64/floppies/ramdisk/list b/distrib/amd64/floppies/ramdisk/list index 75ef8ed95000..feb889b9f4c9 100644 --- a/distrib/amd64/floppies/ramdisk/list +++ b/distrib/amd64/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.6 2004/04/18 20:04:26 dsl Exp $ +# $NetBSD: list,v 1.7 2005/01/18 12:38:45 lukem Exp $ # SRCDIRS usr.bin/less @@ -41,11 +41,9 @@ PROG sbin/mount_nfs PROG sbin/mount_ntfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping -PROG sbin/ping6 PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore PROG sbin/route -PROG sbin/rtsol PROG sbin/shutdown PROG sbin/swapctl PROG sbin/umount @@ -64,7 +62,6 @@ PROG usr/sbin/wiconfig SPECIAL dhclient srcdir distrib/utils/x_dhclient 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 LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz diff --git a/distrib/amd64/floppies/ramdisk/list.inet6 b/distrib/amd64/floppies/ramdisk/list.inet6 new file mode 100644 index 000000000000..bcead9bd685c --- /dev/null +++ b/distrib/amd64/floppies/ramdisk/list.inet6 @@ -0,0 +1,6 @@ +# $NetBSD: list.inet6,v 1.1 2005/01/18 12:38:45 lukem Exp $ + +PROG ping6 +PROG rtsol + +SPECIAL ping6 srcdir distrib/utils/x_ping6 diff --git a/distrib/cats/ramdisk/Makefile b/distrib/cats/ramdisk/Makefile index 637cf20d8b30..f658be0d429c 100644 --- a/distrib/cats/ramdisk/Makefile +++ b/distrib/cats/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/03/23 13:43:41 chris Exp $ +# $NetBSD: Makefile,v 1.7 2005/01/18 12:38:45 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,6 +20,10 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \ ${NETBSDSRCDIR}/etc/services +.if ${USE_INET6} != "no" +LISTS+= ${.CURDIR}/list.inet6 +.endif + # Use stubs to eliminate some large stuff from libc HACKSRC= ${DISTRIBDIR}/utils/libhack .include "${HACKSRC}/Makefile.inc" diff --git a/distrib/cats/ramdisk/list b/distrib/cats/ramdisk/list index 69b67e595f69..614a40d52112 100644 --- a/distrib/cats/ramdisk/list +++ b/distrib/cats/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.5 2003/12/25 11:14:36 martin Exp $ +# $NetBSD: list,v 1.6 2005/01/18 12:38:45 lukem 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 @@ -38,11 +38,9 @@ PROG sbin/mount_msdos PROG sbin/mount_nfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping -PROG sbin/ping6 PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore PROG sbin/route -PROG sbin/rtsol PROG sbin/scsictl PROG sbin/shutdown PROG sbin/slattach @@ -64,7 +62,6 @@ ARGVLN sh -sh SPECIAL dhclient srcdir distrib/utils/x_dhclient 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 LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz diff --git a/distrib/cats/ramdisk/list.inet6 b/distrib/cats/ramdisk/list.inet6 new file mode 100644 index 000000000000..bcead9bd685c --- /dev/null +++ b/distrib/cats/ramdisk/list.inet6 @@ -0,0 +1,6 @@ +# $NetBSD: list.inet6,v 1.1 2005/01/18 12:38:45 lukem Exp $ + +PROG ping6 +PROG rtsol + +SPECIAL ping6 srcdir distrib/utils/x_ping6 diff --git a/distrib/i386/floppies/ramdisk-big/Makefile b/distrib/i386/floppies/ramdisk-big/Makefile index 1d331ad2e4c3..90b165e15ab7 100644 --- a/distrib/i386/floppies/ramdisk-big/Makefile +++ b/distrib/i386/floppies/ramdisk-big/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2003/12/07 20:08:57 dsl Exp $ +# $NetBSD: Makefile,v 1.24 2005/01/18 12:38:45 lukem Exp $ BOOTMODEL= big IMAGE= ramdisk-${BOOTMODEL}.fs @@ -10,4 +10,8 @@ SMALLPROG_INET6=1 .include "${.CURDIR}/../common/Makefile.ramdisk" +.if ${USE_INET6} != "no" +LISTS+= ${.CURDIR}/list.inet6 +.endif + MAKEFS_FLAGS+= -f 20 diff --git a/distrib/i386/floppies/ramdisk-big/list b/distrib/i386/floppies/ramdisk-big/list index edc049903912..c170480e26c2 100644 --- a/distrib/i386/floppies/ramdisk-big/list +++ b/distrib/i386/floppies/ramdisk-big/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.21 2004/04/29 20:45:07 gendalia Exp $ +# $NetBSD: list,v 1.22 2005/01/18 12:38:45 lukem Exp $ # SRCDIRS usr.bin/less @@ -42,12 +42,10 @@ PROG sbin/mount_nfs PROG sbin/mount_ntfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping -PROG sbin/ping6 PROG sbin/raidctl PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore PROG sbin/route -PROG sbin/rtsol PROG sbin/scsictl PROG sbin/shutdown PROG sbin/slattach @@ -71,7 +69,6 @@ PROG usr/sbin/wiconfig SPECIAL dhclient srcdir distrib/utils/x_dhclient 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 LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz diff --git a/distrib/i386/floppies/ramdisk-big/list.inet6 b/distrib/i386/floppies/ramdisk-big/list.inet6 new file mode 100644 index 000000000000..bcead9bd685c --- /dev/null +++ b/distrib/i386/floppies/ramdisk-big/list.inet6 @@ -0,0 +1,6 @@ +# $NetBSD: list.inet6,v 1.1 2005/01/18 12:38:45 lukem Exp $ + +PROG ping6 +PROG rtsol + +SPECIAL ping6 srcdir distrib/utils/x_ping6 diff --git a/distrib/ibmnws/netboot/ramdisk/Makefile b/distrib/ibmnws/netboot/ramdisk/Makefile index 04420130e717..85f53a1a8229 100644 --- a/distrib/ibmnws/netboot/ramdisk/Makefile +++ b/distrib/ibmnws/netboot/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2003/10/19 03:37:16 matt Exp $ +# $NetBSD: Makefile,v 1.2 2005/01/18 12:38:45 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,6 +23,10 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/services SMALLPROG_INET6=1 +.if ${USE_INET6} != "no" +LISTS+= ${.CURDIR}/list.inet6 +.endif + # Use stubs to eliminate some large stuff from libc HACKSRC= ${DISTRIBDIR}/utils/libhack .include "${HACKSRC}/Makefile.inc" diff --git a/distrib/ibmnws/netboot/ramdisk/list b/distrib/ibmnws/netboot/ramdisk/list index 60d02d0c59ac..8c7a0352f481 100644 --- a/distrib/ibmnws/netboot/ramdisk/list +++ b/distrib/ibmnws/netboot/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.1 2003/10/19 03:37:16 matt Exp $ +# $NetBSD: list,v 1.2 2005/01/18 12:38:45 lukem Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -31,11 +31,9 @@ PROG sbin/mount_ffs PROG sbin/mount_nfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping -PROG sbin/ping6 PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore PROG sbin/route -PROG sbin/rtsol PROG sbin/shutdown PROG sbin/swapctl PROG sbin/umount @@ -58,7 +56,6 @@ 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 ping6 srcdir distrib/utils/x_ping6 SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount diff --git a/distrib/ibmnws/netboot/ramdisk/list.inet6 b/distrib/ibmnws/netboot/ramdisk/list.inet6 new file mode 100644 index 000000000000..bcead9bd685c --- /dev/null +++ b/distrib/ibmnws/netboot/ramdisk/list.inet6 @@ -0,0 +1,6 @@ +# $NetBSD: list.inet6,v 1.1 2005/01/18 12:38:45 lukem Exp $ + +PROG ping6 +PROG rtsol + +SPECIAL ping6 srcdir distrib/utils/x_ping6 diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile index 3968436d3e70..7fd106000f91 100644 --- a/distrib/macppc/floppies/ramdisk/Makefile +++ b/distrib/macppc/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/10/17 02:05:36 lukem Exp $ +# $NetBSD: Makefile,v 1.31 2005/01/18 12:38:45 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -24,6 +24,10 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/services SMALLPROG_INET6=1 +.if ${USE_INET6} != "no" +LISTS+= ${.CURDIR}/list.inet6 +.endif + # Use stubs to eliminate some large stuff from libc HACKSRC= ${DISTRIBDIR}/utils/libhack .include "${HACKSRC}/Makefile.inc" diff --git a/distrib/macppc/floppies/ramdisk/list b/distrib/macppc/floppies/ramdisk/list index 34c02418900d..830376b2bae7 100644 --- a/distrib/macppc/floppies/ramdisk/list +++ b/distrib/macppc/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.24 2003/02/18 15:38:53 soren Exp $ +# $NetBSD: list,v 1.25 2005/01/18 12:38:45 lukem Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -39,11 +39,9 @@ PROG sbin/newfs sbin/mount_mfs PROG sbin/newfs_msdos PROG sbin/pdisk PROG sbin/ping -PROG sbin/ping6 PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore PROG sbin/route -PROG sbin/rtsol PROG sbin/shutdown PROG sbin/swapctl PROG sbin/umount @@ -68,7 +66,6 @@ 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 ping6 srcdir distrib/utils/x_ping6 SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount diff --git a/distrib/macppc/floppies/ramdisk/list.inet6 b/distrib/macppc/floppies/ramdisk/list.inet6 new file mode 100644 index 000000000000..bcead9bd685c --- /dev/null +++ b/distrib/macppc/floppies/ramdisk/list.inet6 @@ -0,0 +1,6 @@ +# $NetBSD: list.inet6,v 1.1 2005/01/18 12:38:45 lukem Exp $ + +PROG ping6 +PROG rtsol + +SPECIAL ping6 srcdir distrib/utils/x_ping6 diff --git a/distrib/x68k/floppies/ramdisk/Makefile b/distrib/x68k/floppies/ramdisk/Makefile index 9d81bc5b6703..aaaf647654fe 100644 --- a/distrib/x68k/floppies/ramdisk/Makefile +++ b/distrib/x68k/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/04/18 20:04:26 dsl Exp $ +# $NetBSD: Makefile,v 1.26 2005/01/18 12:38:45 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -25,6 +25,10 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols SMALLPROG_INET6=1 +.if ${USE_INET6} != "no" +LISTS+= ${.CURDIR}/list.inet6 +.endif + # Use stubs to eliminate some large stuff from libc HACKSRC= ${DISTRIBDIR}/utils/libhack .include "${HACKSRC}/Makefile.inc" diff --git a/distrib/x68k/floppies/ramdisk/list b/distrib/x68k/floppies/ramdisk/list index f05f792d66a1..6d3f206d245e 100644 --- a/distrib/x68k/floppies/ramdisk/list +++ b/distrib/x68k/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2003/09/15 03:14:54 isaki Exp $ +# $NetBSD: list,v 1.18 2005/01/18 12:38:45 lukem Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/x68k/stand @@ -37,10 +37,8 @@ PROG sbin/mount_msdos PROG sbin/mount_nfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping -PROG sbin/ping6 PROG sbin/reboot sbin/halt PROG sbin/route -PROG sbin/rtsol PROG sbin/shutdown #PROG sbin/slattach PROG sbin/swapctl @@ -63,7 +61,6 @@ 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 ping6 srcdir distrib/utils/x_ping6 SPECIAL route srcdir distrib/utils/x_route SPECIAL installboot srcdir sys/arch/x68k/stand/installboot diff --git a/distrib/x68k/floppies/ramdisk/list.inet6 b/distrib/x68k/floppies/ramdisk/list.inet6 new file mode 100644 index 000000000000..ecadf069350a --- /dev/null +++ b/distrib/x68k/floppies/ramdisk/list.inet6 @@ -0,0 +1,6 @@ +# $NetBSD: list.inet6,v 1.1 2005/01/18 12:38:46 lukem Exp $ + +PROG ping6 +PROG rtsol + +SPECIAL ping6 srcdir distrib/utils/x_ping6