diff options
| author | linimon <linimon@FreeBSD.org> | 2010-06-22 10:51:54 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2010-06-22 10:51:54 +0800 |
| commit | 0bc9a93ebbd215f655f62c4a77a968c508c4c24a (patch) | |
| tree | 95e5722a04f4a7fb6c681c9df4b2188503958cfc /Tools | |
| parent | cfd366ba8b9ce9cb49394fba58060b190467d1c8 (diff) | |
| download | freebsd-ports-graphics-0bc9a93ebbd215f655f62c4a77a968c508c4c24a.tar.gz freebsd-ports-graphics-0bc9a93ebbd215f655f62c4a77a968c508c4c24a.tar.zst freebsd-ports-graphics-0bc9a93ebbd215f655f62c4a77a968c508c4c24a.zip | |
Catch up with master copy on pointyhat.
Note: all 3 of these files will be changing radically in the near future.
This is the last checkin from the "classic" codebase installation.
Feature safe: yes
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/buildscript | 2 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/makeworld | 6 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/updatesnap | 46 |
3 files changed, 40 insertions, 14 deletions
diff --git a/Tools/portbuild/scripts/buildscript b/Tools/portbuild/scripts/buildscript index a3cd767aabb..73586ddc7b8 100755 --- a/Tools/portbuild/scripts/buildscript +++ b/Tools/portbuild/scripts/buildscript @@ -170,7 +170,6 @@ if [ $phase = 1 ]; then ./compat/linux/proc ./usr/share/man/cat*/* ./usr/local/etc/apache -./usr/local/etc/apache2 ./usr/local/news ./usr/local/share/xml ./usr/local/etc/gconf @@ -236,7 +235,6 @@ else ./var/tmp/* ./usr/share/man/cat*/* ./usr/local/etc/apache -./usr/local/etc/apache2 ./usr/local/news ./usr/local/share/xml ./usr/local/etc/gconf diff --git a/Tools/portbuild/scripts/makeworld b/Tools/portbuild/scripts/makeworld index 42a649ceb46..123265f8aa2 100755 --- a/Tools/portbuild/scripts/makeworld +++ b/Tools/portbuild/scripts/makeworld @@ -28,13 +28,13 @@ export NO_FSCHG=1 case "$branch" in 6*) - export SRCBRANCH="-r RELENG_6" + export SRCBRANCH="-r RELENG_6_4" ;; 7*) - export SRCBRANCH="-r RELENG_7" + export SRCBRANCH="-r RELENG_7_1" ;; 8*) - export SRCBRANCH="-r RELENG_8" + export SRCBRANCH="-r RELENG_8_0" ;; 9*) export SRCBRANCH= diff --git a/Tools/portbuild/scripts/updatesnap b/Tools/portbuild/scripts/updatesnap index 577ec3e7905..906a9cf82d4 100755 --- a/Tools/portbuild/scripts/updatesnap +++ b/Tools/portbuild/scripts/updatesnap @@ -5,7 +5,7 @@ # head is handled specially HEAD_BRANCH="9" -NON_HEAD_BRANCHES="6 7 8" +NON_HEAD_BRANCHES="" base=/a/snap zbase=a/snap @@ -42,13 +42,41 @@ echo ${fulldate} > cvsdone snapdate=$(stamp ${fulldate}) zfs snapshot ${zbase}/src-${HEAD_BRANCH}@${snapdate} -for branch in $NON_HEAD_BRANCHES; do - cd $base/src-${branch} - fulldate=$(date) - cvs -Rq -d ${srepo} update -PdA -D "${fulldate}" -r RELENG_${branch} - echo ${fulldate} > cvsdone - snapdate=$(stamp ${fulldate}) - zfs snapshot ${zbase}/src-${branch}@${snapdate} -done +# XXX +# Special casing for 6 and 8 to test building against .0 src ABI +# This requires some remodelling after we're done with all branches +# XXX + +cd $base/src-6 +fulldate=$(date) +cvs -Rq -d ${srepo} update -PdA -D "${fulldate}" -r RELENG_6_4 +echo ${fulldate} > cvsdone +snapdate=$(stamp ${fulldate}) +zfs snapshot ${zbase}/src-6@${snapdate} + +cd $base/src-7 +fulldate=$(date) +cvs -Rq -d ${srepo} update -PdA -D "${fulldate}" -r RELENG_7_1 +echo ${fulldate} > cvsdone +snapdate=$(stamp ${fulldate}) +zfs snapshot ${zbase}/src-7@${snapdate} + +cd $base/src-8 +fulldate=$(date) +cvs -Rq -d ${srepo} update -PdA -D "${fulldate}" -r RELENG_8_0 +echo ${fulldate} > cvsdone +snapdate=$(stamp ${fulldate}) +zfs snapshot ${zbase}/src-8@${snapdate} + +# EO XXX + +#for branch in $NON_HEAD_BRANCHES; do +# cd $base/src-${branch} +# fulldate=$(date) +# cvs -Rq -d ${srepo} update -PdA -D "${fulldate}" -r RELENG_${branch} +# echo ${fulldate} > cvsdone +# snapdate=$(stamp ${fulldate}) +# zfs snapshot ${zbase}/src-${branch}@${snapdate} +#done finish 0 |