PERFORCE change 88217 for review
soc-andrew
soc-andrew at FreeBSD.org
Wed Dec 14 18:01:58 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=88217
Change 88217 by soc-andrew at soc-andrew_serv on 2005/12/15 02:01:20
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#23 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/alpha/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/powerpc/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/sparc64/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#11 integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#23 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.892 2005/11/03 07:27:50 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.893 2005/12/15 01:14:35 iedowse Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -713,7 +713,6 @@
cp ${.CURDIR}/../etc/defaults/pccard.conf \
${RD}/mfsfd/etc/defaults/pccard.conf
.endif
- cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd
cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/
( for F in defaults/rc.conf netconfig protocols ; do \
==== //depot/projects/soc2005/bsdinstaller/src/release/alpha/boot_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.55 2004/10/01 07:54:36 ru Exp $
+# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.56 2005/12/15 01:04:49 iedowse Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -38,7 +38,6 @@
progs arp
progs ppp
progs sysinstall
-progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
==== //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.60 2005/12/15 01:04:49 iedowse Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -38,7 +38,6 @@
progs arp
progs ppp
progs sysinstall
-progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.78 2005/11/02 22:18:47 wilko Exp $ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.79 2005/12/14 19:43:53 wilko Exp $ -->
<sect1 id="support-proc">
<sect1info>
@@ -265,7 +265,7 @@
that. Kernel build times halved when I went to 32 Mbytes. Note that
the SRM console steals 2Mbyte from the total system memory (and keeps
it). For more serious work 128 Mbytes or more are recommended.
- Although Alpha machines typically can accomodate large to very large
+ Although Alpha machines typically can accommodate large to very large
physical memory sizes, &os; is limited to 1 or 2 Gbytes (dependent
on the core chipset) of RAM. This restriction is due to the
current implementation of the VM system.</para>
@@ -2108,7 +2108,7 @@
power it on/off remotely, reset it etc. See also the description for
the RMC in the DS10 section of this document. RCM versus RMC is not a typo,
the various documentation I consulted used both acronyms
- interchangably. Note that if you want remote power on/off to function
+ interchangeably. Note that if you want remote power on/off to function
you need to connect a small DC adapter to the machine in order to have
the RCM logic powered. You need to supply 9-12V DC to the small inlet
located next to the keyboard connector.</para>
@@ -2608,7 +2608,7 @@
driver). Some new SRM versions are known to recognize the Intel
8255x Ethernet chips as driven by the &os; &man.fxp.4; driver. But
beware: the &man.fxp.4; driver is reported not to work correctly
- with &os; (although it works excellently on &os;/x86).</para>
+ with &os;/alpha (although it works excellently on &os;/x86).</para>
<para>In general the SRM console emulates a VGA-compatibility mode
on PCI VGA cards. This is, however, not guaranteed to work by
==== //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $
+# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.60 2005/12/15 01:04:50 iedowse Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -38,7 +38,6 @@
progs arp
progs ppp
progs sysinstall
-progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
==== //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.9 2004/10/01 07:54:37 ru Exp $
+# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.10 2005/12/15 01:04:50 iedowse Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -40,7 +40,6 @@
progs arp
progs ppp
progs sysinstall
-progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
==== //depot/projects/soc2005/bsdinstaller/src/release/powerpc/boot_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.3 2004/10/01 07:54:37 ru Exp $
+# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.4 2005/12/15 01:04:50 iedowse Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -40,7 +40,6 @@
progs arp
progs ppp
progs sysinstall
-progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
==== //depot/projects/soc2005/bsdinstaller/src/release/sparc64/boot_crunch.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.7 2004/10/01 07:54:37 ru Exp $
+# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.8 2005/12/15 01:04:50 iedowse Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -38,7 +38,6 @@
progs arp
progs ppp
progs sysinstall
-progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.340 2005/10/17 20:47:44 phk Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.341 2005/12/15 01:04:49 iedowse Exp $
# XXX MISSING: mkproto
SUBDIR= ac \
@@ -170,7 +170,6 @@
trpt \
tzsetup \
ugidfw \
- ${_usbd} \
${_usbdevs} \
vidcontrol \
vipw \
@@ -256,7 +255,6 @@
.endif
.if !defined(NO_USB)
-_usbd= usbd
_usbdevs= usbdevs
.endif
More information about the p4-projects
mailing list