1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

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
This commit is contained in:
Mark Linimon 2010-06-22 02:51:54 +00:00
parent 7ce566ebb0
commit aa7717e661
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=256813
3 changed files with 40 additions and 14 deletions

View File

@ -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

View File

@ -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=

View File

@ -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