mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Only transfer the build distfiles to bento if requested.

Browse Source 
Switch back to chroot builds until I can debug the remaining problems with
jail builds.
This commit is contained in:
Kris Kennaway 2003-05-17 00:27:27 +00:00
parent 116e3b3e87
commit ce395d3474
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=81131
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Tools/portbuild/scripts/portbuild
View File

@ -81,7 +81,11 @@ if [ "x$1" = "x-nodummy" ]; then
export NODUMMY=1
shift
fi
nodistfiles=1
if [ "x$1" = "x-distfiles" ]; then
nodistfiles=0
shift
fi
args="$*"
buildenv ${pb} ${arch} ${branch}
@ -249,16 +253,19 @@ fi
if [ "${error}" = 0 ]; then
# make checksum succeeded
ssh -a -x ${user}@$master mkdir -p ${pb}/${arch}/${branch}/distfiles/.pbtmp/${pkgname}
tar -C ${chroot}/tmp/distfiles -cf - . | \
ssh -a -x ${user}@$master tar --unlink -C ${pb}/${arch}/${branch}/distfiles/.pbtmp/${pkgname} -xvf -
ssh -a -x ${user}@$master touch ${pb}/${arch}/${branch}/distfiles/.pbtmp/${pkgname}/.done
if [ "$nodistfiles" = "0" ]; then
tar -C ${chroot}/tmp/distfiles -cf - . | \
ssh -a -x ${user}@$master tar --unlink -C ${pb}/${arch}/${branch}/distfiles/.pbtmp/${pkgname} -xvf -
ssh -a -x ${user}@$master touch ${pb}/${arch}/${branch}/distfiles/.pbtmp/${pkgname}/.done
fi
# phase 2, make package
ln -sf ${pkgname}.log2 ${chroot}/tmp/make.log
ifconfig lo0 alias 10.${ip1}.${ip2}.${ip3}/32
jail ${chroot} jail-${chroot} 10.${ip1}.${ip2}.${ip3} /usr/bin/nice -n $nice /buildscript ${dirname} 2 > ${chroot}/tmp/${pkgname}.log2 2>&1
ifconfig lo0 delete 10.${ip1}.${ip2}.${ip3}
# ifconfig lo0 alias 10.${ip1}.${ip2}.${ip3}/32
# jail ${chroot} jail-${chroot} 10.${ip1}.${ip2}.${ip3} /usr/bin/nice -n $nice /buildscript ${dirname} 2 > ${chroot}/tmp/${pkgname}.log2 2>&1
# ifconfig lo0 delete 10.${ip1}.${ip2}.${ip3}
chroot ${chroot} /buildscript ${dirname} 2 > ${chroot}/tmp/${pkgname}.log2 2>&1
grep pnohang ${chroot}/tmp/${pkgname}.log2
cat ${chroot}/tmp/${pkgname}.log2 >> ${chroot}/tmp/${pkgname}.log