diff options
author | kensmith <kensmith@FreeBSD.org> | 2007-10-11 04:28:08 +0000 |
---|---|---|
committer | kensmith <kensmith@FreeBSD.org> | 2007-10-11 04:28:08 +0000 |
commit | c80a7cd238808875211d82d4b00b7dd418070388 (patch) | |
tree | d771322232aef33ec79de2b3e18d4ce9e72782ac | |
parent | 19aa36cbf7ba0aece672571a03b6221cc01cae35 (diff) | |
download | FreeBSD-src-c80a7cd238808875211d82d4b00b7dd418070388.zip FreeBSD-src-c80a7cd238808875211d82d4b00b7dd418070388.tar.gz |
To honor the birth of RELENG_7 bump HEAD to 8.0-CURRENT.
Approved by: re (implicit)
-rw-r--r-- | UPDATING | 7 | ||||
-rw-r--r-- | release/Makefile | 6 | ||||
-rw-r--r-- | share/examples/cvsup/stable-supfile | 8 | ||||
-rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
-rw-r--r-- | sys/sys/param.h | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/add/main.c | 3 |
6 files changed, 16 insertions, 12 deletions
@@ -8,8 +8,8 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: - FreeBSD 7.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: + FreeBSD 8.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: developers choose to disable these features on build machines to maximize performance. +20071010: + RELENG_7 branched. + 20071009: Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and WITHOUT_LIBTHR are set. diff --git a/release/Makefile b/release/Makefile index 90eccd2..1442891 100644 --- a/release/Makefile +++ b/release/Makefile @@ -18,16 +18,16 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=7.0-CURRENT +#BUILDNAME=8.0-CURRENT # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 7.0 +BASE = 8.0 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release # If this is a -stable snapshot, then set -#RELEASETAG=RELENG_6 +#RELEASETAG=RELENG_7 # # To test a release with a source tree containing patches and # other work. This tree will get copied instead of getting the diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile index 4b450cb..3b0c8e9 100644 --- a/share/examples/cvsup/stable-supfile +++ b/share/examples/cvsup/stable-supfile @@ -66,10 +66,10 @@ *default host=CHANGE_THIS.FreeBSD.org *default base=/var/db *default prefix=/usr -# The following line is for 6-stable. If you want 5-stable, 4-stable, -# 3-stable, or 2.2-stable, change to "RELENG_5", "RELENG_4", "RELENG_3", -# or "RELENG_2_2" respectively. -*default release=cvs tag=RELENG_6 +# The following line is for 7-stable. If you want 6-stable, 5-stable, +# 4-stable, 3-stable, or 2.2-stable, change to "RELENG_6", "RELENG_5", +# "RELENG_4", "RELENG_3", or "RELENG_2_2" respectively. +*default release=cvs tag=RELENG_7 *default delete use-rel-suffix # If you seem to be limited by CPU rather than network or disk bandwidth, try diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 036712d..3b79be9 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -31,7 +31,7 @@ # $FreeBSD$ TYPE="FreeBSD" -REVISION="7.0" +REVISION="8.0" BRANCH="CURRENT" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} diff --git a/sys/sys/param.h b/sys/sys/param.h index a52fa7d..266eb0a 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700053 /* Master, propagated to newvers */ +#define __FreeBSD_version 800000 /* Master, propagated to newvers */ #ifndef LOCORE #include <sys/types.h> diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index 0750a76..33c63ecc 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -81,7 +81,8 @@ struct { { 502100, 502128, "/packages-5-current" }, { 503100, 599000, "/packages-5-stable" }, { 600100, 699000, "/packages-6-stable" }, - { 700000, 799000, "/packages-7-current" }, + { 700000, 799000, "/packages-7-stable" }, + { 800000, 899000, "/packages-8-current" }, { 0, 9999999, "/packages-current" }, { 0, 0, NULL } }; |