diff --git a/distrib/cobalt/ramdisk/Makefile b/distrib/cobalt/ramdisk/Makefile index 9a213d404002..bb13a967b5f2 100644 --- a/distrib/cobalt/ramdisk/Makefile +++ b/distrib/cobalt/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/02/11 09:06:47 roy Exp $ +# $NetBSD: Makefile,v 1.8 2013/03/22 10:52:20 tsutsui Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,8 +20,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ - ${DISTRIBDIR}/common/services \ - ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script + ${DISTRIBDIR}/common/services SMALLPROG_INET6=1 # Use stubs to eliminate some large stuff from libc @@ -30,6 +29,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack ${CRUNCHBIN}: libhack.o .include "${DISTRIBDIR}/common/Makefile.crunch" +.include "${DISTRIBDIR}/common/Makefile.dhcpcd" .include "${DISTRIBDIR}/common/Makefile.makedev" .include "${DISTRIBDIR}/common/Makefile.image" diff --git a/distrib/cobalt/ramdisk/list b/distrib/cobalt/ramdisk/list index facd98776294..200e9e241bca 100644 --- a/distrib/cobalt/ramdisk/list +++ b/distrib/cobalt/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.11 2011/07/03 23:11:32 tron Exp $ +# $NetBSD: list,v 1.12 2013/03/22 10:52:21 tsutsui Exp $ SRCDIRS external/bsd/less/bin SRCDIRS bin sbin usr.bin usr.sbin @@ -24,7 +24,6 @@ PROG bin/stty PROG bin/sync PROG sbin/chown bin/chgrp -PROG sbin/dhclient PROG sbin/disklabel PROG sbin/dmesg PROG sbin/fdisk @@ -63,7 +62,6 @@ PROG usr/sbin/chroot # init invokes the shell as -sh ARGVLN sh -sh -SPECIAL dhclient srcdir distrib/utils/x_dhclient SPECIAL ed srcdir distrib/utils/x_ed SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig @@ -81,7 +79,6 @@ COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services -COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/dreamcast/ramdisk/Makefile b/distrib/dreamcast/ramdisk/Makefile index 93187ceaaab8..4fc70ddd17c7 100644 --- a/distrib/dreamcast/ramdisk/Makefile +++ b/distrib/dreamcast/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/02/11 09:06:48 roy Exp $ +# $NetBSD: Makefile,v 1.13 2013/03/22 10:52:21 tsutsui Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -21,8 +21,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig \ ${DISTRIBDIR}/common/protocols \ - ${DISTRIBDIR}/common/services \ - ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script + ${DISTRIBDIR}/common/services #SMALLPROG_INET6=1 # Use stubs to eliminate some large stuff from libc @@ -31,6 +30,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack ${CRUNCHBIN}: libhack.o .include "${DISTRIBDIR}/common/Makefile.crunch" +.include "${DISTRIBDIR}/common/Makefile.dhcpcd" .include "${DISTRIBDIR}/common/Makefile.makedev" .include "${DISTRIBDIR}/common/Makefile.image" diff --git a/distrib/dreamcast/ramdisk/list b/distrib/dreamcast/ramdisk/list index b38af94e48a8..79bca2ff8f1f 100644 --- a/distrib/dreamcast/ramdisk/list +++ b/distrib/dreamcast/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2011/01/14 10:26:31 tsutsui Exp $ +# $NetBSD: list,v 1.15 2013/03/22 10:52:21 tsutsui Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -23,7 +23,6 @@ PROG bin/stty PROG bin/sync PROG sbin/chown bin/chgrp -PROG sbin/dhclient PROG sbin/disklabel PROG sbin/dmesg PROG sbin/fsck @@ -56,7 +55,6 @@ PROG usr/sbin/chroot # init invokes the shell as -sh ARGVLN sh -sh -SPECIAL dhclient srcdir distrib/utils/x_dhclient SPECIAL ed srcdir distrib/utils/x_ed SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig @@ -73,7 +71,6 @@ COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services -COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 # and the boot script COPY ${CURDIR}/dot.profile .profile