Date: Wed, 22 Oct 2003 19:30:40 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 40242 for review Message-ID: <200310230230.h9N2UejC056810@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=40242 Change 40242 by rwatson@rwatson_paprika on 2003/10/22 19:30:31 Integrate trustedbsd_sebsd release tree forward to 39070, the last major integration of the trustedbsd_mac branch, which brings in many of the major changes in the last four months to the main FreeBSD tree. This includes substantial lock pushdown, threading bug fixes, compiler upgrades, et al. On the whole, release-related changes were makefile infrastructure and documentation. Affected files ... .. //depot/projects/trustedbsd/sebsd/release/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/readme/article.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/i386/drivers.conf#4 integrate .. //depot/projects/trustedbsd/sebsd/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/trustedbsd/sebsd/release/ia64/boot_crunch.conf#4 integrate .. //depot/projects/trustedbsd/sebsd/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/trustedbsd/sebsd/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/trustedbsd/sebsd/release/scripts/doFS.sh#5 integrate .. //depot/projects/trustedbsd/sebsd/release/scripts/print-cdrom-packages.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/release/sparc64/mkisoimages.sh#4 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/release/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.814 2003/08/06 08:09:40 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.820 2003/09/21 06:33:14 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -202,12 +202,11 @@ NO_FLOPPIES= .elif ${TARGET_ARCH} == "sparc64" DISKLABEL= sunlabel -BIGBOOTSIZE= 4096 MFSSIZE= 4096 -BOOTINODE= 8192 MFSINODE= 8192 -BIGBOOTLABEL= auto MFSLABEL= auto +MINIROOT= +NO_FLOPPIES= .elif ${TARGET_ARCH} == "ia64" MFSINODE= 8192 MFSLABEL= auto @@ -246,11 +245,12 @@ .endif CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 +_MK?= ${CHROOTDIR}/mk # Where the bootstrap ports (see DOCPORTS) get installed. LOCALDIR= /usr/local/bin -.if ${TARGET} != ${MACHINE} +.if ${TARGET} != ${MACHINE} && ${DISKLABEL} == "bsdlabel" DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ${TARGET} .else DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} "" @@ -346,8 +346,13 @@ cd ${CHROOTDIR}/usr && \ ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif -.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) - cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) + cd ${CHROOTDIR}/usr/${RELEASESRCMODULE} +.for p in ${LOCAL_PATCHES} +.if exists(${p}) + patch ${PATCH_FLAGS} < ${p} +.endif +.endfor .endif .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} @@ -402,10 +407,10 @@ rm foo; \ fi -test -f install.cfg && cp install.cfg ${CHROOTDIR}/usr/src/release - echo "#!/bin/sh" > ${CHROOTDIR}/mk - echo "set -ex" >> ${CHROOTDIR}/mk - echo "trap 'umount /dev || true' 0" >> ${CHROOTDIR}/mk - echo "_RELTARGET=\$${1:-doRELEASE}" >> ${CHROOTDIR}/mk + echo "#!/bin/sh" > ${_MK} + echo "set -ex" >> ${_MK} + echo "trap 'umount /dev || true' 0" >> ${_MK} + echo "_RELTARGET=\$${1:-doRELEASE}" >> ${_MK} .for var in \ AUTO_KEYBOARD_DETECT \ BOOT_CONFIG \ @@ -437,40 +442,39 @@ TARGET_ARCH \ WORLD_FLAGS .if defined(${var}) - echo "export ${var}=\"${${var}}\"" >> ${CHROOTDIR}/mk + echo "export ${var}=\"${${var}}\"" >> ${_MK} .endif .endfor # Don't remove this, or the build will fall over! - echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk - echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${CHROOTDIR}/mk - echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk + echo "export RELEASEDIR=${_R}" >> ${_MK} + echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${_MK} + echo "export MANBUILDCAT=YES" >> ${_MK} # NB: these may fail if the host is running w/o devfs - echo "umount /dev >/dev/null 2>&1 || true" >> ${CHROOTDIR}/mk - echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" \ - >> ${CHROOTDIR}/mk - echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk - echo " cd /usr/src" >> ${CHROOTDIR}/mk - echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${CHROOTDIR}/mk - echo " touch /tmp/.world_done" >> ${CHROOTDIR}/mk - echo "fi" >> ${CHROOTDIR}/mk - echo "if [ ! -f /tmp/.skip_ports ]; then" >> ${CHROOTDIR}/mk - echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk - echo " cd /usr/ports" >> ${CHROOTDIR}/mk - echo " make ${PORTREADMES_FLAGS} readmes" >> ${CHROOTDIR}/mk - echo " touch /tmp/.skip_ports" >> ${CHROOTDIR}/mk - echo " echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk - echo "fi" >> ${CHROOTDIR}/mk - echo "cd /usr/src/release" >> ${CHROOTDIR}/mk - echo "make obj" >> ${CHROOTDIR}/mk - echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk - echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk - chmod 755 ${CHROOTDIR}/mk + echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} + echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK} + echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} + echo " cd /usr/src" >> ${_MK} + echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} + echo " touch /tmp/.world_done" >> ${_MK} + echo "fi" >> ${_MK} + echo "if [ ! -f /tmp/.skip_ports ]; then" >> ${_MK} + echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + echo " cd /usr/ports" >> ${_MK} + echo " make ${PORTREADMES_FLAGS} readmes" >> ${_MK} + echo " touch /tmp/.skip_ports" >> ${_MK} + echo " echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + echo "fi" >> ${_MK} + echo "cd /usr/src/release" >> ${_MK} + echo "make obj" >> ${_MK} + echo "make \$${_RELTARGET}" >> ${_MK} + echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + chmod 755 ${_MK} .if defined(NOPORTS) || defined(NOPORTREADMES) touch ${CHROOTDIR}/tmp/.skip_ports .endif # Ensure md.ko is loaded if md(4) is not statically compiled into the kernel -mdconfig 2>/dev/null - env -i /usr/sbin/chroot ${CHROOTDIR} /mk + env -i /usr/sbin/chroot `dirname ${_MK}` /`basename ${_MK}` clean: rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] release.10 \ @@ -496,7 +500,7 @@ .endif mkdir ${RD}/trees mkdir ${RD}/kernels - for i in ${DISTRIBUTIONS} ; do \ + for i in ${DISTRIBUTIONS} special; do \ mkdir ${RD}/trees/$$i && \ mtree -deU -f ${MTREEFILES}/BSD.root.dist \ -p ${RD}/trees/$$i > /dev/null && \ @@ -663,6 +667,11 @@ # release.9: +.if exists(${.CURDIR}/../sys/boot/${TARGET}/loader) + cd ${.CURDIR}/../sys/boot/${TARGET}/loader; \ + ${WMAKE} clean cleandepend; \ + ${WMAKE} -DNOMAN -DNOFORTH all install DESTDIR=${RD}/trees/special +.endif cp ${RD}/trees/base/etc/disktab /etc rm -rf ${RD}/mfsfd mkdir ${RD}/mfsfd @@ -718,9 +727,9 @@ ${.CURDIR}/${TARGET}/drivers-small.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules .endif - sh -e ${DOFS_SH} mfsroot-small ${RD} ${MNT} \ + sh -e ${DOFS_SH} ${RD}/mfsroot-small/mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9cnv mfsroot-small > ${RD}/mfsroot-small/mfsroot.gz + @gzip -9nv ${RD}/mfsroot-small/mfsroot @rm -rf ${RD}/mfsfd/modules .endif .if exists(${.CURDIR}/${TARGET}/drivers.conf) @@ -730,10 +739,9 @@ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules .endif @mkdir -p ${RD}/mfsroot - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + sh -e ${DOFS_SH} ${RD}/mfsroot/mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9cnv mfsroot > ${RD}/mfsroot/mfsroot.gz - @rm -f mfsroot mfsroot-small + @gzip -9nv ${RD}/mfsroot/mfsroot touch ${.TARGET} release.10: @@ -886,6 +894,12 @@ @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf .if defined(CD_BOOT) @cp -Rp ${CD_DISC2}/boot ${CD_BOOT} +.if defined(MINIROOT) + @mkdir -p ${FD}/miniroot + @sh -e ${DOFS_SH} ${FD}/miniroot/miniroot.ufs \ + ${RD} ${MNT} 0 ${CD_BOOT} 8192 auto + @gzip -9v ${FD}/miniroot/miniroot.ufs +.endif .endif @cp -Rp ${CD_DISC2}/boot ${CD_DISC1} .if ${TARGET} == "i386" && defined(EMUL_BOOT) && !defined(NO_FLOPPIES) @@ -988,9 +1002,8 @@ md5 * > CHECKSUM.MD5) \ ) -doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ - release.6 release.7 release.8 release.9 release.10 - @cd ${.CURDIR} && ${MAKE} ${EXTRAS} +doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ + release.6 release.7 release.8 release.9 release.10 ${EXTRAS} @echo "Release done" floppies: @@ -1067,9 +1080,9 @@ @mkdir -p ${RD}/image.${FSIMAGE}/boot .if ${TARGET} == "i386" @${WMAKEENV} kgzip -v -l ${RD}/trees/base/usr/lib/kgzldr.o \ - -o ${RD}/image.${FSIMAGE}/boot/loader ${RD}/trees/base/boot/loader + -o ${RD}/image.${FSIMAGE}/boot/loader ${RD}/trees/special/boot/loader .else - @cp ${RD}/trees/base/boot/loader ${RD}/image.${FSIMAGE}/boot + @cp ${RD}/trees/special/boot/loader ${RD}/image.${FSIMAGE}/boot .endif @[ -r ${RD}/kernels/BOOTMFS.${FSIMAGE}.hints ] && \ sed -e '/^hint/s/^/set /' -e '/^#/d' \ ==== //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#4 (text+ko) ==== @@ -14,6 +14,9 @@ <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists; +<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"> +%trademarks; + <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; @@ -30,7 +33,7 @@ <corpauthor>The &os; Release Engineering Team</corpauthor> </authorgroup> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.15 2003/05/03 22:14:55 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.16 2003/09/08 14:53:01 simon Exp $</pubdate> <copyright> <year>2002</year> @@ -39,6 +42,14 @@ Engineering Team</holder> </copyright> + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.microsoft; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> + <abstract> <para>This article describes the status of &os; &release.current;, from the standpoint of users who may be new @@ -186,8 +197,8 @@ </listitem> <listitem> - <para>New architectures: Support for the sparc64 and ia64 - architectures, in addition to the i386, pc98, and + <para>New architectures: Support for the &sparc64; and ia64 + architectures, in addition to the &i386;, pc98, and alpha.</para> </listitem> @@ -390,7 +401,7 @@ &release.4x; but not in &release.5x;. These obsolete files may create some problems.</para> - <para>On the i386 and pc98 platforms, a UserConfig utility + <para>On the &i386; and pc98 platforms, a UserConfig utility exists on 4-STABLE to allow boot-time configuration of ISA devices when booting from installation media. Under &os; 5.0, this functionality has been replaced in part by the @@ -404,11 +415,11 @@ the usual <filename>kern.flp</filename> and <filename>mfsroot.flp</filename> floppy images.</para> - <para>CDROM-based installations on the i386 architecture now use + <para>CDROM-based installations on the &i386; architecture now use a <quote>no-emulation</quote> boot loader. This allows, among other things, the use of a <literal>GENERIC</literal> kernel, rather than the stripped-down kernel on the floppy images. In - theory, any system capable of booting the Microsoft Windows NT + theory, any system capable of booting the µsoft; &windowsnt; 4 installation CDROMs should be able to cope with the &os; &release.5x; CDROMs.</para> ==== //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/errata/article.sgml#4 (text+ko) ==== @@ -17,6 +17,8 @@ %authors; <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mlists; +<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"> +%trademarks; <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; ]> @@ -36,7 +38,7 @@ The &os; Project </corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.46 2003/08/04 15:23:20 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.50 2003/09/20 00:17:52 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -45,6 +47,13 @@ <year>2003</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> + + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> </articleinfo> <abstract> @@ -116,14 +125,47 @@ ]]> <![ %release.type.snapshot [ - <para>The implementation of the &man.realpath.3; function contains - a single-byte buffer overflow bug. This may have various + <para>The implementation of the &man.realpath.3; function contained + a single-byte buffer overflow bug. This had various impacts, depending on the application using &man.realpath.3; and other factors. This bug was fixed on the &release.branch; development branch before &release.prev;; &os; &release.prev; is therefore not affected. However, this change was not noted in the release documentation. For more information, see security advisory <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:08.realpath.asc">FreeBSD-SA-03:08</ulink>.</para>; + + <para>The kernel contains a bug that could allow it to attempt + delivery of invalid signals, leading to a kernel panic or, under + some circumstances, unauthorized modification of kernel memory. + This bug has been fixed on the &release.branch; development + branch and the &release.prev; security fix branch. For more + information, see security advisory + <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:09.signal.asc">FreeBSD-SA-03:09</ulink>.</para>; + + <para>A bug in the iBCS2 emulation module could result in + disclosing the contents of kernel memory. (Note that this + module is not enabled in &os; by default.) This bug has been + fixed on the &release.branch; development branch and the + &release.prev; security fix branch. More information can be + found in security advisory + <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:10.ibcs2.asc">FreeBSD-SA-03:10</ulink>.</para>; + + <para><application>OpenSSH</application> contains a bug in its + buffer management code that could potentially cause it to crash. + This bug has been fixed via a vendor-supplied patch on the + &release.branch; development branch and the &release.prev; + security fix branch. For more details, refer to security + advisory + <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:12.openssh.asc">FreeBSD-SA-03:12</ulink>.</para>; + + <para><application>sendmail</application> contains a + remotely-exploitable buffer overflow. This bug has been fixed + via a new version import on the &release.branch; development + branch and via a vendor-supplied patch on the &release.prev; + security fix branch. More details can be found in security + advisory + <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:13.sendmail.asc">FreeBSD-SA-03:13</ulink>.</para>; + ]]> </sect1> @@ -139,7 +181,7 @@ <para>The RAIDframe disk driver described in &man.raid.4; is non-functional for this release.</para> - <para>ACPI seems to make some i386 machines unstable. Turning off + <para>ACPI seems to make some &i386; machines unstable. Turning off ACPI support may help solve some of these problems; see an item in <xref linkend="late-news">.</para> @@ -169,11 +211,11 @@ <![ %release.type.snapshot [ <para>&man.ipfw.4; should work correctly on strict-alignment - 64-bit architectures such as alpha and sparc64.</para> + 64-bit architectures such as alpha and &sparc64;.</para> <para>The release notes should have stated that the <filename>libthr</filename> library is built by default for the - i386 platform.</para> + &i386; platform.</para> <para>&os; &release.prev; includes some new boot loader scripts designed to make booting &os; with different options easier. @@ -181,7 +223,7 @@ build on the existing Forth-based boot loader scripts (thus, <filename>/boot/loader.conf</filename> and other existing loader configuration files still apply). They are only installed by - default for new binary installs on i386 machines. The new + default for new binary installs on &i386; machines. The new scripts present a boot-time menu that controls how &os; is booted, and include options to turn off ACPI, a <quote>safe mode</quote> boot, single-user booting, and verbose booting. @@ -195,7 +237,7 @@ hw.ata.wc=0 # disable IDE disk write cache hw.eisa_slots=0 # disable probing for EISA devices</programlisting> - <para>For new installs on i386 architecture machines, + <para>For new installs on &i386; architecture machines, &man.sysinstall.8; will try to determine if ACPI was disabled via the new boot loader scripts mentioned above, and if so, ask if this change should be made permanent.</para> ==== //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.62 2003/08/04 18:05:36 wilko Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.64 2003/08/31 12:21:10 wilko Exp $ --> <sect1 id="support-proc"> <sect1info> @@ -1964,12 +1964,12 @@ <sect3> <title>AlphaPC 264DP / UP2000</title> - <para>UP2000 is built by Alpha Processor Inc.</para> + <para>UP2000 was built by Alpha Processor Inc.</para> <para>Features:</para> <itemizedlist> <listitem> - <para>21264 EV6 CPU at 670 MHz</para> + <para>21264 EV6 CPU at 670 or 750 MHz</para> </listitem> <listitem> <para>dual CPU capable</para> @@ -1988,7 +1988,7 @@ <para>21272 core logic chip set (<quote>Tsunami</quote>)</para> </listitem> <listitem> - <para>embedded Adaptec AIC7890/91 Wide Ultra SCSI</para> + <para>2 embedded Adaptec AIC7890/91 Wide Ultra2 SCSI chips</para> </listitem> <listitem> <para>2 embedded IDE based on Cypress 82C693 chips</para> @@ -2015,11 +2015,11 @@ <para>Currently a maximum of 2GB memory is supported by &os;.</para> - <para>The on-board Adaptec is not bootable but works with &os; - 4.0 and later as a datadisk-only SCSI bus.</para> + <para>The on-board Adaptec SCSI HBAs are bootable on UP2000.</para> <para>Busmaster DMA is supported on the first IDE interface - only.</para> + only. The system can boot from it's IDE hard drives and cdrom + drives.</para> <para>The kernel config file must contain:</para> <programlisting>options DEC_ST6600 ==== //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 (text+ko) ==== @@ -8,10 +8,8 @@ (i.e. Ethernet interfaces), list broad groups of devices alphabetically as paragraphs sorted alphabetically (frequently these groups will be arranged by manufacturer, i.e. 3Com - Ethernet interfaces). In cases where a group of devices - consists of multiple models (such as the 3C501, 3C503, etc.), - list each specific model or set of closely-related models as - a separate item in an itemized list, sorted alphabetically. + Ethernet interfaces). + Where applicable, a "Miscellaneous" section may follow all other named sections. @@ -31,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.163 2003/06/29 01:12:57 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.183 2003/09/25 21:15:55 wilko Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -43,7 +41,18 @@ <para>Where possible, the drivers applicable to each device or class of devices is listed. If the driver in question has a manual page - in the &os; base distribution (most should), it is referenced here.</para> + in the &os; base distribution (most should), it is referenced here. + Information on specific models of supported devices, controllers, + etc. can be found in the manual pages.</para> + + <note> + <para>Lists of specific, supported devices are gradually being + removed from this document in order to reduce the amount of + duplicated (and potentially out-of-date) information contained + within. When this process is complete, the manual page for each + driver should be consulted for the authoritative list of devices + supported that particular driver.</para> + </note> <sect2> <title>Disk Controllers</title> @@ -127,20 +136,16 @@ </listitem> </itemizedlist> </para> + + <para arch="i386">Adaptec 1510, 152X, 1535, and 154X-series ISA + SCSI controllers and compatibles (&man.aha.4; driver)</para> + + <para arch="i386">Adaptec 164X-series MCA SCSI controllers + (&man.aha.4; driver)</para> + <para arch="i386,pc98,alpha,sparc64">Adaptec SCSI Controllers <itemizedlist> - <listitem arch="i386"> - <para>Adaptec 1535 ISA SCSI controllers</para> - </listitem> <listitem arch="i386"> - <para>Adaptec 154x series ISA SCSI controllers - (&man.aha.4; driver)</para> - </listitem> - <listitem arch="i386"> - <para>Adaptec 164x series MCA SCSI controllers (&man.aha.4; - driver)</para> - </listitem> - <listitem arch="i386"> <para>Adaptec 174x series EISA SCSI controller in standard and enhanced mode (&man.aha.4; and &man.ahb.4; driver)</para> </listitem> @@ -166,14 +171,6 @@ SCSI controllers (&man.ahc.4; driver)</para> </listitem> <listitem arch="i386"> - <para>Adaptec 1510 series ISA SCSI controllers (not for - bootable devices)</para> - </listitem> - <listitem arch="i386"> - <para>Adaptec 152x series ISA SCSI controllers (&man.aha.4; - driver)</para> - </listitem> - <listitem arch="i386"> <para>Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x and SoundBlaster SCSI cards (&man.aic.4; driver)</para> @@ -203,53 +200,8 @@ </itemizedlist> </para> - <para arch="i386">Adaptec 21x0S/32x0S/34x0S SCSI RAID - controllers (&man.asr.4; driver)</para> - - <para arch="i386">Adaptec 2000S/2005S Zero-Channel RAID controllers - (&man.asr.4; driver)</para> + <para arch="i386">Adaptec FSA family RAID controllers (&man.aac.4; driver)</para> - <para arch="i386">Adaptec 2400A ATA-100 RAID controller - (&man.asr.4; driver)</para> - - <para arch="i386">Adaptec FSA family RAID controllers (&man.aac.4; driver) - <itemizedlist> - <listitem> - <para>Adaptec AAC-2622</para> - </listitem> - <listitem> - <para>Adaptec AAC-364</para> - </listitem> - <listitem> - <para>Adaptec SCSI RAID 2120S</para> - </listitem> - <listitem> - <para>Adaptec SCSI RAID 2200S</para> - </listitem> - <listitem> - <para>Adaptec SCSI RAID 5400S</para> - </listitem> - <listitem> - <para>Dell PERC 2/QC</para> - </listitem> - <listitem> - <para>Dell PERC 2/Si</para> - </listitem> - <listitem> - <para>Dell PERC 3/Di</para> - </listitem> - <listitem> - <para>Dell PERC 3/QC</para> - </listitem> - <listitem> - <para>Dell PERC 3/Si</para> - </listitem> - <listitem> - <para>HP NetRAID-4M</para> - </listitem> - </itemizedlist> - </para> - <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (ct driver) <itemizedlist> <listitem> @@ -363,206 +315,45 @@ </itemizedlist> </para> - <para arch="i386">BusLogic MultiMaster <quote>W</quote> Series Host Adapters - (&man.bt.4; driver): - <itemizedlist> - <listitem> - <para>BT-948</para> - </listitem> - <listitem> - <para>BT-958</para> - </listitem> - <listitem> - <para>BT-958D</para> - </listitem> - </itemizedlist> - </para> + <para arch="i386">BusLogic MultiMaster <quote>W</quote>, + <quote>C</quote>, <quote>S</quote>, and <quote>A</quote> Series + Host Adapters (&man.bt.4; driver) - <para arch="i386">BusLogic MultiMaster <quote>C</quote> Series Host Adapters - (&man.bt.4; driver): - <itemizedlist> - <listitem> - <para>BT-946C</para> - </listitem> - <listitem> - <para>BT-956C</para> - </listitem> - <listitem> - <para>BT-956CD</para> - </listitem> - <listitem> - <para>BT-445C</para> - </listitem> - <listitem> - <para>BT-747C</para> - </listitem> - <listitem> - <para>BT-757C</para> - </listitem> - <listitem> - <para>BT-757CD</para> - </listitem> - <listitem> - <para>BT-545C</para> - </listitem> - <listitem> - <para>BT-540CF</para> - </listitem> - </itemizedlist> - </para> + <note arch="i386"> + <para>BusLogic/Mylex <quote>Flashpoint</quote> adapters are not yet + supported.</para> + </note> - <para arch="i386">BusLogic MultiMaster <quote>S</quote> Series Host Adapters - (&man.bt.4; driver): - <itemizedlist> - <listitem> - <para>BT-445S</para> - </listitem> - <listitem> - <para>BT-747S</para> - </listitem> - <listitem> - <para>BT-747D</para> - </listitem> - <listitem> - <para>BT-757S</para> - </listitem> - <listitem> - <para>BT-757D</para> - </listitem> - <listitem> - <para>BT-545S</para> - </listitem> - <listitem> - <para>BT-542D</para> - </listitem> - <listitem> - <para>BT-742A</para> - </listitem> - <listitem> - <para>BT-542B</para> - </listitem> - </itemizedlist> - </para> - - <para arch="i386">BusLogic MultiMaster <quote>A</quote> Series Host Adapters - (&man.bt.4; driver): - <itemizedlist> - <listitem> - <para>BT-742A</para> - </listitem> - <listitem> - <para>BT-542B</para> - </listitem> - </itemizedlist> - </para> + <note arch="i386"> + <para>AMI FastDisk controllers that are true BusLogic + MultiMaster clones are also supported.</para> + </note> + + <note arch="i386"> + <para>The Buslogic/Bustek BT-640 and Storage Dimensions + SDC3211B and SDC3211F Microchannel (MCA) bus adapters are + also supported.</para> + </note> - <note arch="i386"> - <para>BusLogic/Mylex <quote>Flashpoint</quote> adapters are not yet - supported.</para> - </note> - <note arch="i386"> - <para>AMI FastDisk controllers that are true BusLogic - MultiMaster clones are also supported.</para> - </note> - - <note arch="i386"> - <para>The Buslogic/Bustek BT-640 and Storage Dimensions SDC3211B - and SDC3211F Microchannel (MCA) bus adapters are also - supported.</para> - </note> + </para> <para arch="i386">DPT SmartCACHE Plus, SmartCACHE III, SmartRAID III, SmartCACHE IV and SmartRAID IV SCSI/RAID controllers (&man.dpt.4; driver)</para> + <para arch="i386">Adaptec 21x0S/32x0S/34x0S SCSI RAID + controllers (&man.asr.4; driver)</para> + + <para arch="i386">Adaptec 2000S/2005S Zero-Channel RAID controllers + (&man.asr.4; driver)</para> + + <para arch="i386">Adaptec 2400A ATA-100 RAID controller + (&man.asr.4; driver)</para> + <para arch="i386">DPT SmartRAID V and VI SCSI RAID controllers - (&man.asr.4; driver) - <itemizedlist> - <listitem> - <para>PM1554</para> - </listitem> - <listitem> - <para>PM2554</para> - </listitem> - <listitem> - <para>PM2654</para> - </listitem> - <listitem> - <para>PM2865</para> - </listitem> - <listitem> - <para>PM2754</para> - </listitem> - <listitem> - <para>PM3755</para> - </listitem> - <listitem> - <para>PM3757</para> - </listitem> - </itemizedlist> - </para> + (&man.asr.4; driver)</para> <para arch="i386,alpha">AMI MegaRAID Express and Enterprise family RAID controllers (&man.amr.4; driver) - <itemizedlist> - <listitem> - <para>MegaRAID Series 418</para> - </listitem> - <listitem> - <para>MegaRAID Enterprise 1200 (Series 428)</para> - </listitem> - <listitem> - <para>MegaRAID Enterprise 1300 (Series 434)</para> - </listitem> - <listitem> - <para>MegaRAID Enterprise 1400 (Series 438)</para> - </listitem> - <listitem> - <para>MegaRAID Enterprise 1500 (Series 467)</para> - </listitem> - <listitem> - <para>MegaRAID Enterprise 1600 (Series 471)</para> - </listitem> - <listitem> - <para>MegaRAID Elite 1500 (Series 467)</para> - </listitem> - <listitem> - <para>MegaRAID Elite 1600 (Series 493)</para> - </listitem> - <listitem> - <para>MegaRAID Express 100 (Series 466WS)</para> - </listitem> - <listitem> - <para>MegaRAID Express 200 (Series 466)</para> - </listitem> - <listitem> - <para>MegaRAID Express 300 (Series 490)</para> - </listitem> - <listitem> - <para>MegaRAID Express 500 (Series 475)</para> - </listitem> - <listitem> - <para>Dell PERC</para> - </listitem> - <listitem> - <para>Dell PERC 2/SC</para> - </listitem> - <listitem> - <para>Dell PERC 2/DC</para> - </listitem> - <listitem> - <para>Dell PERC 3/DCL</para> - </listitem> - <listitem> - <para>HP NetRaid-1si</para> - </listitem> - <listitem> - <para>HP NetRaid-3si</para> - </listitem> - <listitem> - <para>HP Embedded NetRaid</para> - </listitem> - </itemizedlist> - <note> <para arch="i386">Booting from these controllers is supported. EISA adapters are not supported.</para> @@ -574,44 +365,17 @@ <para arch="i386,alpha">Mylex DAC960 and DAC1100 RAID controllers with 2.x, 3.x, 4.x and 5.x firmware (&man.mlx.4; driver) - <itemizedlist> - <listitem> - <para>DAC960P</para> - </listitem> - <listitem> - <para>DAC960PD</para> - </listitem> - <listitem> - <para>DAC960PDU</para> - </listitem> - <listitem> - <para>DAC960PL</para> - </listitem> - <listitem> - <para>DAC960PJ</para> - </listitem> - <listitem> - <para>DAC960PG</para> - </listitem> - <listitem> - <para>AcceleRAID 150</para> - </listitem> - <listitem> - <para>AcceleRAID 250</para> - </listitem> - <listitem> - <para>eXtremeRAID 1100</para> - </listitem> - </itemizedlist> <note> <para arch="i386">Booting from these controllers is supported. EISA adapters are not supported.</para> <para arch="alpha">Booting from these controllers is not - supported due to SRM limitations. This list includes - controllers sold by Digital/Compaq in Alpha systems in the - StorageWorks family, e.g. KZPSC or KZPAC.</para> + supported due to SRM limitations. + DAC960 controllers sold by Digital/Compaq for Alpha systems as part + of the StorageWorks family, e.g. KZPSC or KZPAC are bootable from SRM. + Note that these cards used 2.x firmware. SRM bootability of newer + firmware is unknown.</para> </note> </para> @@ -642,19 +406,6 @@ </para> <para arch="i386">3ware Escalade ATA RAID controllers (&man.twe.4; driver) - <itemizedlist> - <listitem arch="i386"> - <para>5000 series</para> - </listitem> - - <listitem arch="i386"> - <para>6000 series</para> - </listitem> - - <listitem arch="i386"> - <para>7000 series</para> - </listitem> - </itemizedlist> </para> <para arch="i386,pc98,alpha,sparc64">LSI/SymBios (formerly NCR) 53C810, 53C810a, 53C815, 53C825, @@ -728,73 +479,10 @@ </para> <para arch="i386,pc98">TMC 18C30, 18C50 and 36C70 (AIC-6820) based ISA/PC-Card SCSI host - adapters (stg driver) - <itemizedlist> - <listitem> - <para>Adaptec 2920/A</para> - </listitem> - <listitem> - <para>Future Domain SCSI2GO</para> - </listitem> - <listitem> - <para>Future Domain TMC-18XX/3260</para> - </listitem> - <listitem> - <para>IBM SCSI PCMCIA Card</para> - </listitem> - <listitem> - <para>ICM PSC-2401 SCSI</para> - </listitem> - <listitem> - <para>MELCO IFC-SC</para> - </listitem> - <listitem> - <para>RATOC REX-5536, REX-5536AM, REX-5536M, - REX-9836A</para> - </listitem> - </itemizedlist> + adapters (&man.stg.4; driver) </para> <para arch="i386,pc98,alpha,ia64,sparc64">Qlogic controllers and variants (&man.isp.4; driver) - <itemizedlist> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 1020, 1040 SCSI and Ultra SCSI host - adapters</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 1240 dual Ultra SCSI controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 1080 Ultra2 LVD and 1280 Dual Ultra2 LVD - controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 12160 Ultra3 LVD controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 2100 and Qlogic 2200 Fibre Channel SCSI - controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 2300 and Qlogic 2312 2-Gigabit Fibre Channel SCSI >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310230230.h9N2UejC056810>