[src/netbsd-6-0]: src Pull up following revision(s) (requested by tsutsui in ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/605e55f70f7d
branches:  netbsd-6-0
changeset: 774799:605e55f70f7d
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 29 03:26:34 2013 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #880):
        etc/etc.hp300/MAKEDEV.conf: revision 1.14
        distrib/hp300/ramdisk/Makefile: revision 1.32
Fix yet another "openpty() failed" error during sysinst.
Prepare a new entry for ramdisk that includes ipty target in
etc.hp300/MAKEDEV.conf and use it in distrib/hp300/ramdisk/Makefile.
See also PR/46812, PR/47123, and PR/47774.
We could simply add "ipty" to MAKEDEVTARGETS as miniroot/Makefile does,
but it's better to shrink ramdisk size as much as possible.
Should be pulled up to both netbsd-6 and netbsd-6-0.

diffstat:

 distrib/hp300/ramdisk/Makefile |   4 ++--
 etc/etc.hp300/MAKEDEV.conf     |  15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 20d7076d63d0 -r 605e55f70f7d distrib/hp300/ramdisk/Makefile
--- a/distrib/hp300/ramdisk/Makefile    Mon Apr 29 03:15:46 2013 +0000
+++ b/distrib/hp300/ramdisk/Makefile    Mon Apr 29 03:26:34 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2010/02/11 09:06:48 roy Exp $
+#      $NetBSD: Makefile,v 1.30.14.1 2013/04/29 03:26:35 riz Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -14,7 +14,7 @@
 LISTS=         ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
 MTREECONF=     ${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=   be
-MAKEDEVTARGETS=        all
+MAKEDEVTARGETS=        ramdisk
 IMAGEDEPENDS=  ${CRUNCHBIN} \
                dot.profile \
                ${DESTDIR}/usr/mdec/installboot ${DESTDIR}/usr/mdec/uboot.lif \
diff -r 20d7076d63d0 -r 605e55f70f7d etc/etc.hp300/MAKEDEV.conf
--- a/etc/etc.hp300/MAKEDEV.conf        Mon Apr 29 03:15:46 2013 +0000
+++ b/etc/etc.hp300/MAKEDEV.conf        Mon Apr 29 03:26:34 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MAKEDEV.conf,v 1.13 2011/09/06 14:40:11 apb Exp $
+#      $NetBSD: MAKEDEV.conf,v 1.13.10.1 2013/04/29 03:26:34 riz Exp $
 
 all_md)
        makedev ct0 ct1 rd0 rd1 rd2
@@ -12,6 +12,19 @@
        makedev ss0 uk0 uk1
        ;;
 
+ramdisk)
+       makedev std
+       makedev md0
+       makedev ct0 ct1 rd0 rd1 rd2
+       makedev sd0 sd1 sd2 cd0 cd1 st0 st1 ch0
+       makedev scsibus0
+       makedev ipty
+       makedev ttyEcfg ttyE0 wskbd0
+       makedev ttyC0 ttyC1 ttyC2 ttyC3
+       makedev ttyM0 ttyM1 ttyM2 ttyM3
+       makedev bpf
+       ;;
+
 ct[0-9]*)
        name=ct; unit=${i#ct}; blk=0; chr=7
        case $unit in