pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/mksandbox mksandbox: Update to version 1.10.
details: https://anonhg.NetBSD.org/pkgsrc/rev/986afc69869a
branches: trunk
changeset: 445380:986afc69869a
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Fri Jan 22 11:59:52 2021 +0000
description:
mksandbox: Update to version 1.10.
Change the /dev/shm handling on Linux to account for systemd being a complete
nightmare and changing mount types behind your back automatically.
The previous fixed works fine, until it magically changes from a tmpfs with
1777 permissions to a devtmpfs with 0755 permissions, with obvious failures
resulting when building as non-root.
Tested on el6 and el7, with the latter now reliably able to build Python.
diffstat:
pkgtools/mksandbox/Makefile | 4 ++--
pkgtools/mksandbox/files/mksandbox | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diffs (61 lines):
diff -r 48383b2dc898 -r 986afc69869a pkgtools/mksandbox/Makefile
--- a/pkgtools/mksandbox/Makefile Fri Jan 22 11:46:34 2021 +0000
+++ b/pkgtools/mksandbox/Makefile Fri Jan 22 11:59:52 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/12/07 12:35:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2021/01/22 11:59:52 jperkin Exp $
-PKGNAME= mksandbox-1.9
+PKGNAME= mksandbox-1.10
CATEGORIES= pkgtools
MAINTAINER= agc%NetBSD.org@localhost
diff -r 48383b2dc898 -r 986afc69869a pkgtools/mksandbox/files/mksandbox
--- a/pkgtools/mksandbox/files/mksandbox Fri Jan 22 11:46:34 2021 +0000
+++ b/pkgtools/mksandbox/files/mksandbox Fri Jan 22 11:59:52 2021 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mksandbox,v 1.17 2020/12/07 13:05:12 jperkin Exp $
+# $NetBSD: mksandbox,v 1.18 2021/01/22 11:59:52 jperkin Exp $
# Copyright (c) 2002,2012 Alistair Crooks <agc%NetBSD.org@localhost>
# All rights reserved.
@@ -136,7 +136,7 @@
paxprog=""
sedprog=/bin/sed
sandboxMountDirs="$sandboxMountDirs /lib64 /usr/lib64 /usr/kerberos"
- sandboxWriteDirs="$sandboxWriteDirs /dev/shm /proc"
+ sandboxWriteDirs="$sandboxWriteDirs /proc"
;;
NetBSD)
bmakeprog=make
@@ -289,6 +289,7 @@
;;
Linux)
$mountprog $mountflags /dev $sandbox/dev
+ $mountprog -t tmpfs tmpfs $sandbox/dev/shm
;;
*)
$cpprog /dev/MAKEDEV* $sandbox/dev
@@ -438,6 +439,7 @@
;;
Linux)
$mountprog $mountflags /dev \$sandbox/dev
+ $mountprog -t tmpfs tmpfs \$sandbox/dev/shm
;;
SunOS)
$mountprog -F lofs -r /dev \$sandbox/dev
@@ -455,7 +457,11 @@
umount \$sandbox/\$mntpoint
done
case \$opsys in
- Darwin|DragonFly|FreeBSD|Linux)
+ Linux)
+ umount \$sandbox/dev/shm
+ umount \$sandbox/dev
+ ;;
+ Darwin|DragonFly|FreeBSD)
umount \$sandbox/dev
;;
SunOS)
Home |
Main Index |
Thread Index |
Old Index