Date: Fri, 22 Oct 2004 03:43:59 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63497 for review Message-ID: <200410220343.i9M3hxmB071524@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63497 Change 63497 by peter@peter_daintree on 2004/10/22 03:43:21 IFC @63496 Affected files ... .. //depot/projects/hammer/contrib/libreadline/complete.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#5 integrate .. //depot/projects/hammer/contrib/libreadline/rlconf.h#4 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/terminal.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#4 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/mbuf.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/nls.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/rcfile.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/rq.c#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#38 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#31 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#7 integrate .. //depot/projects/hammer/etc/rc.d/savecore#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#22 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#3 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#7 integrate .. //depot/projects/hammer/release/Makefile#64 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#13 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#9 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#38 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#25 integrate .. //depot/projects/hammer/share/zoneinfo/Makefile#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#13 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#41 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#36 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#15 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#31 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#30 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#41 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#57 integrate .. //depot/projects/hammer/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#33 integrate .. //depot/projects/hammer/sys/net/if_var.h#22 integrate .. //depot/projects/hammer/sys/netinet/in.h#15 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#13 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#23 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#43 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#44 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#22 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#19 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#26 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.h#4 integrate .. //depot/projects/hammer/sys/sys/buf.h#15 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#1 branch .. //depot/projects/hammer/sys/sys/ktr.h#6 integrate .. //depot/projects/hammer/sys/sys/protosw.h#7 integrate .. //depot/projects/hammer/sys/sys/vnode.h#31 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#15 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#16 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#25 integrate .. //depot/projects/hammer/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#30 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#4 integrate .. //depot/projects/hammer/usr.bin/fstat/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#10 integrate .. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/ntpdate.8#3 integrate .. //depot/projects/hammer/usr.sbin/ugidfw/ugidfw.c#3 integrate .. //depot/projects/hammer/usr.sbin/zic/zic.c#4 integrate Differences ... ==== //depot/projects/hammer/contrib/libreadline/complete.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.11 2004/10/21 23:45:57 ache Exp $ */ + /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2004 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/display.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.8 2004/10/21 23:45:57 ache Exp $ */ + /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2004 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/doc/readline.3#5 (text+ko) ==== @@ -12,6 +12,7 @@ .\" .\" File Name macro. This used to be `.PN', for Path Name, .\" but Sun doesn't seem to like that very much. +.\" $FreeBSD: src/contrib/libreadline/doc/readline.3,v 1.10 2004/10/21 23:45:57 ache Exp $ .\" .de FN \fI\|\\$1\|\fP ==== //depot/projects/hammer/contrib/libreadline/rlconf.h#4 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/rlconf.h,v 1.7 2004/10/21 23:45:57 ache Exp $ */ + /* rlconf.h -- readline configuration definitions */ /* Copyright (C) 1994 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/shell.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/shell.c,v 1.9 2004/10/21 23:45:57 ache Exp $ */ + /* shell.c -- readline utility functions that are normally provided by bash when readline is linked as part of the shell. */ ==== //depot/projects/hammer/contrib/libreadline/terminal.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/terminal.c,v 1.7 2004/10/21 23:45:57 ache Exp $ */ + /* terminal.c -- controlling the terminal with termcap. */ /* Copyright (C) 1996 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/util.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/util.c,v 1.10 2004/10/21 23:45:57 ache Exp $ */ + /* util.c -- readline utility functions */ /* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/vi_mode.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.4 2004/10/21 23:45:57 ache Exp $ */ + /* vi_mode.c -- A vi emulation mode for Bash. Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */ ==== //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $ - * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.2 2003/07/26 04:03:18 peter Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.3 2004/10/19 17:44:31 obrien Exp $ */ #include <sys/types.h> @@ -38,6 +38,7 @@ #include <sys/sysctl.h> #include <ctype.h> #include <errno.h> +#include <string.h> #ifdef APPLE #include <sys/types.h> ==== //depot/projects/hammer/contrib/smbfs/lib/smb/mbuf.c#2 (text+ko) ==== @@ -32,8 +32,12 @@ * $Id: mbuf.c,v 1.6 2001/02/24 15:56:04 bp Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.2 2004/10/19 17:44:31 obrien Exp $"); + #include <sys/types.h> #include <sys/mchain.h> +#include <arpa/inet.h> #include <ctype.h> #include <errno.h> #include <stdio.h> ==== //depot/projects/hammer/contrib/smbfs/lib/smb/nls.c#2 (text+ko) ==== @@ -32,6 +32,9 @@ * $Id: nls.c,v 1.10 2002/07/22 08:33:59 bp Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nls.c,v 1.2 2004/10/19 17:39:15 obrien Exp $"); + #include <sys/types.h> #include <sys/iconv.h> #include <sys/sysctl.h> @@ -41,7 +44,7 @@ #endif #include <errno.h> #include <stdio.h> -#include <strings.h> +#include <string.h> #include <stdlib.h> #include <locale.h> #include <err.h> @@ -125,7 +128,7 @@ nls_str_toloc(char *dst, const char *src) { char *p = dst; - int inlen, outlen; + size_t inlen, outlen; if (!iconv_loaded) return strcpy(dst, src); @@ -147,7 +150,7 @@ nls_str_toext(char *dst, const char *src) { char *p = dst; - int inlen, outlen; + size_t inlen, outlen; if (!iconv_loaded) return strcpy(dst, src); @@ -170,7 +173,7 @@ { char *p = dst; const char *s = src; - int inlen, outlen; + size_t inlen, outlen; if (!iconv_loaded) return memcpy(dst, src, size); @@ -195,7 +198,7 @@ { char *p = dst; const char *s = src; - int inlen, outlen; + size_t inlen, outlen; if (size == 0) return NULL; ==== //depot/projects/hammer/contrib/smbfs/lib/smb/rcfile.c#2 (text+ko) ==== @@ -31,6 +31,10 @@ * * $Id: rcfile.c,v 1.5 2001/04/16 12:46:46 bp Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/rcfile.c,v 1.2 2004/10/19 17:44:31 obrien Exp $"); + #include <sys/types.h> #include <sys/queue.h> #include <ctype.h> @@ -344,7 +348,7 @@ if (error) return error; if (strlen(value) >= maxlen) { - warnx("line too long for key '%s' in section '%s', max = %d\n", key, section, maxlen); + warnx("line too long for key '%s' in section '%s', max = %zd\n", key, section, maxlen); return EINVAL; } strcpy(dest, value); ==== //depot/projects/hammer/contrib/smbfs/lib/smb/rq.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Id: rq.c,v 1.7 2001/04/16 04:33:01 bp Exp $ - * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.2 2004/07/28 05:33:58 kan Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.3 2004/10/19 17:44:31 obrien Exp $ */ #include <sys/param.h> #include <sys/ioctl.h> @@ -40,7 +40,7 @@ #include <err.h> #include <stdio.h> #include <unistd.h> -#include <strings.h> +#include <string.h> #include <stdlib.h> #include <sysexits.h> ==== //depot/projects/hammer/etc/defaults/rc.conf#38 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.225 2004/10/13 07:12:14 ru Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.226 2004/10/20 16:58:27 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -55,6 +55,7 @@ gbde_swap_enable="NO" # Set to YES to automatically initialize gbde swap # devices listed in fstab with a random one-shot key +root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.309 2004/10/18 17:03:53 wollman Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.310 2004/10/19 17:32:56 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -1166,8 +1166,8 @@ Africa .. America - Argentina - .. + Argentina + .. Indiana .. Kentucky ==== //depot/projects/hammer/etc/rc.d/dumpon#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.6 2004/10/18 14:59:53 thomas Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.7 2004/10/18 23:40:13 thomas Exp $ # # PROVIDE: dumpon @@ -26,7 +26,11 @@ while read dev mp type more ; do [ "${type}" = "swap" ] || continue [ -c "${dev}" ] || continue - /sbin/dumpon -v "${dev}" 2>/dev/null && return 0 + if /sbin/dumpon -v "${dev}" 2>/dev/null; then + # Make a symlink in devfs for savecore + ln -s ${dev} /dev/dumpdev + return 0 + fi done </etc/fstab echo "No suitable dump device was found." 1>&2 return 1 @@ -43,6 +47,7 @@ [Nn][Oo] | '') ;; *) + rm -f /dev/dumpdev /sbin/dumpon -v off ;; esac ==== //depot/projects/hammer/etc/rc.d/savecore#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/savecore,v 1.8 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.9 2004/10/18 23:40:13 thomas Exp $ # # PROVIDE: savecore @@ -29,6 +29,9 @@ debug 'No dump device. Quitting.' return 1 ;; + [Aa][Uu][Tt][Oo]) + dumpdev=/dev/dumpdev + ;; esac # If there is no crash directory set it now @@ -50,8 +53,8 @@ savecore_start() { - echo "Checking for core dump on ${dumpdev} ..." - savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} + echo "Checking for core dump on ${dumpdev}..." + savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} } load_rc_config $name ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#22 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.79 2004/07/13 22:52:11 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.80 2004/10/21 03:42:24 davidxu Exp $ */ #include <sys/param.h> #include <sys/types.h> @@ -705,6 +705,10 @@ KSE_LOCK_RELEASE(curkse, &_thread_list_lock); if (kmbx != NULL) kse_wakeup(kmbx); + if (suspended_thread != NULL) + _thr_ref_delete(NULL, suspended_thread); + if (signaled_thread != NULL) + _thr_ref_delete(NULL, signaled_thread); return (NULL); } else if (!SIGISMEMBER(pthread->sigmask, sig)) { /* ==== //depot/projects/hammer/lib/libsmb/Makefile#3 (text+ko) ==== @@ -1,18 +1,18 @@ -# $FreeBSD: src/lib/libsmb/Makefile,v 1.3 2002/09/28 00:25:31 peter Exp $ +# $FreeBSD: src/lib/libsmb/Makefile,v 1.5 2004/10/19 18:07:26 obrien Exp $ -LIB= smb +CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +.PATH: ${CONTRIBDIR}/lib/smb +LIB= smb SHLIB_MAJOR= 1 - NOMAN= SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ kiconv.c \ nb.c nb_name.c nb_net.c nbns_rq.c -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs -CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include -.PATH: ${CONTRIBDIR}/lib/smb +WARNS?= 2 +CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include .include <bsd.lib.mk> ==== //depot/projects/hammer/lib/libugidfw/ugidfw.c#7 (text+ko) ==== @@ -28,13 +28,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.6 2004/03/11 09:56:04 bde Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.7 2004/10/21 11:21:13 rwatson Exp $ */ #include <sys/param.h> #include <sys/errno.h> #include <sys/time.h> #include <sys/sysctl.h> -#include <sys/vnode.h> #include <security/mac_bsdextended/mac_bsdextended.h> @@ -178,10 +177,10 @@ left -= len; cur += len; - anymode = (rule->mbr_mode & VALLPERM); - unknownmode = (rule->mbr_mode & ~VALLPERM); + anymode = (rule->mbr_mode & MBI_ALLPERM); + unknownmode = (rule->mbr_mode & ~MBI_ALLPERM); - if (rule->mbr_mode & VADMIN) { + if (rule->mbr_mode & MBI_ADMIN) { len = snprintf(cur, left, "a"); if (len < 0 || len > left) goto truncated; @@ -189,7 +188,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VREAD) { + if (rule->mbr_mode & MBI_READ) { len = snprintf(cur, left, "r"); if (len < 0 || len > left) goto truncated; @@ -197,7 +196,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VSTAT) { + if (rule->mbr_mode & MBI_STAT) { len = snprintf(cur, left, "s"); if (len < 0 || len > left) goto truncated; @@ -205,7 +204,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VWRITE) { + if (rule->mbr_mode & MBI_WRITE) { len = snprintf(cur, left, "w"); if (len < 0 || len > left) goto truncated; @@ -213,7 +212,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VEXEC) { + if (rule->mbr_mode & MBI_EXEC) { len = snprintf(cur, left, "x"); if (len < 0 || len > left) goto truncated; @@ -425,19 +424,19 @@ for (i = 0; i < strlen(argv[0]); i++) { switch (argv[0][i]) { case 'a': - *mode |= VADMIN; + *mode |= MBI_ADMIN; break; case 'r': - *mode |= VREAD; + *mode |= MBI_READ; break; case 's': - *mode |= VSTAT; + *mode |= MBI_STAT; break; case 'w': - *mode |= VWRITE; + *mode |= MBI_WRITE; break; case 'x': - *mode |= VEXEC; + *mode |= MBI_EXEC; break; case 'n': /* ignore */ ==== //depot/projects/hammer/release/Makefile#64 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.865 2004/09/30 22:59:47 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.866 2004/10/21 08:54:10 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -586,7 +586,8 @@ # Install the system into the various distributions. release.2: cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base - cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees + cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \ + DISTDIR=${RD}/trees touch ${.TARGET} # Make and install the generic kernel(s). ==== //depot/projects/hammer/sbin/fdisk/fdisk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.74 2004/06/14 07:21:19 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.75 2004/10/20 05:43:45 ru Exp $"); #include <sys/disk.h> #include <sys/disklabel.h> @@ -302,7 +302,7 @@ if (stat(argv[0], &sb) == 0) { /* OK, full pathname given */ disk = argv[0]; - } else if (errno == ENOENT) { + } else if (errno == ENOENT && argv[0][0] != '/') { /* Try prepending "/dev" */ asprintf(&disk, "%s%s", _PATH_DEV, argv[0]); if (disk == NULL) ==== //depot/projects/hammer/sbin/fsck_ffs/fsck.h#9 (text+ko) ==== @@ -8,6 +8,27 @@ * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS * research program. * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * * Copyright (c) 1980, 1986, 1993 * The Regents of the University of California. All rights reserved. * @@ -36,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.33 2004/10/08 20:44:47 truckman Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.34 2004/10/20 08:01:32 rwatson Exp $ */ #include <unistd.h> ==== //depot/projects/hammer/share/man/man5/rc.conf.5#38 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.228 2004/10/17 13:19:10 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.230 2004/10/20 19:05:50 keramida Exp $ .\" -.Dd September 29, 2004 +.Dd October 20, 2004 .Dt RC.CONF 5 .Os .Sh NAME @@ -1093,6 +1093,19 @@ .Pa /etc/fstab will be initialized with a random, one-shot key. Note that this makes recovery of kernel dumps impossible. +.It Va root_rw_mount +.Pq Vt bool +Set to +.Dq Li YES +by default. +After the file systems are checked at boot time, the root file system +is remounted as read-write if this is set to +.Dq Li YES . +Diskless systems that mount their root file system from a read-only remote +NFS share should set this to +.Dq Li NO +in their +.Pa rc.conf . .It Va fsck_y_enable .Pq Vt bool If set to ==== //depot/projects/hammer/share/mk/bsd.cpu.mk#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.44 2004/10/17 05:19:45 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.45 2004/10/19 17:25:33 obrien Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -102,6 +102,9 @@ . else _ICC_CPUCFLAGS = . endif # ICC on 'i386' +. if ${CPUTYPE} == "i386" +CFLAGS += -DI386_CPU +. endif . elif ${MACHINE_ARCH} == "alpha" _CPUCFLAGS = -mcpu=${CPUTYPE} . elif ${MACHINE_ARCH} == "amd64" ==== //depot/projects/hammer/share/zoneinfo/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/zoneinfo/Makefile,v 1.19 2002/07/29 09:40:14 ru Exp $ +# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20 2004/10/19 20:38:49 ru Exp $ CLEANFILES+= yearistype @@ -16,23 +16,13 @@ TZFILES+= backward .endif -.if exists(${.OBJDIR}/yearistype) -YEARISTYPE= ${.OBJDIR}/yearistype -.else -YEARISTYPE= ${.CURDIR}/yearistype -.endif - all: yearistype -yearistype: yearistype.sh - cp ${.ALLSRC} ${.TARGET} - chmod +x ${.TARGET} - beforeinstall: umask 022; cd ${.CURDIR}; \ zic -D -d ${DESTDIR}/usr/share/zoneinfo -p ${POSIXRULES} \ - -u ${BINOWN} -g ${BINGRP} \ - ${LEAPFILE} -y ${YEARISTYPE} ${TZFILES} + -u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ ==== //depot/projects/hammer/sys/alpha/alpha/promcons.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.42 2004/10/18 21:51:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -107,7 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttyconsmode(tp, 0); + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.4 2004/09/23 21:57:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.5 2004/10/21 11:59:33 cognet Exp $"); /* * MacPPC bus dma support routines @@ -687,7 +687,7 @@ int resid; struct iovec *iov; - if (op == BUS_DMASYNC_POSTREAD) + if (op == BUS_DMASYNC_POSTWRITE) return; if (map->flags & DMAMAP_COHERENT) return; ==== //depot/projects/hammer/sys/dev/aac/aac_pci.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.48 2004/08/13 01:44:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.49 2004/10/21 19:14:32 scottl Exp $"); /* * PCI bus interface and resource allocation. @@ -132,6 +132,8 @@ "Dell CERC SATA RAID 2"}, {0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, "Adaptec SCSI RAID 2810SA"}, + {0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, + "Adaptec SCSI RAID 21610SA"}, {0x9005, 0x0286, 0x9005, 0x028d, AAC_HWIF_RKT, 0, "Adaptec SCSI RAID 2130S"}, {0, 0, 0, 0, 0, 0, 0} ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#15 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.102 2004/08/17 00:14:30 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.103 2004/10/19 20:48:05 gibbs Exp $"); #include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_inline.h> #include <dev/aic7xxx/aicasm/aicasm_insformat.h> @@ -2828,11 +2828,17 @@ case MSG_TYPE_TARGET_MSGIN: { int msgdone; - int msgout_request; if (ahc->msgout_len == 0) panic("Target MSGIN with no active message"); +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf("TARGET_MSG_IN"); + } +#endif + /* * If we interrupted a mesgout session, the initiator * will not know this until our first REQ. So, we @@ -2840,24 +2846,47 @@ * first byte. */ if ((ahc_inb(ahc, SCSISIGI) & ATNI) != 0 - && ahc->msgout_index > 0) - msgout_request = TRUE; - else - msgout_request = FALSE; + && ahc->msgout_index > 0) { + + /* + * Change gears and see if this messages is + * of interest to us or should be passed back + * to the sequencer. + */ +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" Honoring ATN Request.\n"); +#endif + ahc->msg_type = MSG_TYPE_TARGET_MSGOUT; - if (msgout_request) { + /* + * Disable SCSI Programmed I/O during the + * phase change so as to avoid phantom REQs. + */ + ahc_outb(ahc, SXFRCTL0, + ahc_inb(ahc, SXFRCTL0) & ~SPIOEN); /* - * Change gears and see if - * this messages is of interest to - * us or should be passed back to - * the sequencer. + * Since SPIORDY asserts when ACK is asserted + * for P_MSGOUT, and SPIORDY's assertion triggered + * our entry into this routine, wait for ACK to + * *de-assert* before changing phases. */ - ahc->msg_type = MSG_TYPE_TARGET_MSGOUT; + while ((ahc_inb(ahc, SCSISIGI) & ACKI) != 0) + ; + ahc_outb(ahc, SCSISIGO, P_MESGOUT | BSYO); + + /* + * All phase line changes require a bus + * settle delay before REQ is asserted. + * [SCSI SPI4 10.7.1] + */ + ahc_flush_device_writes(ahc); + aic_delay(AHC_BUSSETTLE_DELAY); + ahc->msgin_index = 0; - /* Dummy read to REQ for first byte */ - ahc_inb(ahc, SCSIDATL); + /* Enable SCSI Programmed I/O to REQ for first byte */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); break; @@ -2874,6 +2903,11 @@ /* * Present the next byte on the bus. */ +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" byte 0x%x\n", + ahc->msgout_buf[ahc->msgout_index]); +#endif ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); ahc_outb(ahc, SCSIDATL, ahc->msgout_buf[ahc->msgout_index++]); break; @@ -2883,6 +2917,12 @@ int lastbyte; int msgdone; +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf("TARGET_MSG_OUT"); + } +#endif /* * The initiator signals that this is * the last byte by dropping ATN. @@ -2896,6 +2936,13 @@ */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) & ~SPIOEN); ahc->msgin_buf[ahc->msgin_index] = ahc_inb(ahc, SCSIDATL); + +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" byte 0x%x\n", + ahc->msgin_buf[ahc->msgin_index]); +#endif + msgdone = ahc_parse_msg(ahc, &devinfo); if (msgdone == MSGLOOP_TERMINATED) { /* @@ -2921,7 +2968,33 @@ * to the Message in phase and send it. */ if (ahc->msgout_len != 0) { +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf(" preparing response.\n"); + } +#endif ahc_outb(ahc, SCSISIGO, P_MESGIN | BSYO); + + /* + * All phase line changes require a bus + * settle delay before REQ is asserted. + * [SCSI SPI4 10.7.1] When transitioning + * from an OUT to an IN phase, we must + * also wait a data release delay to allow + * the initiator time to release the data + * lines. [SCSI SPI4 10.12] + */ + ahc_flush_device_writes(ahc); + aic_delay(AHC_BUSSETTLE_DELAY + + AHC_DATARELEASE_DELAY); + + /* + * Enable SCSI Programmed I/O. This will + * immediately cause SPIORDY to assert, + * and the sequencer will call our message + * loop again. + */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); ahc->msg_type = MSG_TYPE_TARGET_MSGIN; @@ -7052,7 +7125,7 @@ active_scb = ahc_lookup_scb(ahc, active_scb_index); if (active_scb != scb) { if (ahc_other_scb_timeout(ahc, scb, - active_scb) != 0) + active_scb) == 0) goto bus_reset; continue; } ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#10 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.52 2004/08/18 16:31:56 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.53 2004/10/19 20:48:06 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -181,6 +181,10 @@ /* Reset line assertion time in us */ #define AHC_BUSRESET_DELAY 25 +/* Phase change constants used in target mode. */ +#define AHC_BUSSETTLE_DELAY 400 +#define AHC_DATARELEASE_DELAY 400 + /******************* Chip Characteristics/Operating Settings *****************/ /* * Chip Type ==== //depot/projects/hammer/sys/dev/ata/ata-all.c#41 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.232 2004/10/13 15:16:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.233 2004/10/19 20:13:38 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -306,6 +306,12 @@ } } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410220343.i9M3hxmB071524>