diff options
| author | cwt <cwt@FreeBSD.org> | 1997-08-16 04:29:36 +0000 |
|---|---|---|
| committer | cwt <cwt@FreeBSD.org> | 1997-08-16 04:29:36 +0000 |
| commit | afda633884c66ce3e272090bea3841c106b3afe3 (patch) | |
| tree | c421fd63c170f8a515cbc4631934b0aee019cc84 /contrib/global | |
| parent | 367b31cffde8492bc20e07ae146dfabdda402c7d (diff) | |
| download | FreeBSD-src-afda633884c66ce3e272090bea3841c106b3afe3.zip FreeBSD-src-afda633884c66ce3e272090bea3841c106b3afe3.tar.gz | |
The standard upgrade procedure derived from the handbook section
on maintaining contributed software.
The merge from our FreeBSD maintained v1.81 to the author's v2.0
yielded only one small difference (a duplicate inclusion of errno.h
in btreeop/btreeop.c) which for now I will leave alone and submit
back to the author; we'll catch it on the vendor branch in v2.1.
Reviewed by: jdp
Diffstat (limited to 'contrib/global')
| -rwxr-xr-x | contrib/global/FREEBSD-upgrade | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/contrib/global/FREEBSD-upgrade b/contrib/global/FREEBSD-upgrade new file mode 100755 index 0000000..8656713 --- /dev/null +++ b/contrib/global/FREEBSD-upgrade @@ -0,0 +1,36 @@ +GLOBAL + +This directory contains virgin sources of the original distribution files on +a "vendor" branch. Do not, under any circumstances, attempt to upgrade the +files in this directory via patches and a cvs commit. New versions or +official-patch versions must be imported. + +Before attempting an upgrade, please read the section entitled "Contributed +Software" in the FreeBSD Handbook (from which this file is derived.) New +releases of the source should be imported onto the vendor branch and merged +with the FreeBSD-customized sources that live on the main branch. + +To upgrade to a newer version, when it is available: + 1. Unpack the new version into an empty directory. + [Do not make ANY changes to the files.] + + 2. Remove any files that don't apply to FreeBSD. + + 3. Use the command: + cvs import -m 'Virgin import of GLOBAL v<version>' \ + src/contrib/global GLOBAL v<version> + + 4. Follow the instructions printed out in step 3 to resolve any + conflicts between local FreeBSD changes and the newer version. + +Do not, under any circumstances, deviate from this procedure. + +To make local changes, simply patch and commit to the main branch (aka HEAD). +Never make local changes on the GLOBAL vendor branch. + +Please submit changes to GLOBAL's author, Shigio Yamaguchi +<shigio@wafu.netgate.net> for inclusion in his next release. The most recent +release of GLOBAL is available at the author's web page: +http://wafu.netgate.net/tama/unix/indexe.html + +cwt@freebsd.org - July 1997 |
