From a556f30fdab714602729eaa1677696fd1e81ff77 Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 30 Jul 2007 14:03:17 +0000 Subject: [PATCH] In the shark's installation image, create the bpf device from the 'ramdisk' MAKEDEV goal instead of from a Makefile definition. As there is just one configuration for the ramdisk, it's better to keep everything in one place. --- distrib/shark/instkernel/ramdisk/Makefile | 4 ++-- etc/etc.shark/MAKEDEV.conf | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distrib/shark/instkernel/ramdisk/Makefile b/distrib/shark/instkernel/ramdisk/Makefile index 9990d090744f..5ef5e8c4df70 100644 --- a/distrib/shark/instkernel/ramdisk/Makefile +++ b/distrib/shark/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/07/29 13:59:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2007/07/30 14:03:17 jmmv Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -14,7 +14,7 @@ CRUNCHBIN= ramdiskbin LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= le -MAKEDEVTARGETS= ramdisk bpf +MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ disktab.preinstall dot.hdprofile dot.profile \ ${DESTDIR}/usr/share/misc/termcap \ diff --git a/etc/etc.shark/MAKEDEV.conf b/etc/etc.shark/MAKEDEV.conf index 9f1f3507a3f3..7aa714ad44b4 100644 --- a/etc/etc.shark/MAKEDEV.conf +++ b/etc/etc.shark/MAKEDEV.conf @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.7 2005/01/09 15:50:53 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.8 2007/07/30 14:03:17 jmmv Exp $ all_md) makedev wscons wd0 wd1 wd2 wd3 @@ -14,4 +14,5 @@ ramdisk|floppy) makedev std wd0 wd1 wd2 wd3 md0 md1 makedev tty0 tty1 opty ttyv0 makedev st0 st1 cd0 cd1 + makedev bpf ;;