Module Name: src
Committed By: tsutsui
Date: Sun Apr 28 08:08:04 UTC 2013
Modified Files:
src/distrib/hp300/ramdisk: Makefile
src/etc/etc.hp300: MAKEDEV.conf
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/hp300/ramdisk/Makefile
cvs rdiff -u -r1.13 -r1.14 src/etc/etc.hp300/MAKEDEV.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/hp300/ramdisk/Makefile
diff -u src/distrib/hp300/ramdisk/Makefile:1.31 src/distrib/hp300/ramdisk/Makefile:1.32
--- src/distrib/hp300/ramdisk/Makefile:1.31 Sat Mar 23 18:15:07 2013
+++ src/distrib/hp300/ramdisk/Makefile Sun Apr 28 08:08:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/03/23 18:15:07 tsutsui Exp $
+# $NetBSD: Makefile,v 1.32 2013/04/28 08:08:03 tsutsui Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -14,7 +14,7 @@ CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
-MAKEDEVTARGETS= all
+MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
${DESTDIR}/usr/mdec/installboot ${DESTDIR}/usr/mdec/uboot.lif \
Index: src/etc/etc.hp300/MAKEDEV.conf
diff -u src/etc/etc.hp300/MAKEDEV.conf:1.13 src/etc/etc.hp300/MAKEDEV.conf:1.14
--- src/etc/etc.hp300/MAKEDEV.conf:1.13 Tue Sep 6 14:40:11 2011
+++ src/etc/etc.hp300/MAKEDEV.conf Sun Apr 28 08:08:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2011/09/06 14:40:11 apb Exp $
+# $NetBSD: MAKEDEV.conf,v 1.14 2013/04/28 08:08:04 tsutsui Exp $
all_md)
makedev ct0 ct1 rd0 rd1 rd2
@@ -12,6 +12,19 @@ all_md)
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
