summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-05-19 14:09:54 +0000
committerwiz <wiz@pkgsrc.org>2007-05-19 14:09:54 +0000
commitdaff9198ed4733269f8f2426a3789ed6050495e5 (patch)
tree952aed95d36db2a2ba9714140b6f89d61e39285e
parentfb3f3a89fbc620bd77a9aca9e5e750deb5d0d9df (diff)
downloadpkgsrc-daff9198ed4733269f8f2426a3789ed6050495e5.tar.gz
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.
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk7
-rwxr-xr-xmk/bulk/mksandbox9
2 files changed, 11 insertions, 5 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index e1f571dfbc2..b8d5a03a44c 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -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>
@@ -177,6 +177,9 @@ BULK_DBFILE?= ${BULKFILESDIR}/.bulk_db${BULK_ID}
# 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 @@ bulk-cache:
.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 --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index a346c6fdf12..74e5d6fad46 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -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 @@ Linux)
fi
paxprog=""
sedprog=/bin/sed
- sandboxMountDirs="$sandboxMountDirs /proc"
+ sandboxMountDirs="$sandboxMountDirs /proc /usr/kerberos"
;;
NetBSD)
bmakeprog=make
@@ -230,7 +230,10 @@ SunOS)
;;
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