diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-30 17:26:50 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-30 17:26:50 +0000 |
| commit | 9db7964a0e6a0a179883bc14e129dab8bd0031d0 (patch) | |
| tree | cb18388a9093b0f8658e00815ec3c23f26526435 /ports-mgmt/poudriere | |
| parent | 1d7ea38f94dd5efbef0f45b4eca3ff81f2421f9f (diff) | |
| download | ports-9db7964a0e6a0a179883bc14e129dab8bd0031d0.tar.gz ports-9db7964a0e6a0a179883bc14e129dab8bd0031d0.zip | |
Revert usage of -x for rm(1) for now due to 9.x not having it.
Notes
Notes:
svn path=/head/; revision=402690
Diffstat (limited to 'ports-mgmt/poudriere')
| -rw-r--r-- | ports-mgmt/poudriere/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh | 11 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh | 10 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index e41d2ad62efa..eed7440eee42 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.1.10 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh b/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh new file mode 100644 index 000000000000..c833691230e1 --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh @@ -0,0 +1,11 @@ +--- src/share/poudriere/common.sh.orig 2015-11-30 17:25:11 UTC ++++ src/share/poudriere/common.sh +@@ -1847,7 +1847,7 @@ jail_stop() { + fi + msg "Umounting file systems" + destroyfs ${MASTERMNT} jail || : +- rm -rfx ${MASTERMNT}/../ ++ rm -rf ${MASTERMNT}/../ + export STATUS=0 + + # Don't override if there is a failure to grab the last status. diff --git a/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh b/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh new file mode 100644 index 000000000000..ff134c0e4785 --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh @@ -0,0 +1,10 @@ +--- src/share/poudriere/include/fs.sh.orig 2015-11-30 17:25:11 UTC ++++ src/share/poudriere/include/fs.sh +@@ -181,6 +181,6 @@ destroyfs() { + rmdir ${mnt} + else + chflags -R noschg ${mnt} +- rm -rfx ${mnt} ++ rm -rf ${mnt} + fi + } |