Date: Thu, 15 Jul 2004 12:11:32 GMT From: David Xu <davidxu@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 57395 for review Message-ID: <200407151211.i6FCBWCr053721@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=57395 Change 57395 by davidxu@davidxu_alona on 2004/07/15 12:11:14 IFC @57389 Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db.h#1 branch .. //depot/projects/davidxu_ksedbg/src/release/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/alpha/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/amd64/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/i386/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/sparc64/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/core/geom.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/adw.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/amr.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/asr.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ed.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/my.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/hfa/hfa_freebsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/md/md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/null/null.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_init.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_disc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_ef.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_faith.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_gif.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_gre.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_loop.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_sl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_stf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_tun.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/exec.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/procfs.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/basename/basename.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/checknr/checknr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/col/col.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/colcrt/colcrt.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/colcrt/colcrt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/column/column.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/column/column.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/du/du.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/killall/killall.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/pkill/pkill.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/sed.1#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/xstr/xstr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/usbd/usbd.conf.5#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.216 2004/07/05 23:13:16 das Exp $ +# $FreeBSD: src/include/Makefile,v 1.217 2004/07/15 03:43:18 davidxu Exp $ # # Doing a "make install" builds /usr/include. ==== //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.30 2004/07/10 18:10:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.31 2004/07/15 03:13:27 kientzle Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -72,7 +72,7 @@ struct extract { mode_t umask; mode_t default_dir_mode; - struct archive_string mkdirpath; + struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -110,9 +110,11 @@ static int extract_symlink(struct archive *, struct archive_entry *, int); static gid_t lookup_gid(struct archive *, const char *uname, gid_t); static uid_t lookup_uid(struct archive *, const char *uname, uid_t); -static int mkdirpath(struct archive *, const char *, int flags); -static int mkdirpath_internal(struct archive *, char *, int flags); -static int mkdirpath_recursive(struct archive *, char *, int flags); +static int create_parent_dir(struct archive *, const char *, int flags); +static int create_parent_dir_internal(struct archive *, char *, + int flags); +static int create_parent_dir_recursive(struct archive *, char *, + int flags); static int restore_metadata(struct archive *, struct archive_entry *, int flags); #ifdef HAVE_POSIX_ACL @@ -275,7 +277,7 @@ p = next; } extract->fixup_list = NULL; - archive_string_free(&extract->mkdirpath); + archive_string_free(&extract->create_parent_dir); free(a->extract); a->extract = NULL; } @@ -409,7 +411,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (fd < 0) { - mkdirpath(a, name, flags); + create_parent_dir(a, name, flags); fd = open(name, O_WRONLY | O_CREAT | O_EXCL, mode); } if (fd < 0) { @@ -434,8 +436,9 @@ extract->pst = NULL; /* Invalidate cached stat data. */ /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), archive_entry_pathname(entry)); - path = extract->mkdirpath.s; + archive_strcpy(&(extract->create_parent_dir), + archive_entry_pathname(entry)); + path = extract->create_parent_dir.s; /* Deal with any troublesome trailing path elements. */ for (;;) { @@ -477,7 +480,7 @@ unlink(path); } else { /* Doesn't already exist; try building the parent path. */ - if (mkdirpath_internal(a, path, flags) != ARCHIVE_OK) + if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK) return (ARCHIVE_WARN); } @@ -512,24 +515,26 @@ * path into mutable storage first. */ static int -mkdirpath(struct archive *a, const char *path, int flags) +create_parent_dir(struct archive *a, const char *path, int flags) { struct extract *extract; + int r; extract = a->extract; /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), path); + archive_strcpy(&(extract->create_parent_dir), path); - return (mkdirpath_internal(a, extract->mkdirpath.s, flags)); + r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags); + return (r); } /* - * Handle remaining setup for mkdirpath_recursive(), assuming + * Handle remaining setup for create_parent_dir_recursive(), assuming * path is already in mutable storage. */ static int -mkdirpath_internal(struct archive *a, char *path, int flags) +create_parent_dir_internal(struct archive *a, char *path, int flags) { char *slash; mode_t old_umask; @@ -541,7 +546,7 @@ return (ARCHIVE_OK); *slash = '\0'; old_umask = umask(~SECURE_DIR_MODE); - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); umask(old_umask); *slash = '/'; return (r); @@ -554,7 +559,7 @@ * Otherwise, returns ARCHIVE_WARN. */ static int -mkdirpath_recursive(struct archive *a, char *path, int flags) +create_parent_dir_recursive(struct archive *a, char *path, int flags) { struct stat st; struct extract *extract; @@ -579,7 +584,7 @@ /* Don't bother trying to create null path, '.', or '..'. */ if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; return (r); } @@ -611,7 +616,7 @@ return (ARCHIVE_WARN); } else if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; if (r != ARCHIVE_OK) return (r); @@ -658,7 +663,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = link(linkname, pathname); } @@ -695,7 +700,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = symlink(linkname, pathname); } @@ -728,7 +733,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mknod(archive_entry_pathname(entry), mode, archive_entry_rdev(entry)); } @@ -777,7 +782,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mkfifo(archive_entry_pathname(entry), archive_entry_mode(entry)); } ==== //depot/projects/davidxu_ksedbg/src/release/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.845 2004/06/10 19:33:26 brian Exp $ +# $FreeBSD: src/release/Makefile,v 1.846 2004/07/15 04:52:57 jhb Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -314,6 +314,18 @@ @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!" @exit 1 .endif +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) +.for p in ${LOCAL_PATCHES} +.if !exists(${p}) + @echo "The patch file ${p} does not exist!" + @exit 1 +.endif +.endfor +.endif +.if defined(LOCAL_SCRIPT) && !exists(${LOCAL_SCRIPT}) + @echo "The local script ${LOCAL_SCRIPT} does not exist!" + @exit 1 +.endif .if make(release) .if exists(${CHROOTDIR}) # The first command will fail on a handful of files that have their schg @@ -347,12 +359,10 @@ .endif .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) .for p in ${LOCAL_PATCHES} -.if exists(${p}) patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p} -.endif .endfor .endif -.if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) +.if defined(LOCAL_SCRIPT) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} \ RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif ==== //depot/projects/davidxu_ksedbg/src/release/alpha/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.10 2004/07/15 09:28:02 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="yes" shift @@ -50,7 +52,7 @@ LABEL=$1; shift NAME=$1; shift -mkisofs -r -J -V $LABEL -o $NAME $* +mkisofs -r -J -V $LABEL -P "$publisher" -o $NAME $* type setcdboot 2>&1 | grep " is " >/dev/null if [ $? -ne 0 ]; then ==== //depot/projects/davidxu_ksedbg/src/release/amd64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.10 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" if [ "x$1" = "x-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-b boot/cdboot -no-emul-boot" @@ -53,4 +54,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/davidxu_ksedbg/src/release/i386/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.10 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="-b boot/cdboot -no-emul-boot" shift @@ -55,4 +57,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.7 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.8 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" set -e # The hackery function is to help with the development of the release @@ -91,6 +92,6 @@ BOOTOPTS="-b $EFIPART -no-emul-boot" fi -mkisofs $BOOTOPTS -r -J -V $LABEL -o $NAME $BASE $* +mkisofs $BOOTOPTS -r -J -V $LABEL -P "$publisher" -o $NAME $BASE $* rm -f $BASE/$EFIPART exit 0 ==== //depot/projects/davidxu_ksedbg/src/release/sparc64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.5 2004/07/12 07:59:25 kris Exp $ +# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.6 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" IMG=/tmp/bootfs MNT=/mnt @@ -65,5 +66,5 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* rm -f ${IMG} ==== //depot/projects/davidxu_ksedbg/src/sbin/geom/core/geom.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.2 2004/07/07 21:00:57 ru Exp $ +.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.3 2004/07/14 13:32:00 pjd Exp $ .\" .Dd May 21, 2004 .Dt GEOM 8 @@ -111,6 +111,7 @@ .Sh SEE ALSO .Xr geom 4 , .Xr gconcat 8 , +.Xr glabel 8 , .Xr gnop 8 , .Xr gstripe 8 .Sh HISTORY ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/adw.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (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/share/man/man4/adw.4,v 1.16 2001/10/13 09:08:30 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/adw.4,v 1.17 2004/07/14 21:58:17 simon Exp $ .\" -.Dd February 13, 2000 +.Dd July 14, 2004 .Dt ADW 4 .Os .Sh NAME @@ -43,13 +43,6 @@ and .Tn ASC38C0800 Ultra2 , SCSI Host Adapter chips. -AdvanSys products incorporating these chips include the -.Tn ABP[3]940UW , -.Tn ABP950UW , -.Tn ABP970UW , -.Tn ABP3940U2W , -and -.Tn ABP3950U2W . Both chips support, synchronous transfers (20MHz and 40MHz max respectively), 16bit transfers, tagged queueing, @@ -66,6 +59,23 @@ per target is not honored as the CAM SCSI system will automatically determine the maximum number of tags a device can receive as well as guarantee fair resource allocation among devices. +.Sh HARDWARE +The +.Nm +driver supports SCSI controllers including: +.Pp +.Bl -bullet -compact +.It +AdvanSys ABP940UW/ABP3940UW +.It +AdvanSys ABP950UW +.It +AdvanSys ABP970UW +.It +AdvanSys ABP3940U2W +.It +AdvanSys ABP3950U2W +.El .Sh SEE ALSO .Xr adv 4 , .Xr cd 4 , ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/amr.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (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/share/man/man4/amr.4,v 1.20 2003/12/23 16:22:34 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/amr.4,v 1.21 2004/07/14 21:58:17 simon Exp $ .\" -.Dd January 23, 2000 +.Dd July 14, 2004 .Dt AMR 4 .Os .Sh NAME @@ -38,41 +38,44 @@ driver provides support for American Megatrends MegaRAID Express, Elite and Enterprise family SCSI RAID controllers, including models relabeled and sold by Hewlett-Packard and Dell. -Supported controllers include: +.Sh HARDWARE +The +.Nm +driver supports the following: .Pp .Bl -bullet -compact .It -MegaRAID 320-1 +AMI MegaRAID 320-1 .It -MegaRAID 320-2 +AMI MegaRAID 320-2 .It -MegaRAID 320-4X +AMI MegaRAID 320-4X .It -MegaRAID Series 418 +AMI MegaRAID Series 418 .It -MegaRAID Enterprise 1200 (Series 428) +AMI MegaRAID Enterprise 1200 (Series 428) .It -MegaRAID Enterprise 1300 (Series 434) +AMI MegaRAID Enterprise 1300 (Series 434) .It -MegaRAID Enterprise 1400 (Series 438) +AMI MegaRAID Enterprise 1400 (Series 438) .It -MegaRAID Enterprise 1500 (Series 467) +AMI MegaRAID Enterprise 1500 (Series 467) .It -MegaRAID Enterprise 1600 (Series 471) +AMI MegaRAID Enterprise 1600 (Series 471) .It -MegaRAID Elite 1500 (Series 467) +AMI MegaRAID Elite 1500 (Series 467) .It -MegaRAID Elite 1600 (Series 493) +AMI MegaRAID Elite 1600 (Series 493) .It -MegaRAID Elite 1650 (Series 4xx) +AMI MegaRAID Elite 1650 (Series 4xx) .It -MegaRAID Express 100 (Series 466WS) +AMI MegaRAID Express 100 (Series 466WS) .It -MegaRAID Express 200 (Series 466) +AMI MegaRAID Express 200 (Series 466) .It -MegaRAID Express 300 (Series 490) +AMI MegaRAID Express 300 (Series 490) .It -MegaRAID Express 500 (Series 475) +AMI MegaRAID Express 500 (Series 475) .It Dell PERC .It ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/asr.4#2 (text+ko) ==== @@ -4,9 +4,9 @@ .\" .\" Manpage cleanup by: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> .\" -.\" $FreeBSD: src/share/man/man4/asr.4,v 1.22 2004/05/02 17:17:19 schweikh Exp $ +.\" $FreeBSD: src/share/man/man4/asr.4,v 1.23 2004/07/14 21:58:17 simon Exp $ .\" -.Dd October 27, 2000 +.Dd July 14, 2004 .Dt ASR 4 .Os .Sh NAME @@ -22,9 +22,30 @@ SmartRAID SCSI RAID adapters through the standard SCSI disk .Xr da 4 interface. -The adapters currently supported include the following RAID adapters: +.Pp +The supported adapters provide 64 bit PCI, +Compact PCI, Zero Channel PCI, +and up to four channels of Ultra2, Ultra 160, or Ultra320 SCSI, +or two channels of 1GB Fibre. +All support RAID-0, RAID-1, RAID-10, RAID-5 and RAID-50 arrays. +All SCSI target types are supported. +For the ATA based controllers, one IDE drive per channel is supported. +Hot-swapping of IDE drives is not supported at this time. +.Pp +All host bus adapters must be configured +before they can be used with any operating system. +Please contact Adaptec directly to obtain the latest information +on configuration utilities for the adapters. +Currently there are both a Motif based GUI configuration utility +and a CLI based configuration utility available from the Adaptec Web site. +The cards and arrays can also be configured via the BIOS based configuration +tool (SMOR). +.Sh HARDWARE +The adapters currently supported by the +.Nm +driver include the following: .Pp -.Bl -item -compact +.Bl -bullet -compact .It Adaptec Zero-Channel SCSI RAID 2000S, 2005S, 2010S, 2015S .It @@ -59,24 +80,6 @@ DEC KZPCC-XC (LVD 1-ch, 16MB cache), DEC KZPCC-XE (LVD 3-ch, 64MB cache) -- rebadged SmartRAID V Millennium .El -.Pp -These adapters provide 64 bit PCI, -Compact PCI, Zero Channel PCI, -and up to four channels of Ultra2, Ultra 160, or Ultra320 SCSI, -or two channels of 1GB Fibre. -All support RAID-0, RAID-1, RAID-10, RAID-5 and RAID-50 arrays. -All SCSI target types are supported. -For the ATA based controllers, one IDE drive per channel is supported. -Hot-swapping of IDE drives is not supported at this time. -.Pp -All host bus adapters must be configured -before they can be used with any operating system. -Please contact Adaptec directly to obtain the latest information -on configuration utilities for the adapters. -Currently there are both a Motif based GUI configuration utility -and a CLI based configuration utility available from the Adaptec Web site. -The cards and arrays can also be configured via the BIOS based configuration -tool (SMOR). .Sh FILES .Bl -tag -width "/dev/asr*" -compact .It Pa /dev/asr* ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/ed.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.35 2003/02/15 17:12:53 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.36 2004/07/14 21:58:17 simon Exp $ .\" -.Dd October 7, 2001 +.Dd July 14, 2004 .Dt ED 4 .Os .Sh NAME @@ -45,12 +45,6 @@ driver provides support for 8 and 16bit ethernet cards that are based on the National Semiconductor DS8390 and similar NICs manufactured by other companies. .Pp -It supports all 80x3 series ethernet cards manufactured by Western Digital and SMC, -the SMC Ultra, the 3Com 3c503, the Novell NE1000/NE2000 and compatible cards, -the HP PC Lan+, the RealTek 8029, -and the Digital Equipment EtherWorks DE305 card. -ISA, PCI and PC Card devices are supported. -.Pp The .Nm driver uses a unique multi-buffering mechanism to achieve high transmit performance. @@ -104,6 +98,29 @@ option to .Xr ifconfig 8 (BNC is the default). +.Sh HARDWARE +The +.Nm +driver supports the following Ethernet NICs: +.Pp +.Bl -bullet -compact +.It +3Com 3c503 +.It +Digital Equipment EtherWorks DE305 +.It +HP PC Lan+ +.It +Novell NE1000/NE2000 and compatible +.It +RealTek 8029 +.It +SMC Ultra +.It +Western Digital and SMC 80x3 series +.El +.Pp +ISA, PCI and PC Card devices are supported. .Sh DIAGNOSTICS .Bl -diag .It "ed%d: kernel configured irq %d doesn't match board configured irq %d." ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/my.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/my.4,v 1.3 2003/08/31 19:37:48 simon Exp $ +.\" $FreeBSD: src/share/man/man4/my.4,v 1.4 2004/07/14 21:58:17 simon Exp $ .\" -.Dd May 16, 2003 +.Dd July 14, 2004 .Dt MY 4 .Os .Sh NAME @@ -38,6 +38,13 @@ .Nm driver provides support for various NICs based on the Myson chipset. The Myson chipset is a variant of the DEC Tulip NIC chipset. +.Pp +The driver will work with almost any MII-compliant PHY, thus failure to +positively identify the chip is not a fatal error. +.Sh HARDWARE +The +.Nm +driver provides support for various NICs based on the Myson chipset. Supported models include: .Pp .Bl -bullet -compact @@ -48,9 +55,6 @@ .It Myson MTD89X PCI Gigabit Ethernet chip .El -.Pp -The driver will work with almost any MII-compliant PHY, thus failure to -positively identify the chip is not a fatal error. .Sh SEE ALSO .Xr de 4 , .Xr miibus 4 , ==== //depot/projects/davidxu_ksedbg/src/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.92 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.93 2004/07/15 08:25:59 phk Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -274,6 +274,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: + return (EOPNOTSUPP); break; } return error; ==== //depot/projects/davidxu_ksedbg/src/sys/cam/cam_periph.h#2 (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/cam/cam_periph.h,v 1.13 2003/03/08 08:01:26 phk Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.14 2004/07/15 08:25:59 phk Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -53,6 +53,8 @@ case MOD_UNLOAD: \ printf(#name " module unload - not possible for this module type\n"); \ return EINVAL; \ + default: \ + return EOPNOTSUPP; \ } \ return 0; \ } \ ==== //depot/projects/davidxu_ksedbg/src/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.141 2004/06/21 19:01:55 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.142 2004/07/15 08:25:59 phk Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -1348,6 +1348,8 @@ xpt_init(NULL); } else if (what == MOD_UNLOAD) { return EBUSY; + } else { + return EOPNOTSUPP; } return 0; ==== //depot/projects/davidxu_ksedbg/src/sys/coda/coda_fbsd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.35 2004/06/17 17:16:40 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.36 2004/07/15 08:25:59 phk Exp $"); #include "vcoda.h" @@ -90,9 +90,9 @@ case MOD_LOAD: break; case MOD_UNLOAD: - break; + return (EBUSY); default: - break; + return (EOPNOTSUPP); } return 0; } ==== //depot/projects/davidxu_ksedbg/src/sys/compat/svr4/svr4_sysvec.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.36 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.37 2004/07/15 08:26:00 phk Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -411,6 +411,7 @@ printf("svr4 ELF exec handler removed\n"); break; default: + return (EOPNOTSUPP); break; } return error; ==== //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1244 2004/07/11 01:44:07 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1245 2004/07/15 07:52:27 roam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1932,7 +1932,7 @@ # # The 'bktr' device is a PCI video capture device using the Brooktree # bt848/bt848a/bt849a/bt878/bt879 chipset. When used with a TV Tuner it forms a -# TV card, eg Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, +# TV card, e.g. Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, # Intel Smart Video III, AverMedia, IMS Turbo, FlyVideo. # # options OVERRIDE_CARD=xxx @@ -1948,11 +1948,11 @@ # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC # Specifies the default video capture mode. # This is required for Dual Crystal (28&35Mhz) boards where PAL is used -# to prevent hangs during initialisation. eg VideoLogic Captivator PCI. +# to prevent hangs during initialisation, e.g. VideoLogic Captivator PCI. # # options BKTR_USE_PLL -# PAL or SECAM users who have a 28Mhz crystal (and no 35Mhz crystal) -# must enable PLL mode with this option. eg some new Bt878 cards. +# This is required for PAL or SECAM boards with a 28Mhz crystal and no 35Mhz +# crystal, e.g. some new Bt878 cards. # # options BKTR_GPIO_ACCESS # This enable IOCTLs which give user level access to the GPIO port. ==== //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#4 (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/dev/acpica/acpi_cmbat.c,v 1.32 2004/07/12 20:53:04 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.33 2004/07/14 19:31:31 marks Exp $ */ #include "opt_acpi.h" @@ -519,6 +519,15 @@ valid_units++; bat[i]->cap = 100 * bat[i]->bst.cap / bat[i]->bif.lfcap; + + /* + * Some laptops report the "design-capacity" instead of the + * "real-capacity" when the battery is fully charged. + * That breaks the above arithmetic as it needs to be 100% maximum. + */ + if (bat[i]->cap > 100) + bat[i]->cap = 100; + batt_stat |= bat[i]->bst.state; if (bat[i]->bst.rate > 0) { ==== //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx_osm.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.16 2003/12/17 00:02:09 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.17 2004/07/15 08:26:00 phk Exp $"); #include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_inline.h> @@ -1540,6 +1540,7 @@ ahd_modevent(module_t mod, int type, void *data) { /* XXX Deal with busy status on unload. */ + /* XXX Deal with unknown events */ return 0; } ==== //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407151211.i6FCBWCr053721>