summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorneel <neel@FreeBSD.org>2013-01-09 02:26:50 +0000
committerneel <neel@FreeBSD.org>2013-01-09 02:26:50 +0000
commit81ba473dd71550d4823c0578bcf7b6fe0a0d131b (patch)
treeebef40b2ced61af520e0db1721fc0ed8d32756a7 /share
parent3690b68127142ebb2d5a307cb397988a0090adae (diff)
parentadbb26d90e65096c624bfb3266509b976ccca2da (diff)
downloadFreeBSD-src-81ba473dd71550d4823c0578bcf7b6fe0a0d131b.zip
FreeBSD-src-81ba473dd71550d4823c0578bcf7b6fe0a0d131b.tar.gz
IFC @ r245178
Diffstat (limited to 'share')
-rw-r--r--share/examples/Makefile1
-rw-r--r--share/examples/cvsup/README14
-rw-r--r--share/examples/cvsup/cvs-supfile120
-rw-r--r--share/examples/cvsup/gnats-supfile60
-rw-r--r--share/examples/cvsup/ports-supfile84
-rw-r--r--share/examples/cvsup/stable-supfile41
-rw-r--r--share/examples/cvsup/standard-supfile41
-rw-r--r--share/man/man4/mps.417
-rw-r--r--share/man/man9/sleep.912
-rw-r--r--share/misc/committers-ports.dot3
-rw-r--r--share/mk/bsd.cpu.mk6
11 files changed, 73 insertions, 326 deletions
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 5cfd76b..5657d3e 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -52,7 +52,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
csh/dot.cshrc \
cvsup/README \
cvsup/cvs-supfile \
- cvsup/gnats-supfile \
cvsup/ports-supfile \
cvsup/refuse \
cvsup/refuse.README \
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index e025e8f..19ae270 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,5 +1,15 @@
# $FreeBSD$
+BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+
+The primary development work happens in Subversion and is temporarily
+exported to the legacy CVS system with significant time delays.
+
+You should NOT set up a new consumer of FreeBSD source code via CVS.
+Please see:
+http://www.freebsd.org/doc/handbook/svn.html
+http://www.freebsd.org/doc/handbook/svn-mirrors.html
+
This directory contains sample "supfiles" for obtaining and updating
the FreeBSD sources via the Internet. These supfiles will work
with CVSup version 14.0 or later. For general information on CVSup
@@ -20,10 +30,6 @@ FreeBSD, use:
cvs-supfile Main source tree and ports collection
-To maintain a copy of the FreeBSD bug database, use the file:
-
- gnats-supfile FreeBSD bug database
-
IMPORTANT: Before you use any of the supfiles in this directory,
you will need to edit in an appropriate "host" setting. See:
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index b4edfdc..f46d051 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,7 +1,14 @@
# $FreeBSD$
#
-# This file contains all of the "CVSup collections" that make up the
-# CVS development tree of the FreeBSD system.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
#
# csup (CVS Update Protocol) allows you to download the latest CVS
# tree (or any branch of development therefrom) to your system easily
@@ -61,36 +68,6 @@
# mega-collection. It includes all of the individual "src-*" collections.
src-all
-# These are the individual collections that make up "src-all". If you
-# use these, be sure to comment out "src-all" above.
-#src-base
-#src-bin
-#src-cddl
-#src-contrib
-#src-etc
-#src-games
-#src-gnu
-#src-include
-#src-kerberos5
-#src-kerberosIV
-#src-lib
-#src-libexec
-#src-release
-#src-rescue
-#src-sbin
-#src-share
-#src-sys
-#src-tools
-#src-usrbin
-#src-usrsbin
-# These are the individual collections that make up FreeBSD's crypto
-# collection. They are no longer export-restricted and are a part of
-# src-all
-#src-crypto
-#src-eBones
-#src-secure
-#src-sys-crypto
-
## Ports Collection.
#
# The easiest way to get the ports tree is to use the "ports-all"
@@ -98,77 +75,6 @@ src-all
# collections,
ports-all
-# These are the individual collections that make up "ports-all". If you
-# use these, be sure to comment out "ports-all" above and always include
-# "ports-base" if you use any of the other individual collections below.
-# Your ports may not build correctly without an up-to-date "ports-base".
-#
-#ports-base
-#
-#ports-accessibility
-#ports-arabic
-#ports-archivers
-#ports-astro
-#ports-audio
-#ports-benchmarks
-#ports-biology
-#ports-cad
-#ports-chinese
-#ports-comms
-#ports-converters
-#ports-databases
-#ports-deskutils
-#ports-devel
-#ports-dns
-#ports-editors
-#ports-emulators
-#ports-finance
-#ports-french
-#ports-ftp
-#ports-games
-#ports-german
-#ports-graphics
-#ports-hebrew
-#ports-hungarian
-#ports-irc
-#ports-japanese
-#ports-java
-#ports-korean
-#ports-lang
-#ports-mail
-#ports-math
-#ports-misc
-#ports-multimedia
-#ports-net
-#ports-net-im
-#ports-net-mgmt
-#ports-net-p2p
-#ports-news
-#ports-palm
-#ports-picobsd
-#ports-polish
-#ports-ports-mgmt
-#ports-portuguese
-#ports-print
-#ports-russian
-#ports-science
-#ports-security
-#ports-shells
-#ports-sysutils
-#ports-textproc
-#ports-ukrainian
-#ports-vietnamese
-#ports-www
-#ports-x11
-#ports-x11-clocks
-#ports-x11-drivers
-#ports-x11-fm
-#ports-x11-fonts
-#ports-x11-servers
-#ports-x11-themes
-#ports-x11-toolkits
-#ports-x11-wm
-
## Projects
#
# This collection retrieves the projects tree of the FreeBSD
@@ -179,11 +85,3 @@ projects-all
#
# This is to get the control files that cvs(1) needs and the commit logs.
cvsroot-all
-
-# These are the individual collections that make up "cvsroot-all" If you
-# use these, be sure to comment out "cvsroot-all" above. "cvsroot-common"
-# is a synthetic CVSROOT that has all the modules from the other CVSROOT-*
-# directories merged into one, and merged commitlogs via symlinks.
-#cvsroot-common
-#cvsroot-src
-#cvsroot-ports
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
deleted file mode 100644
index 57e9666..0000000
--- a/share/examples/cvsup/gnats-supfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-#
-# This file contains all of the "CVSup collections" that make up the
-# FreeBSD GNATS bug report database.
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-# csup gnats-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-# This specifies the server host which will supply the
-# file updates. You must change it to one of the CVSup
-# mirror sites listed in the FreeBSD Handbook at
-# http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-# You can override this setting on the command line
-# with cvsup's "-h host" option.
-#
-# base=/var/db
-# This specifies the root where csup will store information
-# about the collections you have transferred to your system.
-# A setting of "/var/db" will generate this information in
-# /var/db/sup. You can override the "base" setting on the
-# command line with cvsup's "-b base" option. This directory
-# must exist in order to run CVSup.
-#
-# prefix=/usr
-# This specifies where to place the requested files. A
-# setting of "/usr" will place all of the files requested
-# in "/usr/gnats".
-# The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/usr
-*default release=current
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line. (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## GNATS database
-#
-gnats
-
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index 582f29f..f37af41 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,7 +1,14 @@
# $FreeBSD$
#
-# This file contains all of the "CVSup collections" that make up the
-# ports collection.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
#
# csup (CVS Update Protocol) allows you to download the latest CVS
# tree (or any branch of development therefrom) to your system easily
@@ -65,76 +72,3 @@
# mega-collection. It includes all of the individual "ports-*"
# collections,
ports-all
-
-# These are the individual collections that make up "ports-all". If you
-# use these, be sure to comment out "ports-all" above.
-
-# Be sure to ALWAYS cvsup the ports-base collection if you use any of the
-# other individual collections below. ports-base is a mandatory collection
-# for the ports collection, and your ports may not build correctly if it
-# is not kept up to date.
-#
-# Use of individual collections is not a supported configuration.
-#ports-base
-#ports-accessibility
-#ports-arabic
-#ports-archivers
-#ports-astro
-#ports-audio
-#ports-benchmarks
-#ports-biology
-#ports-cad
-#ports-chinese
-#ports-comms
-#ports-converters
-#ports-databases
-#ports-deskutils
-#ports-devel
-#ports-dns
-#ports-editors
-#ports-emulators
-#ports-finance
-#ports-french
-#ports-ftp
-#ports-games
-#ports-german
-#ports-graphics
-#ports-hebrew
-#ports-hungarian
-#ports-irc
-#ports-japanese
-#ports-java
-#ports-korean
-#ports-lang
-#ports-mail
-#ports-math
-#ports-misc
-#ports-multimedia
-#ports-net
-#ports-net-im
-#ports-net-mgmt
-#ports-net-p2p
-#ports-news
-#ports-palm
-#ports-polish
-#ports-ports-mgmt
-#ports-portuguese
-#ports-print
-#ports-russian
-#ports-science
-#ports-security
-#ports-shells
-#ports-sysutils
-#ports-textproc
-#ports-ukrainian
-#ports-vietnamese
-#ports-www
-#ports-x11
-#ports-x11-clocks
-#ports-x11-drivers
-#ports-x11-fm
-#ports-x11-fonts
-#ports-x11-servers
-#ports-x11-themes
-#ports-x11-toolkits
-#ports-x11-wm
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index c747944..54f6e89 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,7 +1,14 @@
# $FreeBSD$
#
-# This file contains all of the "CVSup collections" that make up the
-# FreeBSD-stable source tree.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
#
# csup (CVS Update Protocol) allows you to download the latest CVS
# tree (or any branch of development therefrom) to your system easily
@@ -80,33 +87,3 @@
# mega-collection. It includes all of the individual "src-*" collections.
# Please note: If you want to track -STABLE, leave this uncommented.
src-all
-
-# These are the individual collections that make up "src-all". If you
-# use these, be sure to comment out "src-all" above.
-#src-base
-#src-bin
-#src-cddl
-#src-contrib
-#src-etc
-#src-games
-#src-gnu
-#src-include
-#src-kerberos5
-#src-kerberosIV
-#src-lib
-#src-libexec
-#src-release
-#src-rescue
-#src-sbin
-#src-share
-#src-sys
-#src-tools
-#src-usrbin
-#src-usrsbin
-# These are the individual collections that make up FreeBSD's crypto
-# collection. They are no longer export-restricted and are a part of
-# src-all
-#src-crypto
-#src-eBones
-#src-secure
-#src-sys-crypto
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index b56068d..94eec5e 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,7 +1,14 @@
# $FreeBSD$
#
-# This file contains all of the "CVSup collections" that make up the
-# FreeBSD-current source tree.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
#
# csup (CVS Update Protocol) allows you to download the latest CVS
# tree (or any branch of development therefrom) to your system easily
@@ -59,33 +66,3 @@
# The easiest way to get the main source tree is to use the "src-all"
# mega-collection. It includes all of the individual "src-*" collections.
src-all
-
-# These are the individual collections that make up "src-all". If you
-# use these, be sure to comment out "src-all" above.
-#src-base
-#src-bin
-#src-cddl
-#src-contrib
-#src-etc
-#src-games
-#src-gnu
-#src-include
-#src-kerberos5
-#src-kerberosIV
-#src-lib
-#src-libexec
-#src-release
-#src-rescue
-#src-sbin
-#src-share
-#src-sys
-#src-tools
-#src-usrbin
-#src-usrsbin
-# These are the individual collections that make up FreeBSD's crypto
-# collection. They are no longer export-restricted and are a part of
-# src-all
-#src-crypto
-#src-eBones
-#src-secure
-#src-sys-crypto
diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4
index 2fbb669..6840c21 100644
--- a/share/man/man4/mps.4
+++ b/share/man/man4/mps.4
@@ -34,7 +34,7 @@
.\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#6 $
.\" $FreeBSD$
.\"
-.Dd June 30, 2012
+.Dd January 3, 2013
.Dt MPS 4
.Os
.Sh NAME
@@ -62,7 +62,7 @@ controllers and WarpDrive solid state storage cards.
.Sh HARDWARE
The
.Nm
-driver supports the following controllers:
+driver supports the following hardware:
.Pp
.Bl -bullet -compact
.It
@@ -80,6 +80,19 @@ LSI Logic SAS2116 (16 Port
.It
LSI Logic SAS2208 (8 Port
.Tn SAS )
+.It
+LSI Logic SAS2308 (8 Port
+.Tn SAS )
+.It
+LSI Logic SSS6200 Solid State Storage
+.It
+Intel Integrated RAID Module RMS25JB040
+.It
+Intel Integrated RAID Module RMS25JB080
+.It
+Intel Integrated RAID Module RMS25KB040
+.It
+Intel Integrated RAID Module RMS25KB080
.El
.Sh CONFIGURATION
To disable MSI interrupts for all
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index 665aa1e..e65a189 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -102,12 +102,11 @@ If
.Fa priority
includes the
.Dv PCATCH
-flag, pending
-signals are checked before and after sleeping, otherwise signals are
-not checked.
+flag, pending signals are allowed to interrupt the sleep, otherwise
+pending signals are ignored during the sleep.
If
.Dv PCATCH
-is set and a signal needs to be delivered,
+is set and a signal becomes pending,
.Er ERESTART
is returned if the current system call should be restarted if
possible, and
@@ -119,9 +118,10 @@ If the
.Dv PBDRY
flag is specified in addition to
.Dv PCATCH ,
-then the sleeping thread is not stopped upon delivery of
+then the sleeping thread is not stopped when
.Dv SIGSTOP
-or other stop action while it is sleeping.
+becomes pending
+or some other stop action occurs while it is sleeping.
Instead, it is woken up, with the assumption
that the stop will occur on reaching a stop
point when returning to usermode.
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index 99dcc14..af20fc0 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -140,6 +140,7 @@ maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"]
makc [label="Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25"]
mandree [label="Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"]
marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"]
+marius [label="Marius Strobl\nmarius@FreeBSD.org\n2012/12/29"]
markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"]
martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"]
mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"]
@@ -235,8 +236,10 @@ avilla -> rakuco
bapt -> bdrewery
bapt -> eadler
bapt -> jlaffaye
+bapt -> marius
beat -> decke
+beat -> marius
beat -> sperber
beat -> uqs
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 21e70ad..1b90603 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -97,13 +97,13 @@ _CPUCFLAGS = -march=${CPUTYPE}
. if ${CPUTYPE} == "xscale"
#XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself
#_CPUCFLAGS = -mcpu=xscale
-_CPUCFLAGS = -march=armv5te -D__XSCALE__ -DARM_WANT_TP_ADDRESS
+_CPUCFLAGS = -march=armv5te -D__XSCALE__
. elif ${CPUTYPE} == "armv6"
_CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6=1
. elif ${CPUTYPE} == "cortexa"
-_CPUCFLAGS = -march=armv6 -DARM_ARCH_6=1 -mfpu=vfp
+_CPUCFLAGS = -DARM_ARCH_6=1 -mfpu=vfp
. else
-_CPUCFLAGS = -mcpu=${CPUTYPE} -DARM_WANT_TP_ADDRESS
+_CPUCFLAGS = -mcpu=${CPUTYPE}
. endif
. elif ${MACHINE_ARCH} == "powerpc"
. if ${CPUTYPE} == "e500"
OpenPOWER on IntegriCloud