Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib Only use ping6 and rtsol if ${USE_INET6} != "no".
details: https://anonhg.NetBSD.org/src/rev/ccb8340b2e62
branches: trunk
changeset: 573052:ccb8340b2e62
user: lukem <lukem%NetBSD.org@localhost>
date: Tue Jan 18 12:38:45 2005 +0000
description:
Only use ping6 and rtsol if ${USE_INET6} != "no".
Part of PR 28994.
diffstat:
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(-)
diffs (truncated from 350 to 300 lines):
diff -r a7aa0d8eef75 -r ccb8340b2e62 distrib/amd64/floppies/ramdisk/Makefile
--- a/distrib/amd64/floppies/ramdisk/Makefile Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/amd64/floppies/ramdisk/Makefile Tue Jan 18 12:38:45 2005 +0000
@@ -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 @@
USE_SYSINST= yes
SMALLPROG_INET6=1
+.if ${USE_INET6} != "no"
+LISTS+= ${.CURDIR}/list.inet6
+.endif
+
.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r a7aa0d8eef75 -r ccb8340b2e62 distrib/amd64/floppies/ramdisk/list
--- a/distrib/amd64/floppies/ramdisk/list Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/amd64/floppies/ramdisk/list Tue Jan 18 12:38:45 2005 +0000
@@ -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_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 @@
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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/amd64/floppies/ramdisk/list.inet6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/amd64/floppies/ramdisk/list.inet6 Tue Jan 18 12:38:45 2005 +0000
@@ -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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/cats/ramdisk/Makefile
--- a/distrib/cats/ramdisk/Makefile Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/cats/ramdisk/Makefile Tue Jan 18 12:38:45 2005 +0000
@@ -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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,6 +20,10 @@
${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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/cats/ramdisk/list
--- a/distrib/cats/ramdisk/list Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/cats/ramdisk/list Tue Jan 18 12:38:45 2005 +0000
@@ -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_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 @@
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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/cats/ramdisk/list.inet6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/cats/ramdisk/list.inet6 Tue Jan 18 12:38:45 2005 +0000
@@ -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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/i386/floppies/ramdisk-big/Makefile
--- a/distrib/i386/floppies/ramdisk-big/Makefile Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/i386/floppies/ramdisk-big/Makefile Tue Jan 18 12:38:45 2005 +0000
@@ -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 @@
.include "${.CURDIR}/../common/Makefile.ramdisk"
+.if ${USE_INET6} != "no"
+LISTS+= ${.CURDIR}/list.inet6
+.endif
+
MAKEFS_FLAGS+= -f 20
diff -r a7aa0d8eef75 -r ccb8340b2e62 distrib/i386/floppies/ramdisk-big/list
--- a/distrib/i386/floppies/ramdisk-big/list Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/i386/floppies/ramdisk-big/list Tue Jan 18 12:38:45 2005 +0000
@@ -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_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 @@
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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/i386/floppies/ramdisk-big/list.inet6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/i386/floppies/ramdisk-big/list.inet6 Tue Jan 18 12:38:45 2005 +0000
@@ -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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/ibmnws/netboot/ramdisk/Makefile
--- a/distrib/ibmnws/netboot/ramdisk/Makefile Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/ibmnws/netboot/ramdisk/Makefile Tue Jan 18 12:38:45 2005 +0000
@@ -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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -23,6 +23,10 @@
${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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/ibmnws/netboot/ramdisk/list
--- a/distrib/ibmnws/netboot/ramdisk/list Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/ibmnws/netboot/ramdisk/list Tue Jan 18 12:38:45 2005 +0000
@@ -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_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 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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/ibmnws/netboot/ramdisk/list.inet6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/ibmnws/netboot/ramdisk/list.inet6 Tue Jan 18 12:38:45 2005 +0000
@@ -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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/macppc/floppies/ramdisk/Makefile
--- a/distrib/macppc/floppies/ramdisk/Makefile Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/macppc/floppies/ramdisk/Makefile Tue Jan 18 12:38:45 2005 +0000
@@ -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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -24,6 +24,10 @@
${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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/macppc/floppies/ramdisk/list
--- a/distrib/macppc/floppies/ramdisk/list Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/macppc/floppies/ramdisk/list Tue Jan 18 12:38:45 2005 +0000
@@ -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_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 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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/macppc/floppies/ramdisk/list.inet6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/macppc/floppies/ramdisk/list.inet6 Tue Jan 18 12:38:45 2005 +0000
@@ -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 -r a7aa0d8eef75 -r ccb8340b2e62 distrib/x68k/floppies/ramdisk/Makefile
--- a/distrib/x68k/floppies/ramdisk/Makefile Tue Jan 18 12:38:41 2005 +0000
+++ b/distrib/x68k/floppies/ramdisk/Makefile Tue Jan 18 12:38:45 2005 +0000
@@ -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 <bsd.own.mk>
Home |
Main Index |
Thread Index |
Old Index