[pkgsrc/trunk]: pkgsrc/mk/bulk On Linux (at least Red Hat Enterprise 3), open...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7115073aa41
branches:  trunk
changeset: 528897:f7115073aa41
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat May 19 14:09:54 2007 +0000

description:
On Linux (at least Red Hat Enterprise 3), openssl needs libraries
from /usr/kerberos and /dev/random in sandbox.  On FreeBSD, use
devfs to populate /dev in sandbox.

>From Sergey Svishchev.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  7 +++++--
 mk/bulk/mksandbox       |  9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r a58538e5da7e -r f7115073aa41 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Sat May 19 14:07:49 2007 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Sat May 19 14:09:54 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.139 2007/04/15 22:14:44 rillig Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.140 2007/05/19 14:09:54 wiz Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -177,6 +177,9 @@
 # use is for digest and also for xpkgwedge.  Add pkgtools/xpkgwedge in
 # /etc/mk.conf to do an xpkgwedged bulk build.
 BULK_PREREQ+=          pkgtools/digest
+.ifdef PKG_CHK_FILE
+BULK_PREREQ+=          pkgtools/pkg_chk
+.endif
 
 # Commands for printing informational messages from the bulk build.
 # BULK_MSG_CONT is used for continuing a message started with BULK_MSG
@@ -243,7 +246,7 @@
 .endfor
        ${RM} -f ${BULK_DBFILE}
        ${TOUCH} ${BULK_DBFILE}
-.if !defined(SPECIFIC_PKGS)
+.if !defined(SPECIFIC_PKGS) && !defined(PKG_CHK_FILE)
        @${ECHO} "This file is unused for a full pkgsrc bulk build" >> ${BULK_DBFILE}
        @${ECHO} "It is only used for a SPECIFIC_PKGS bulk build" >> ${BULK_DBFILE}
        @${BULK_MSG} "Building complete pkgsrc dependency tree (this may take a while)."
diff -r a58538e5da7e -r f7115073aa41 mk/bulk/mksandbox
--- a/mk/bulk/mksandbox Sat May 19 14:07:49 2007 +0000
+++ b/mk/bulk/mksandbox Sat May 19 14:09:54 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.45 2006/12/15 13:15:06 martti Exp $
+# $NetBSD: mksandbox,v 1.46 2007/05/19 14:09:54 wiz Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -100,7 +100,7 @@
        fi
        paxprog=""
        sedprog=/bin/sed
-       sandboxMountDirs="$sandboxMountDirs /proc"
+       sandboxMountDirs="$sandboxMountDirs /proc /usr/kerberos"
        ;;
 NetBSD)
        bmakeprog=make
@@ -230,7 +230,10 @@
        ;;
 Linux)
        $cpprog /dev/MAKEDEV* $sandbox/dev
-       (cd $sandbox/dev; ./MAKEDEV generic)
+       (cd $sandbox/dev; ./MAKEDEV generic random)
+       ;;
+FreeBSD)
+       $mountprog -t devfs devfs $sandbox/dev
        ;;
 *)
        $cpprog /dev/MAKEDEV* $sandbox/dev