diff options
| author | cjep <cjep@pkgsrc.org> | 2004-09-16 09:55:42 +0000 |
|---|---|---|
| committer | cjep <cjep@pkgsrc.org> | 2004-09-16 09:55:42 +0000 |
| commit | 8d4dc2e04d8639249bc4dbebc99097325b8765a5 (patch) | |
| tree | 6a7161b1f1d2813a9f0fd30fe73acecf77ce24b9 | |
| parent | 327443d4168f2cc8106a5e799efda13194ec6c37 (diff) | |
| download | pkgsrc-8d4dc2e04d8639249bc4dbebc99097325b8765a5.tar.gz | |
Make and mount the local patches directory when relevant. Fixes PR#26951
from Masanori Mikawa.
| -rwxr-xr-x | mk/bulk/mksandbox | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox index ebdea7c53ce..88aabe71d6b 100755 --- a/mk/bulk/mksandbox +++ b/mk/bulk/mksandbox @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: mksandbox,v 1.36 2004/09/02 07:04:54 grant Exp $ +# $NetBSD: mksandbox,v 1.37 2004/09/16 09:55:42 cjep Exp $ # # # Copyright (c) 2002 Alistair G. Crooks. All rights reserved. @@ -169,6 +169,8 @@ localbase=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=LOCALBASE)` pkg_dbdir=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=PKG_DBDIR)` localpatches=`(cd $pkgsrc/pkgtools/pkglint; $bmakeprog show-var VARNAME=LOCALPATCHES)` +test -d "$localpatches" || echo "WARNING: LOCALPATCHES directory does not exist - ignoring" + $mkdirprog $sandbox cat > $sandbox_script <<EOS #! /bin/sh - @@ -277,7 +279,13 @@ $mountprog $mountflags $packages $sandbox/$packages $mountprog $mountflags $distfiles $sandbox/$distfiles echo "$packages $packages rw \\" >> $sandbox_script echo "$distfiles $distfiles rw \\" >> $sandbox_script -test -n "$localpatches" && echo "$localpatches $localpatches rw \\" >> $sandbox_script + +if [ -n "$localpatches" ] && [ -d "$localpatches" ]; then + echo "Mounting $localpatches from $sandbox" + $mkdirprog $sandbox/$localpatches + $mountprog $mountflags $localpatches $sandbox/$localpatches + echo "$localpatches $localpatches rw \\" >> $sandbox_script +fi cat >> $sandbox_script <<EOS " |