aboutsummaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1999-09-11 08:48:37 +0800
committerasami <asami@FreeBSD.org>1999-09-11 08:48:37 +0800
commit2cb4b71d99a8b8de709e6d113dab73919a73a817 (patch)
treeba35d21248b8b6dd3c1446616be5916276a33037 /Tools
parent5388645c53416bddbee9f43ecb79ce70e16847fc (diff)
downloadfreebsd-ports-gnome-2cb4b71d99a8b8de709e6d113dab73919a73a817.tar.gz
freebsd-ports-gnome-2cb4b71d99a8b8de709e6d113dab73919a73a817.tar.zst
freebsd-ports-gnome-2cb4b71d99a8b8de709e6d113dab73919a73a817.zip
Improve snapshot ftp installation. Put hostnames, distributions etc. in
variables instead of command lines. Create /var/db/port.mkversion.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/portbuild/3/mkbindist23
-rw-r--r--Tools/portbuild/4/mkbindist23
2 files changed, 28 insertions, 18 deletions
diff --git a/Tools/portbuild/3/mkbindist b/Tools/portbuild/3/mkbindist
index dec3c6f10f70..5e953b394f22 100644
--- a/Tools/portbuild/3/mkbindist
+++ b/Tools/portbuild/3/mkbindist
@@ -1,17 +1,21 @@
#!/bin/sh
-ftp=0
-useworld=1
+rel=3.3-19990908-RC
+ftpserver=current.freebsd.org
+ftpdists="bin dict des games compat22"
+ftp=1
+useworld=0
chrootdir=/a/asami/chroot
here=$(pwd)
tmpdir=${here}/tmp
rm -rf ${tmpdir}
mkdir -p ${tmpdir}
if [ "${ftp}" != 0 ]; then
+ rm -rf bindist/ftp
+ mkdir -p bindist/ftp
cd bindist/ftp
- /usr/bin/ftp -a 'ftp://ftp.freebsd.org/pub/FreeBSD/3.0-RELEASE/bin/bin.??'
- /usr/bin/ftp -a 'ftp://ftp.freebsd.org/pub/FreeBSD/3.0-RELEASE/dict/dict.??'
- /usr/bin/ftp -a 'ftp://ftp.freebsd.org/pub/FreeBSD/3.0-RELEASE/des/des.??'
- #ssh -n ftp.freebsd.org cat 'w/3.0-RELEASE/bin/bin.??' | tar -xzpf -
+ for i in ${ftpdists}; do
+ /usr/bin/ftp -a "ftp://${ftpserver}/pub/FreeBSD/snapshots/i386/${rel}/$i/$i.??"
+ done
cd ${here}
fi
cd ${tmpdir}
@@ -22,15 +26,16 @@ if [ "${useworld}" = 1 ]; then
grep -v '^./var/db/pkg' | \
cpio -dump ${tmpdir})
else
- cat ${here}/bindist/ftp/bin.?? | tar --unlink -xzpf -
- cat ${here}/bindist/ftp/dict.?? | tar --unlink -xzpf -
- cat ${here}/bindist/ftp/des.?? | tar --unlink -xzpf -
+ for i in ${ftpdists}; do
+ cat ${here}/bindist/ftp/$i.?? | tar --unlink -xzpf -
+ done
fi
rm -rf $(cat ${here}/bindist/delete)
mkdir -p $(cat ${here}/bindist/dirlist)
(cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir})
echo "HAVE_MOTIF=t" >> etc/make.conf
echo "MOTIF_STATIC=t" >> etc/make.conf
+date '+%Y%m%d' > var/db/port.mkversion
if [ -f kernel.GENERIC -a ! -f kernel ]; then
mv kernel.GENERIC kernel
fi
diff --git a/Tools/portbuild/4/mkbindist b/Tools/portbuild/4/mkbindist
index dec3c6f10f70..f10f30c1622e 100644
--- a/Tools/portbuild/4/mkbindist
+++ b/Tools/portbuild/4/mkbindist
@@ -1,17 +1,21 @@
#!/bin/sh
-ftp=0
-useworld=1
+date=19990826
+ftpserver=current.freebsd.org
+ftpdists="bin dict des games compat22"
+ftp=1
+useworld=0
chrootdir=/a/asami/chroot
here=$(pwd)
tmpdir=${here}/tmp
rm -rf ${tmpdir}
mkdir -p ${tmpdir}
if [ "${ftp}" != 0 ]; then
+ rm -rf bindist/ftp
+ mkdir -p bindist/ftp
cd bindist/ftp
- /usr/bin/ftp -a 'ftp://ftp.freebsd.org/pub/FreeBSD/3.0-RELEASE/bin/bin.??'
- /usr/bin/ftp -a 'ftp://ftp.freebsd.org/pub/FreeBSD/3.0-RELEASE/dict/dict.??'
- /usr/bin/ftp -a 'ftp://ftp.freebsd.org/pub/FreeBSD/3.0-RELEASE/des/des.??'
- #ssh -n ftp.freebsd.org cat 'w/3.0-RELEASE/bin/bin.??' | tar -xzpf -
+ for i in ${ftpdists}; do
+ /usr/bin/ftp -a "ftp://${ftpserver}/pub/FreeBSD/snapshots/i386/4.0-${date}-CURRENT/$i/$i.??"
+ done
cd ${here}
fi
cd ${tmpdir}
@@ -22,15 +26,16 @@ if [ "${useworld}" = 1 ]; then
grep -v '^./var/db/pkg' | \
cpio -dump ${tmpdir})
else
- cat ${here}/bindist/ftp/bin.?? | tar --unlink -xzpf -
- cat ${here}/bindist/ftp/dict.?? | tar --unlink -xzpf -
- cat ${here}/bindist/ftp/des.?? | tar --unlink -xzpf -
+ for i in ${ftpdists}; do
+ cat ${here}/bindist/ftp/$i.?? | tar --unlink -xzpf -
+ done
fi
rm -rf $(cat ${here}/bindist/delete)
mkdir -p $(cat ${here}/bindist/dirlist)
(cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir})
echo "HAVE_MOTIF=t" >> etc/make.conf
echo "MOTIF_STATIC=t" >> etc/make.conf
+date '+%Y%m%d' > var/db/port.mkversion
if [ -f kernel.GENERIC -a ! -f kernel ]; then
mv kernel.GENERIC kernel
fi