diff options
| author | agc <agc> | 2005-11-18 11:43:25 +0000 |
|---|---|---|
| committer | agc <agc> | 2005-11-18 11:43:25 +0000 |
| commit | 582ad271b36dd268045e1450daf3346c31208119 (patch) | |
| tree | 74de90c4b407697f3bf5ace7419f12c72f4e56f0 /mk/bulk | |
| parent | bb3cd1235865af6bd4cc81d7cbc33d0617fb9472 (diff) | |
| download | pkgsrc-582ad271b36dd268045e1450daf3346c31208119.tar.gz | |
Revert the change in 1.77, which does not work correctly.
However, this does not help people who are doing bulk builds
in sandboxes via read-only nullfs mounts.
A correct, long-term solution to this needs to be found.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/build | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/mk/bulk/build b/mk/bulk/build index 26b2ce111ae..9e84c207889 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: build,v 1.77 2005/11/18 08:58:12 agc Exp $ +# $NetBSD: build,v 1.78 2005/11/18 11:43:25 agc Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -215,20 +215,16 @@ show_config_vars # # Check that the package tools are up to date. # -if [ -f /sandbox -a -x /sandbox ]; then - echo "Building in a sandbox - using existing pkgtools" -else - ( cd "${pkglint_dir}" \ - && ${BMAKE} fetch >/dev/null 2>&1 - ) || { - echo "Updating pkgtools" - ( cd "${pkgsrc_dir}/pkgtools/pkg_install" \ - && ${BMAKE} clean \ - && ${BMAKE} install \ - && ${BMAKE} clean - ) || die "Could not update the package tools." - } -fi +( cd "${pkglint_dir}" \ + && ${BMAKE} fetch >/dev/null 2>&1 +) || { + echo "Updating pkgtools" + ( cd "${pkgsrc_dir}/pkgtools/pkg_install" \ + && ${BMAKE} clean \ + && ${BMAKE} install \ + && ${BMAKE} clean + ) || die "Could not update the package tools." +} # # Run the pre-build script if necessary. |