[pkgsrc/trunk]: pkgsrc/mk/bulk Allow the xsrc directory to be specified on th...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/430bf6da49d3
branches:  trunk
changeset: 482301:430bf6da49d3
user:      agc <agc%pkgsrc.org@localhost>
date:      Sun Oct 24 22:54:25 2004 +0000

description:
Allow the xsrc directory to be specified on the command line, defaulting to
/usr/xsrc if not specified, and check for its existence.

diffstat:

 mk/bulk/mksandbox |  17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (67 lines):

diff -r 80a57e10117e -r 430bf6da49d3 mk/bulk/mksandbox
--- a/mk/bulk/mksandbox Sun Oct 24 20:35:00 2004 +0000
+++ b/mk/bulk/mksandbox Sun Oct 24 22:54:25 2004 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.37 2004/09/16 09:55:42 cjep Exp $
+# $NetBSD: mksandbox,v 1.38 2004/10/24 22:54:25 agc Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -34,13 +34,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--verbose] sandbox-dir
+# Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir] [--verbose] sandbox-dir
 #
 # A small shell script to set up a sandbox (usually for a pkgsrc bulk
 # build), using null mounts.
 
 pkgsrc=/usr/pkgsrc
 src=/usr/src
+xsrc=/usr/xsrc
 
 kernel=""
 sandboxMountDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail"
@@ -49,7 +50,7 @@
 
 usage()
 {
-       echo "Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--verbose] sandbox-dir"
+       echo "Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir] [--verbose] sandbox-dir"
        exit 1
 }
 
@@ -137,6 +138,7 @@
        case "$1" in
        --pkgsrc=*)     pkgsrc=`echo $1 | $sedprog -e 's|^--pkgsrc=||'` ;;
        --src=*)        src=`echo $1 | $sedprog -e 's|^--src=||'` ;;
+       --xsrc=*)       xsrc=`echo $1 | $sedprog -e 's|^--xsrc=||'` ;;
        --verbose)      set -x ;;
        -*)             usage ;;
        *)              break ;;
@@ -160,6 +162,10 @@
        err "source directory $src does not exist."
 fi
 
+if [ ! -d $xsrc ]; then
+       err "xsrc directory $xsrc does not exist."
+fi
+
 sandbox=$1
 sandbox_script="$sandbox/sandbox"
 
@@ -272,6 +278,11 @@
 $mountprog $mountflags $pkgsrc $sandbox/usr/pkgsrc
 echo "$pkgsrc /usr/pkgsrc rw \\" >> $sandbox_script
 
+echo "Mount $xsrc from $sandbox"
+$mkdirprog $sandbox/usr/xsrc
+$mountprog $mountflags -r $xsrc $sandbox/usr/xsrc
+echo "$xsrc /usr/xsrc ro \\" >> $sandbox_script
+
 echo "Mounting $packages and $distfiles from $sandbox"
 $mkdirprog $sandbox/$packages $sandbox/$distfiles
 $mkdirprog $packages $distfiles