Date: Thu, 24 Mar 2005 14:03:49 GMT From: David Xu <davidxu@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 73752 for review Message-ID: <200503241403.j2OE3ng1048215@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=73752 Change 73752 by davidxu@davidxu_alona on 2005/03/24 14:02:57 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/davidxu_thread/src/release/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#10 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/snd_via8233.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man5/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man5/drivers.conf.5#2 delete .. //depot/projects/davidxu_thread/src/share/man/man7/release.7#4 integrate .. //depot/projects/davidxu_thread/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/coda/coda_vfsops.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/modules/asr/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mount.h#7 integrate .. //depot/projects/davidxu_thread/src/sys/sys/vnode.h#8 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#8 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/apmd/apmd.c#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/libexec/rtld-elf/rtld.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.104 2005/03/20 23:28:25 davidxu Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.105 2005/03/24 10:12:29 cperciva Exp $ */ /* @@ -37,6 +37,7 @@ #endif #include <sys/param.h> +#include <sys/mount.h> #include <sys/mman.h> #include <sys/stat.h> @@ -139,6 +140,8 @@ static bool libmap_disable; /* Disable libmap */ static char *libmap_override; /* Maps to use in addition to libmap.conf */ static bool trust; /* False for setuid and setgid programs */ +static bool dangerous_ld_env; /* True if environment variables have been + used to affect the libraries loaded */ static char *ld_bind_now; /* Environment variable for immediate binding */ static char *ld_debug; /* Environment variable for debugging */ static char *ld_library_path; /* Environment variable for search path */ @@ -293,7 +296,10 @@ libmap_override = getenv(LD_ "LIBMAP"); ld_library_path = getenv(LD_ "LIBRARY_PATH"); ld_preload = getenv(LD_ "PRELOAD"); - } + dangerous_ld_env = libmap_disable || (libmap_override != NULL) || + (ld_library_path != NULL) || (ld_preload != NULL); + } else + dangerous_ld_env = 0; ld_tracing = getenv(LD_ "TRACE_LOADED_OBJECTS"); if (ld_debug != NULL && *ld_debug != '\0') @@ -1218,6 +1224,7 @@ Obj_Entry *obj; int fd = -1; struct stat sb; + struct statfs fs; for (obj = obj_list->next; obj != NULL; obj = obj->next) if (strcmp(obj->path, path) == 0) @@ -1250,6 +1257,22 @@ } if (obj == NULL) { /* First use of this object, so we must map it in */ + /* + * but first, make sure that environment variables haven't been + * used to circumvent the noexec flag on a filesystem. + */ + if (dangerous_ld_env) { + if (fstatfs(fd, &fs) != 0) { + _rtld_error("Cannot fstatfs \"%s\"", path); + close(fd); + return NULL; + } + if (fs.f_flags & MNT_NOEXEC) { + _rtld_error("Cannot execute objects on %s\n", fs.f_mntonname); + close(fd); + return NULL; + } + } dbg("loading \"%s\"", path); obj = map_object(fd, path, &sb); close(fd); ==== //depot/projects/davidxu_thread/src/release/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.880 2005/03/23 02:51:19 avatar Exp $ +# $FreeBSD: src/release/Makefile,v 1.881 2005/03/23 15:01:54 jhb Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -104,9 +104,9 @@ #HTTP_PROXY?= www.example.com #FTP_PROXY?= ftp.example.com -# When creating ISO images, point ${CD_EXTRA_BITS} to a directory containing -# extra packages or other files. It will be appended to the disk 1 ISO. -#CD_EXTRA_BITS= /path/to/pkg +# When creating ISO images, point ${CD_PACKAGE_TREE} to a directory containing +# the package split by an earlier invocation of the 'package-split' target. +#CD_PACKAGE_TREE= /path/to/pkg # Extra source tarballs; each argument is a pair of source dir and # distribution name. The dist name should not exceed 7 characters @@ -127,12 +127,6 @@ RELEASEPORTSMODULE= ${MINIMALDOCPORTS} .endif -# Make changing names of disc1/disc2 CD's possible. -DISC1_LABEL?= FreeBSD_Install -DISC1_NAME?= disc1 -DISC2_LABEL?= FreeBSD_LiveFS -DISC2_NAME?= disc2 - # Helper variable .if defined(NOPORTS) .if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES" @@ -250,9 +244,9 @@ CD_BOOT= ${CD}/bootonly .endif CD_DISC1= ${CD}/disc1 +CD_DISC2= ${CD}/disc2 .if defined(SEPARATE_LIVEFS) -CD_DISC2= ${CD}/disc2 -CD_LIVEFS= ${CD_DISC2} +CD_LIVEFS= ${CD}/livefs .else CD_LIVEFS= ${CD_DISC1} .endif @@ -449,11 +443,7 @@ .for var in \ AUTO_KEYBOARD_DETECT \ BUILDNAME \ - CD_EXTRA_BITS \ - DISC1_LABEL \ - DISC1_NAME \ - DISC2_LABEL \ - DISC2_NAME \ + CD_PACKAGE_TREE \ DISTRIBUTIONS \ DOC_LANG \ DOMINIMALDOCPORTS \ @@ -921,7 +911,7 @@ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf touch ${.TARGET} -# Build disc1 cdrom image +# Build disc1 and disc2 cdrom images cdrom.2: @echo "Building CDROM disc1 filesystem image" @mkdir -p ${CD_DISC1}/${BUILDNAME} @@ -946,10 +936,15 @@ @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM .endif + @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf .if defined(SEPARATE_LIVEFS) @cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf .endif + @echo "Building CDROM disc2 filesystem image" + @mkdir -p ${CD_DISC2} + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf + @echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf touch ${.TARGET} # @@ -960,6 +955,7 @@ @echo "Building bootonly CDROM filesystem image" @mkdir -p ${CD_BOOT} @cp -Rp ${CD_LIVEFS}/boot ${CD_BOOT} + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_BOOT}/cdrom.inf .if defined(MINIROOT) @echo "Building bootonly UFS filesystem image" @mkdir -p ${FD}/miniroot @@ -970,22 +966,37 @@ .endif touch ${.TARGET} +.if make(iso.1) +.if defined(CD_PACKAGE_TREE) +.if exists(${CD_PACKAGE_TREE}/disc1) +CD_DISC1_PKGS= ${CD_PACKAGE_TREE}/disc1 +.endif +.if exists(${CD_PACKAGE_TREE}/disc2) +CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2 +.endif +.endif +.endif + iso.1: .if exists(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh) @echo "Creating ISO images..." .if defined(CD_BOOT) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_bootonly \ + FreeBSD_bootonly \ ${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} .endif @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - ${DISC1_LABEL} \ - ${CD}/${BUILDNAME}-${TARGET}-${DISC1_NAME}.iso ${CD_DISC1} \ - ${CD_EXTRA_BITS} + FreeBSD_Install \ + ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \ + ${CD_DISC1_PKGS} + @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ + FreeBSD_Packages \ + ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ + ${CD_DISC2_PKGS} .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - ${DISC2_LABEL} \ - ${CD}/${BUILDNAME}-${TARGET}-${DISC2_NAME}.iso ${CD_DISC2} + FreeBSD_LiveFS \ + ${CD}/${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS} .endif @(cd ${CD} && md5 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.MD5) touch ${.TARGET} ==== //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml,v 1.5 2004/05/20 10:16:19 den Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml,v 1.6 2005/03/24 12:19:46 den Exp $ --> <articleinfo> <title>&os;/&arch; &release.current; Hardware Notes</title> @@ -11,6 +11,7 @@ <year>2002</year> <year>2003</year> <year>2004</year> + <year>2005</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> </articleinfo> ==== //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.833 2005/03/22 15:17:45 hrs Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.834 2005/03/23 20:42:09 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -939,7 +939,7 @@ <title>Contributed Software</title> <para><application>BIND</application> has been updated from version - 9.3.0 to version 9.3.1.</para> + 9.3.0 to version 9.3.1. &merged;</para> <para><application>FILE</application> has been updated from 4.10 to 4.12.</para> ==== //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 (text+ko) ==== @@ -8,8 +8,8 @@ Use release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl script to update this file (-o option). - $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.1 2005/03/10 14:15:08 den Exp $ - $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.2 2005/03/10 13:33:56 den Exp $ + $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.2 2005/03/21 15:07:45 den Exp $ + $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.3 2005/03/21 15:08:45 den Exp $ --> <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e 'Контроллеры, поддерживаемые драйвером &man.aac.4;, включая:'> <!ENTITY hwlist.43922be022d49dabc274b2afffd0db8b 'Драйвер &man.adv.4; поддерживает следующие контроллеры SCSI:'> @@ -147,3 +147,5 @@ <!ENTITY hwlist.6099dff95afa452f801418cdf816cbd7 'Драйвер &man.snd.audiocs.4; поддерживает следующие звуковые устройства:'> <!ENTITY hwlist.38ac33fe29d9215e56f0c4e8f42b2d6d 'Драйвер &man.snd.via82c686.4; поддерживает звуковые устройства, основанные на следующем наборе микросхем:'> <!ENTITY hwlist.e688a5843719661e200e677735d50993 'Драйвер &man.snd.vibes.4; поддерживает звуковые устройства, основанные на следующем наборе микросхем:'> +<!ENTITY hwlist.c2875a10d870ef5948a306802a3eb27c 'Драйвер &man.rc.4; поддерживает SDL Communications RISCom/8 boards.'> +<!ENTITY hwlist.73c7ba1735e16bfd370f670d6f7f7ec1 'Драйвер &man.sr.4; поддерживает следующее оборудование:'> ==== //depot/projects/davidxu_thread/src/share/man/man4/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.309 2005/03/22 14:52:40 sobomax Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.310 2005/03/24 04:45:09 jcamou Exp $ MAN= aac.4 \ acpi.4 \ @@ -280,6 +280,7 @@ snd_sbc.4 \ snd_solo.4 \ snd_uaudio.4 \ + snd_via8233.4 \ snd_via82c686.4 \ snd_vibes.4 \ snp.4 \ ==== //depot/projects/davidxu_thread/src/share/man/man5/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/man/man5/Makefile,v 1.56 2004/05/26 22:58:05 brooks Exp $ +# $FreeBSD: src/share/man/man5/Makefile,v 1.57 2005/03/23 15:34:45 jhb Exp $ #MISSING: dump.5 plot.5 MAN= acct.5 \ @@ -12,7 +12,6 @@ device.hints.5 \ dir.5 \ disktab.5 \ - drivers.conf.5 \ elf.5 \ ethers.5 \ eui64.5 \ ==== //depot/projects/davidxu_thread/src/share/man/man7/release.7#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/release.7,v 1.50 2005/02/13 22:25:19 ru Exp $ +.\" $FreeBSD: src/share/man/man7/release.7,v 1.52 2005/03/23 16:17:30 jhb Exp $ .\" .Dd September 6, 2004 .Dt RELEASE 7 @@ -74,7 +74,7 @@ .Cm release target. .\" XXX: Some sort of introduction to this list? All the others have one. -.Bl -tag -width ".Cm rerelease" +.Bl -tag -width ".Cm package-split" .It Cm release Uses .Dq Li "make installworld" @@ -108,6 +108,19 @@ targets to re-generate the floppy images of a previous .Dq Li "make release" . This is most often used to build custom boot floppies. +.It Cm package-split +Generates the portions of the disc 1 and disc 2 images related to packages. +It uses the list of desired packages from the +.Pa src/release/package-split.py +script to pull packages out of a package build provided by the ports team +and organize them appropriately. +The resulting directory can then be passed to +.Dq Li "make release" +via the +.Va CD_PACKAGE_TREE +variable to populate the ISO images built by the +.Cm iso.1 +target with the correct package related bits. .El .Pp Targets called by @@ -153,8 +166,13 @@ Sets up a suitable area for FTP installations in .Pa ${CHROOTDIR}/R/ftp . .It Cm cdrom.1 -Sets up a suitable area to build CD-ROM images in +Create the layout for the live filesystem CD-ROM image in .Pa ${CHROOTDIR}/R/cdrom . +.It Cm cdrom.2 +Create the layout for the first and second CD-ROM images. +.It Cm cdrom.3 +Create the layout for the boot only CD-ROM image and the boot only UFS +miniroot image. .It Cm iso.1 Builds ISO images (installation and .Dq live @@ -212,6 +230,21 @@ .Pp Optional variables: .Bl -tag -width ".Va NO_PREFETCHDISTFILES" +.It Va CD_PACKAGE_TREE +A directory containing extra bits for the first and second CD-ROM images. +The extra files for the first disc should be in +.Pa ${CD_PACKAGE_TREE}/disc1 +and the extra files for the second disc should be in +.Pa ${CD_PACKAGE_TREE}/disc2 . +Typically, this variable will be set to the output directory of an earlier +invocation of the +.Cm package-split +target. +.It Va CVSARGS +Additional arguments for +.Xr cvs 1 +that come before the subcommands such as +.Dq Li "-qR" . .It Va CVSCMDARGS Additional arguments for .Xr cvs 1 @@ -287,22 +320,6 @@ .It Va MAKE_ISOS If defined, bootable ISO CD-ROM images will be created from the contents of the CD-ROM stage directory. -.It Va DISC1_LABEL -The label used for the CD-ROM created from the disc1 contents, the -default label will be -.Dq Li fbsd_miniinst . -.It Va DISC1_NAME -The name used as part of the ISO file name for the CD-ROM created from -the disc1 contents, the default will be -.Dq Li miniinst . -.It Va DISC2_LABEL -The label used for the CD-ROM created from the disc2 contents, the -default label will be -.Dq Li fbsd_livefs . -.It Va DISC2_NAME -The name used as part of the ISO file name for the CD-ROM created from -the disc2 contents, the default will be -.Dq Li disc2 . .It Va NOCDROM If defined, the CD-ROM stage directories will not be created. .It Va NODOC @@ -319,16 +336,6 @@ platforms supporting them). .It Va NOPORTS If defined, the Ports Collection will be omitted from the release. -.It Va NOPORTREADMES -If defined, readme files will not be created for each individual port -in the Ports Collection. -The default behavior is for -.Dq Li "make release" -to run -.Dq Li "make readmes" -from -.Pa ${CHROOTDIR}/usr/ports , -which can be a very time consuming operation. .It Va PORTSRELEASETAG The CVS tag to use when checking out the ports tree. Usually, @@ -365,6 +372,9 @@ of the CVS tree (a .Dq "-CURRENT snapshot" ) . +.It Va SEPARATE_LIVEFS +Store the live filesystem on its own CD-ROM image rather than placing it on +the first disc. .It Va TARGET_ARCH The target machine processor architecture. This is analogous to the @@ -409,7 +419,6 @@ .It Pa /usr/src/Makefile .It Pa /usr/src/Makefile.inc1 .It Pa /usr/src/release/Makefile -.It Pa /usr/src/release/${arch}/drivers.conf .It Pa /usr/src/release/${arch}/boot_crunch.conf .It Pa /usr/src/release/${arch}/fixit_crunch.conf .El @@ -441,7 +450,7 @@ cvs diff -u > /path/to/local.patch make buildworld cd release -make release CHROOTDIR=/local3/release BUILDNAME=5.0-CURRENT \\ +make release CHROOTDIR=/local3/release BUILDNAME=6.0-CURRENT \\ CVSROOT=/host/cvs/usr/home/ncvs LOCAL_PATCHES=/path/to/local.patch .Ed .Sh SEE ALSO @@ -453,7 +462,6 @@ .Xr patch 1 , .Xr uname 1 , .Xr md 4 , -.Xr drivers.conf 5 , .Xr make.conf 5 , .Xr build 7 , .Xr ports 7 , ==== //depot/projects/davidxu_thread/src/sys/cam/cam_xpt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.150 2005/02/20 23:51:20 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.151 2005/03/23 16:43:29 gibbs Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -152,6 +152,7 @@ #define CAM_DEV_INQUIRY_DATA_VALID 0x40 u_int32_t tag_delay_count; #define CAM_TAG_DELAY_COUNT 5 + u_int32_t tag_saved_openings; u_int32_t refcount; struct callout_handle c_handle; }; @@ -5040,6 +5041,7 @@ device->qfrozen_cnt = 0; device->flags = CAM_DEV_UNCONFIGURED; device->tag_delay_count = 0; + device->tag_saved_openings = 0; device->refcount = 1; callout_handle_init(&device->c_handle); @@ -5127,6 +5129,9 @@ if (result == CAM_REQ_CMP && (diff < 0)) { dev->flags |= CAM_DEV_RESIZE_QUEUE_NEEDED; } + if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0 + || (dev->inq_flags & SID_CmdQue) != 0) + dev->tag_saved_openings = newopenings; /* Adjust the global limit */ xpt_max_ccbs += diff; splx(s); @@ -6057,7 +6062,8 @@ done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); - xpt_async(AC_FOUND_DEVICE, xpt_periph->path, done_ccb); + xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, + done_ccb); } xpt_release_ccb(done_ccb); break; @@ -6710,7 +6716,11 @@ device->flags &= ~CAM_DEV_TAG_AFTER_COUNT; xpt_freeze_devq(path, /*count*/1); device->inq_flags |= SID_CmdQue; - newopenings = min(device->quirk->maxtags, sim->max_tagged_dev_openings); + if (device->tag_saved_openings != 0) + newopenings = device->tag_saved_openings; + else + newopenings = min(device->quirk->maxtags, + sim->max_tagged_dev_openings); xpt_dev_ccbq_resize(path, newopenings); xpt_setup_ccb(&crs.ccb_h, path, /*priority*/1); crs.ccb_h.func_code = XPT_REL_SIMQ; @@ -6888,6 +6898,7 @@ if (done_ccb->ccb_h.status == CAM_REQ_CMP) { done_ccb->ccb_h.func_code = XPT_SCAN_BUS; done_ccb->ccb_h.cbfcnp = xpt_finishconfig; + done_ccb->crcn.flags = 0; xpt_action(done_ccb); return; } ==== //depot/projects/davidxu_thread/src/sys/coda/coda_vfsops.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.58 2005/02/20 23:01:57 das Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.59 2005/03/24 07:39:03 jeff Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -268,8 +268,9 @@ * find root of cfs */ int -coda_root(vfsp, vpp, td) +coda_root(vfsp, flags, vpp, td) struct mount *vfsp; + int flags; struct vnode **vpp; struct thread *td; { ==== //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.282 2005/03/18 05:19:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.283 2005/03/23 21:24:29 jmg Exp $"); #include "opt_bus.h" @@ -509,6 +509,11 @@ if (oldstate == state) return (0); + if (bootverbose) + printf( + "pci%d:%d:%d: Transition from D%d to D%d\n", + dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func, + oldstate, state); /* * The PCI power management specification states that after a state * transition between PCI power states, system software must @@ -1873,11 +1878,6 @@ * state D0. */ if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - if (bootverbose) - printf( - "pci%d:%d:%d: Transition from D%d to D0\n", - dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func, - pci_get_powerstate(dev)); pci_set_powerstate(dev, PCI_POWERSTATE_D0); } for (i = 0; i < dinfo->cfg.nummaps; i++) @@ -1957,19 +1957,9 @@ */ ps = pci_get_powerstate(dev); if (ps != PCI_POWERSTATE_D0 && ps != PCI_POWERSTATE_D3) { - if (bootverbose) - printf( - "pci%d:%d:%d: Transition from D%d to D0\n", - dinfo->cfg.bus, dinfo->cfg.slot, - dinfo->cfg.func, ps); pci_set_powerstate(dev, PCI_POWERSTATE_D0); } if (pci_get_powerstate(dev) != PCI_POWERSTATE_D3) { - if (bootverbose) - printf( - "pci%d:%d:%d: Transition from D0 to D3\n", - dinfo->cfg.bus, dinfo->cfg.slot, - dinfo->cfg.func); pci_set_powerstate(dev, PCI_POWERSTATE_D3); } } ==== //depot/projects/davidxu_thread/src/sys/dev/pdq/pdq_ifsubr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.23 2003/08/24 17:54:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.24 2005/03/24 01:58:20 mdodd Exp $"); /* * DEC PDQ FDDI Controller; code for BSD derived operating systems @@ -379,13 +379,6 @@ PDQ_LOCK(sc); switch (cmd) { - case SIOCSIFMTU: - case SIOCGIFADDR: - case SIOCSIFADDR: { - error = fddi_ioctl(ifp, cmd, data); - break; - } - case SIOCSIFFLAGS: { pdq_ifinit(sc); break; @@ -410,7 +403,7 @@ #endif default: { - error = EINVAL; + error = fddi_ioctl(ifp, cmd, data); break; } } ==== //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vfsops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.41 2005/01/11 12:02:26 phk Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.42 2005/03/24 07:36:12 jeff Exp $ */ #include "opt_devfs.h" @@ -96,7 +96,7 @@ fmp->dm_basedir = fmp->dm_rootdir; devfs_rules_newmount(fmp, td); - error = devfs_root(mp, &rvp, td); + error = devfs_root(mp, LK_EXCLUSIVE, &rvp, td); if (error) { lockdestroy(&fmp->dm_lock); FREE(fmp, M_DEVFS); @@ -136,8 +136,9 @@ /* Return locked reference to root. */ static int -devfs_root(mp, vpp, td) +devfs_root(mp, flags, vpp, td) struct mount *mp; + int flags; struct vnode **vpp; struct thread *td; { ==== //depot/projects/davidxu_thread/src/sys/fs/fdescfs/fdesc_vfsops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.52 2005/02/10 12:09:15 phk Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.53 2005/03/24 07:36:13 jeff Exp $ */ /* @@ -126,8 +126,9 @@ } static int -fdesc_root(mp, vpp, td) +fdesc_root(mp, flags, vpp, td) struct mount *mp; + int flags; struct vnode **vpp; struct thread *td; { ==== //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs_vfsops.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.52 2005/03/16 11:20:49 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.53 2005/03/24 07:36:13 jeff Exp $ */ @@ -306,7 +306,7 @@ goto failed; } - error = hpfs_root(mp, &vp, td); + error = hpfs_root(mp, LK_EXCLUSIVE, &vp, td); if (error) { hpfs_cpdeinit(hpmp); hpfs_bmdeinit(hpmp); @@ -371,6 +371,7 @@ static int hpfs_root( struct mount *mp, + int flags, struct vnode **vpp, struct thread *td ) { ==== //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_vfsops.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.143 2005/03/15 20:57:25 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.144 2005/03/24 07:36:13 jeff Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -186,7 +186,8 @@ if (FAT32(pmp)) pmp->pm_flags |= MSDOSFSMNT_LONGNAME; else { - if ((error = msdosfs_root(mp, &rootvp, td)) != 0) + if ((error = + msdosfs_root(mp, LK_EXCLUSIVE, &rootvp, td)) != 0) return error; pmp->pm_flags |= findwin95(VTODE(rootvp)) ? MSDOSFSMNT_LONGNAME @@ -804,8 +805,9 @@ } static int -msdosfs_root(mp, vpp, td) +msdosfs_root(mp, flags, vpp, td) struct mount *mp; + int flags; struct vnode **vpp; struct thread *td; { ==== //depot/projects/davidxu_thread/src/sys/fs/ntfs/ntfs_vfsops.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.77 2005/02/10 12:09:49 phk Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.78 2005/03/24 07:36:14 jeff Exp $ */ @@ -525,6 +525,7 @@ static int ntfs_root( struct mount *mp, + int flags, struct vnode **vpp, struct thread *td ) { ==== //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.70 2005/01/11 07:36:18 phk Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.71 2005/03/24 07:36:14 jeff Exp $ */ /* @@ -223,8 +223,9 @@ } static int -nullfs_root(mp, vpp, td) +nullfs_root(mp, flags, vpp, td) struct mount *mp; + int flags; struct vnode **vpp; struct thread *td; { ==== //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs_vfsops.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.39 2005/01/06 18:10:39 imp Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.40 2005/03/24 07:36:14 jeff Exp $ */ #include "opt_ncp.h" #ifndef NCP @@ -228,7 +228,7 @@ /* protect against invalid mount points */ nmp->m.mount_point[sizeof(nmp->m.mount_point)-1] = '\0'; vfs_getnewfsid(mp); - error = nwfs_root(mp, &vp, td); + error = nwfs_root(mp, LK_EXCLUSIVE, &vp, td); if (error) goto bad; /* @@ -277,7 +277,7 @@ /* Return locked vnode to root of a filesystem */ static int -nwfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { +nwfs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) { struct vnode *vp; struct nwmount *nmp; struct nwnode *np; ==== //depot/projects/davidxu_thread/src/sys/fs/portalfs/portal_vfsops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.56 2005/01/06 18:10:40 imp Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.57 2005/03/24 07:36:14 jeff Exp $ */ /* @@ -202,8 +202,9 @@ } static int -portal_root(mp, vpp, td) +portal_root(mp, flags, vpp, td) struct mount *mp; + int flags; struct vnode **vpp; struct thread *td; { ==== //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.25 2005/03/19 08:22:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.26 2005/03/24 07:36:15 jeff Exp $"); #include "opt_pseudofs.h" @@ -305,7 +305,7 @@ * Return a root vnode */ int -pfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) +pfs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) { struct pfs_info *pi; ==== //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.29 2005/03/19 08:22:36 phk Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.30 2005/03/24 07:36:15 jeff Exp $ */ #ifndef _PSEUDOFS_H_INCLUDED @@ -201,8 +201,8 @@ struct thread *td); int pfs_unmount (struct mount *mp, int mntflags, struct thread *td); -int pfs_root (struct mount *mp, struct vnode **vpp, - struct thread *td); +int pfs_root (struct mount *mp, int flags, + struct vnode **vpp, struct thread *td); int pfs_statfs (struct mount *mp, struct statfs *sbp, struct thread *td); int pfs_init (struct pfs_info *pi, struct vfsconf *vfc); ==== //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_vfsops.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.33 2005/02/10 12:07:02 phk Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.34 2005/03/24 07:36:15 jeff Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -243,7 +243,7 @@ } } vfs_getnewfsid(mp); - error = smbfs_root(mp, &vp, td); + error = smbfs_root(mp, LK_EXCLUSIVE, &vp, td); if (error) goto bad; VOP_UNLOCK(vp, 0, td); @@ -316,7 +316,7 @@ * Return locked root vnode of a filesystem */ static int -smbfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) +smbfs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) { struct smbmount *smp = VFSTOSMBFS(mp); struct vnode *vp; ==== //depot/projects/davidxu_thread/src/sys/fs/udf/udf_vfsops.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.32 2005/03/16 11:20:50 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.33 2005/03/24 07:36:15 jeff Exp $ */ /* udf_vfsops.c */ @@ -531,7 +531,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503241403.j2OE3ng1048215>