Module Name: src
Committed By: riz
Date: Wed Aug 15 01:26:22 UTC 2012
Modified Files:
src/distrib/emips/ramdisk [netbsd-6]: Makefile
src/distrib/evbmips/instkernel/ramdisk [netbsd-6]: Makefile
src/distrib/evbppc/ramdisk [netbsd-6]: Makefile
src/distrib/i386/ramdisks/ramdisk-rescuetiny [netbsd-6]: Makefile
src/distrib/i386/ramdisks/ramdisk-tiny [netbsd-6]: Makefile
src/distrib/ibmnws/netboot/ramdisk [netbsd-6]: Makefile
src/distrib/pmax/ramdisk [netbsd-6]: Makefile
src/distrib/sandpoint/ramdisk [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by martin in ticket #500):
distrib/evbppc/ramdisk/Makefile: revision 1.16
distrib/emips/ramdisk/Makefile: revision 1.2
distrib/sandpoint/ramdisk/Makefile: revision 1.10
distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.12
distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile: revision 1.2
distrib/ibmnws/netboot/ramdisk/Makefile: revision 1.11
distrib/pmax/ramdisk/Makefile: revision 1.46
distrib/i386/ramdisks/ramdisk-tiny/Makefile: revision 1.2
just make the installation ptys (ipty); change it to opty if more needed.
Change all install media to use ipty instead of pty0
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/distrib/emips/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.10.8.1 \
src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.11 -r1.11.2.1 src/distrib/evbppc/ramdisk/Makefile
cvs rdiff -u -r1.1 -r1.1.46.1 \
src/distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile
cvs rdiff -u -r1.1 -r1.1.46.1 src/distrib/i386/ramdisks/ramdisk-tiny/Makefile
cvs rdiff -u -r1.9 -r1.9.8.1 src/distrib/ibmnws/netboot/ramdisk/Makefile
cvs rdiff -u -r1.45 -r1.45.8.1 src/distrib/pmax/ramdisk/Makefile
cvs rdiff -u -r1.8 -r1.8.6.1 src/distrib/sandpoint/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/emips/ramdisk/Makefile
diff -u src/distrib/emips/ramdisk/Makefile:1.1 src/distrib/emips/ramdisk/Makefile:1.1.8.1
--- src/distrib/emips/ramdisk/Makefile:1.1 Wed Jan 26 01:18:44 2011
+++ src/distrib/emips/ramdisk/Makefile Wed Aug 15 01:26:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/01/26 01:18:44 pooka Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2012/08/15 01:26:19 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
-MAKEDEVTARGETS= minimal pty0 ace0 ace1
+MAKEDEVTARGETS= minimal ipty ace0 ace1
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.hdprofile dot.profile \
${DESTDIR}/usr/mdec/boot.emips ${DESTDIR}/usr/mdec/bootxx_ffs \
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.10 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.10.8.1
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.10 Thu Feb 11 09:06:48 2010
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Wed Aug 15 01:26:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/11 09:06:48 roy Exp $
+# $NetBSD: Makefile,v 1.10.8.1 2012/08/15 01:26:20 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 pty0 ttyv0
+MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 ipty ttyv0
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.11 src/distrib/evbppc/ramdisk/Makefile:1.11.2.1
--- src/distrib/evbppc/ramdisk/Makefile:1.11 Wed Feb 1 21:57:13 2012
+++ src/distrib/evbppc/ramdisk/Makefile Wed Aug 15 01:26:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/02/01 21:57:13 matt Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2012/08/15 01:26:19 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,7 +20,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 pty0 ttyv0
+MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 ipty ttyv0
MAKEDEVTARGETS+= ld0 ld1
# Use stubs to eliminate some large stuff from libc
Index: src/distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile
diff -u src/distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile:1.1 src/distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile:1.1.46.1
--- src/distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile:1.1 Fri Jun 2 22:11:07 2006
+++ src/distrib/i386/ramdisks/ramdisk-rescuetiny/Makefile Wed Aug 15 01:26:20 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/06/02 22:11:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.1.46.1 2012/08/15 01:26:20 riz Exp $
BOOTMODEL= tiny
IMAGE= ramdisk-rescue${BOOTMODEL}.fs
IMAGESIZE= 1500k
-MAKEDEVTARGETS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 pty0 ttyv0
+MAKEDEVTARGETS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 ipty ttyv0
MAKEFS_FLAGS= -f 20
STRIP=${OBJCOPY} -S -R .ident -R .note
Index: src/distrib/i386/ramdisks/ramdisk-tiny/Makefile
diff -u src/distrib/i386/ramdisks/ramdisk-tiny/Makefile:1.1 src/distrib/i386/ramdisks/ramdisk-tiny/Makefile:1.1.46.1
--- src/distrib/i386/ramdisks/ramdisk-tiny/Makefile:1.1 Fri Jun 2 22:11:07 2006
+++ src/distrib/i386/ramdisks/ramdisk-tiny/Makefile Wed Aug 15 01:26:21 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/06/02 22:11:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.1.46.1 2012/08/15 01:26:21 riz Exp $
BOOTMODEL= tiny
IMAGE= ramdisk-${BOOTMODEL}.fs
IMAGESIZE= 1504k
-MAKEDEVTARGETS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 pty0 ttyv0
+MAKEDEVTARGETS= std md0 fd0 fd1 wd0 wd1 wd2 wd3 cd0 cd1 ipty ttyv0
MAKEFS_FLAGS= -f 10
USE_SYSINST= en
Index: src/distrib/ibmnws/netboot/ramdisk/Makefile
diff -u src/distrib/ibmnws/netboot/ramdisk/Makefile:1.9 src/distrib/ibmnws/netboot/ramdisk/Makefile:1.9.8.1
--- src/distrib/ibmnws/netboot/ramdisk/Makefile:1.9 Thu Feb 11 09:06:49 2010
+++ src/distrib/ibmnws/netboot/ramdisk/Makefile Wed Aug 15 01:26:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/02/11 09:06:49 roy Exp $
+# $NetBSD: Makefile,v 1.9.8.1 2012/08/15 01:26:21 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,7 +15,7 @@ CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
-MAKEDEVTARGETS= std md0 pty0 ttyv0
+MAKEDEVTARGETS= std md0 ipty ttyv0
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
Index: src/distrib/pmax/ramdisk/Makefile
diff -u src/distrib/pmax/ramdisk/Makefile:1.45 src/distrib/pmax/ramdisk/Makefile:1.45.8.1
--- src/distrib/pmax/ramdisk/Makefile:1.45 Thu Feb 11 09:06:50 2010
+++ src/distrib/pmax/ramdisk/Makefile Wed Aug 15 01:26:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: Makefile,v 1.45.8.1 2012/08/15 01:26:21 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
-MAKEDEVTARGETS= minimal pty0
+MAKEDEVTARGETS= minimal ipty
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
${DESTDIR}/usr/mdec/boot.pmax ${DESTDIR}/usr/mdec/bootxx_ffs \
Index: src/distrib/sandpoint/ramdisk/Makefile
diff -u src/distrib/sandpoint/ramdisk/Makefile:1.8 src/distrib/sandpoint/ramdisk/Makefile:1.8.6.1
--- src/distrib/sandpoint/ramdisk/Makefile:1.8 Fri May 13 19:14:17 2011
+++ src/distrib/sandpoint/ramdisk/Makefile Wed Aug 15 01:26:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/05/13 19:14:17 phx Exp $
+# $NetBSD: Makefile,v 1.8.6.1 2012/08/15 01:26:20 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,7 +15,7 @@ CRUNCHGEN_FLAGS=-d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
-MAKEDEVTARGETS= std md0 wd0 wd1 sd0 cd0 pty0 satmgr
+MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 sd0 cd0 ipty satmgr raid0 raid1
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
