5.2: will standard-supfile point to RELENG_5_2?
Jon Noack
noackjr at alumni.rice.edu
Mon Dec 8 22:18:59 PST 2003
On 12/8/2003 9:31 PM, Scott Long wrote:
> Jon Noack wrote:
>
>> On 12/8/2003 2:29 PM, Doug White wrote:
>>
>>> On Sun, 7 Dec 2003, Jon Noack wrote:
>>>
>>>
>>>> I ask this for 5.2 because it never happened for 5.1:
>>>> Will src/share/examples/cvsup/standard-supfile be updated to point to
>>>> the "RELENG_5_2" tag instead of "." for 5.2?
>>>
>>>
>>>
>>>
>>> Doubtful -- standard-supfile is for grabbing -current. If you want a
>>> specific tag, you need to specify it. I just copy the same cvsupfile
>>> around to different machines as I build them so I don't forget :)
>>>
>>> I agree that stable-supfile should be updated, though. But 5.X isn't
>>> -stable yet. :)
>>
>>
>>
>> Copying re@ on this...
>>
>> I respectfully disagree. Here's an open bug report from someone else
>> who thinks the same way I do:
>> http://www.freebsd.org/cgi/query-pr.cgi?pr=conf/53197
>>
>> Even if you disagree with me, check out the CVS commits to
>> standard-supfile:
>> http://www.freebsd.org/cgi/cvsweb.cgi/src/share/examples/cvsup/standard-supfile
>>
>>
>> A very common entry is something to the effect of:
>> "The 'standard-supfile' should track its own branch."
>>
>> (As Colin Percival just point out:)
>> From the inception of the security release branch with RELENG_4_3,
>> every release *but* 5.1 has had standard-supfile point to the security
>> release branch. That's 8 releases in my favor vs. 1 release in your
>> favor. I win ;-).
>>
>> I'd wager a lot of folks used to 4.x giving 5.x a try would get bitten
>> by this, accidentally upgrading to -CURRENT and possibly hosing their
>> systems as a result.
>>
>> In any case, the only color for the shed is midnight blue.
>> Jon
>>
>>
>
> There was discussion about this after 5.1 too. Basically, we need to
> create another cvsup example file, one for RELENG_4, one for RELENG_5_x,
> and one for HEAD. Does this lead us down the road to having even more
> example files? What about one for RELENG_4_9? I guess I'm not opposed
> to this. If someone will submit a patch, I'll consider it.
>
> Scott
This is what I envision:
current-supfile gets you -CURRENT
stable-supfile get you -STABLE
standard-supfile gets you updates to what you have
The following should accomplish this without breaking prior functionality:
For all:
current-supfile tracks -CURRENT ("." tag)
stable-supfile tracks -STABLE (currently "RELENG_4" tag)
For -CURRENT:
standard-supfile tracks -CURRENT ("." tag)
For -STABLE:
standard-supfile tracks -STABLE (currently "RELENG_4" tag)
For releases:
standard-supfile tracks the release branch ("RELENG_5_2" tag for 5.2)
The attached "supfile-current.diff" adds current-supfile (based on the
old standard-supfile). I didn't touch the CVS info at the top of the
file -- this is automatically updated when the file is checked in, right?
The attached "supfile-5.2.diff" updates the standard-supfile for 5.2 to
reflect this scheme by changing the CVS tag to RELENG_5_2 and modifying
a comment for accuracy.
The attached "supfile-README.diff" updates the README to reflect this
scheme (I pulled part of the text from the RELENG_4_9 README). It
should be fine for everything (releases, -CURRENT, and -STABLE).
This shouldn't require any further documentation from the re@
perspective, as src/share/examples/cvsup/standard-supfile is already
included in the list of files to modify before release:
http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/article.html#VERSIONBUMP
Jon
-------------- next part --------------
diff -ruN src/share/examples/cvsup.old/current-supfile src/share/examples/cvsup/current-supfile
--- src/share/examples/cvsup.old/current-supfile Wed Dec 31 18:00:00 1969
+++ src/share/examples/cvsup/current-supfile Mon Dec 8 23:22:11 2003
@@ -0,0 +1,94 @@
+# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.22 2003/09/18 08:19:39 eivind Exp $
+#
+# This file contains all of the "CVSup collections" that make up the
+# FreeBSD-current source tree.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing). If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
+#
+# cvsup current-supfile
+#
+# If not running X, or invoking cvsup from a non-interactive script, then
+# run it as follows:
+#
+# cvsup -g -L 2 current-supfile
+#
+# 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/mirrors.html.
+# You can override this setting on the command line
+# with cvsup's "-h host" option.
+#
+# base=/usr
+# This specifies the root where CVSup will store information
+# about the collections you have transferred to your system.
+# A setting of "/usr" will generate this information in
+# /usr/sup. Even if you are CVSupping a large number of
+# collections, you will be hard pressed to generate more than
+# ~1MB of data in this directory. 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/src" (e.g., "/usr/src/bin", "/usr/src/lib").
+# 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/mirrors.html.
+*default host=CHANGE_THIS.FreeBSD.org
+*default base=/usr
+*default prefix=/usr
+*default release=cvs tag=.
+*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
+
+## Main Source Tree.
+#
+# 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-contrib
+#src-etc
+#src-games
+#src-gnu
+#src-include
+#src-kerberos5
+#src-kerberosIV
+#src-lib
+#src-libexec
+#src-release
+#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
-------------- next part --------------
diff -ruN src/share/examples/cvsup.old/standard-supfile src/share/examples/cvsup/standard-supfile
--- src/share/examples/cvsup.old/standard-supfile Sun Dec 7 16:43:42 2003
+++ src/share/examples/cvsup/standard-supfile Mon Dec 8 23:25:21 2003
@@ -1,7 +1,7 @@
# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.22 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
-# FreeBSD-current source tree.
+# FreeBSD 5.2 release branch of the source tree.
#
# CVSup (CVS Update Protocol) allows you to download the latest CVS
# tree (or any branch of development therefrom) to your system easily
@@ -51,7 +51,7 @@
*default host=CHANGE_THIS.FreeBSD.org
*default base=/usr
*default prefix=/usr
-*default release=cvs tag=.
+*default release=cvs tag=RELENG_5_2
*default delete use-rel-suffix
# If you seem to be limited by CPU rather than network or disk bandwidth, try
-------------- next part --------------
--- src/share/examples/cvsup.old/README Tue Jul 30 09:08:16 2002
+++ src/share/examples/cvsup/README Tue Dec 9 00:06:48 2003
@@ -5,9 +5,13 @@
with CVSup version 14.0 or later. For general information on CVSup
itself, please see http://www.freebsd.org/doc/handbook/cvsup.html
-To maintain the sources for the FreeBSD-current release, use:
+To maintain the sources for this branch, use:
standard-supfile Main source tree
+
+To maintain the sources for the FreeBSD-current release, use:
+
+ current-supfile Main source tree
ports-supfile Ports collection
More information about the freebsd-current
mailing list