diff options
| author | kris <kris@FreeBSD.org> | 2002-06-06 20:58:52 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-06-06 20:58:52 +0000 |
| commit | e72a9d02d81706b7e814dcfaf546b8ee2350da9f (patch) | |
| tree | 64a58a79ba05d3525f492e20588c100f2d059755 /Tools/portbuild | |
| parent | 9eb63b88c6e547fb56dd0b9f1d66820f31a2ec21 (diff) | |
| download | FreeBSD-ports-e72a9d02d81706b7e814dcfaf546b8ee2350da9f.zip FreeBSD-ports-e72a9d02d81706b7e814dcfaf546b8ee2350da9f.tar.gz | |
Allow packages to be installed in the build chroot; this is needed
for 5.x package builds since the pnohang script is written in perl,
which was removed from the base OS.
Diffstat (limited to 'Tools/portbuild')
| -rwxr-xr-x | Tools/portbuild/scripts/portbuild | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild index 1950732..e379b36 100755 --- a/Tools/portbuild/scripts/portbuild +++ b/Tools/portbuild/scripts/portbuild @@ -102,7 +102,7 @@ ulimit -f 524288 ulimit -t 3600 # directories to clean -cleandirs="/usr/local /usr/X11R6 /compat" +cleandirs="/usr/local /usr/X11R6 /compat /var/db/pkg" # 15 minutes export FTP_TIMEOUT=900 @@ -208,6 +208,14 @@ if [ ${arch} = "i386" ]; then chroot ${chroot} /sbin/ldconfig -aout -R fi +# Install packages +for i in ${chroot}/packages/*.tgz; do + chroot ${chroot} pkg_add /packages/`basename $i` +done + +# Don't record packages which will interfere with building versions of the +# packages we just installed. +rm -rf ${chroot}/var/db/pkg/* while [ $# -gt 0 ]; do if [ -f ${packages}/All/$1 ]; then |
