diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2003-09-12 20:47:51 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2003-09-12 20:47:51 +0000 |
| commit | 7052589b038eca1e85c37f51c81ffa9966d79fc2 (patch) | |
| tree | 125be9111e16867fc9f2c8aafbc26b216e8a49a3 /Tools | |
| parent | Set PACKAGE_BUILDING before making the duds file to prevent listing of (diff) | |
Remove some ldconfig -R's that were apparently confusing things, coalesce
some ldconfig -m's into one command, and run buildscript niced in the
chroot build case, not just the (currently unused) jailed case.
Notes
Notes:
svn path=/head/; revision=88965
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/portbuild | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild index 677d76e88909..25a40227cecd 100755 --- a/Tools/portbuild/scripts/portbuild +++ b/Tools/portbuild/scripts/portbuild @@ -222,12 +222,9 @@ else >/dev/null 2>&1 fi -chroot ${chroot} /sbin/ldconfig -m /usr/lib/compat -chroot ${chroot} /sbin/ldconfig -R +chroot ${chroot} /sbin/ldconfig -m /usr/lib /usr/lib/compat if [ ${arch} = "i386" ]; then - chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/aout - chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/compat/aout - chroot ${chroot} /sbin/ldconfig -aout -R + chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/aout /usr/lib/compat/aout fi while [ $# -gt 0 ]; do @@ -269,7 +266,7 @@ if [ "${error}" = 0 ]; then # 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 + chroot ${chroot} /usr/bin/nice -n $nice /buildscript ${dirname} 2 > ${chroot}/tmp/${pkgname}.log2 2>&1 grep pnohang ${chroot}/tmp/${pkgname}.log2 cat ${chroot}/tmp/${pkgname}.log2 >> ${chroot}/tmp/${pkgname}.log |