svn commit: r402690 - in head/ports-mgmt: poudriere poudriere-devel poudriere-devel/files poudriere/files
Bryan Drewery
bdrewery at FreeBSD.org
Mon Nov 30 17:26:52 UTC 2015
Author: bdrewery
Date: Mon Nov 30 17:26:50 2015
New Revision: 402690
URL: https://svnweb.freebsd.org/changeset/ports/402690
Log:
Revert usage of -x for rm(1) for now due to 9.x not having it.
Added:
head/ports-mgmt/poudriere-devel/files/
head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh (contents, props changed)
head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh (contents, props changed)
head/ports-mgmt/poudriere/files/
head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh (contents, props changed)
head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh (contents, props changed)
Modified:
head/ports-mgmt/poudriere-devel/Makefile
head/ports-mgmt/poudriere/Makefile
Modified: head/ports-mgmt/poudriere-devel/Makefile
==============================================================================
--- head/ports-mgmt/poudriere-devel/Makefile Mon Nov 30 16:52:50 2015 (r402689)
+++ head/ports-mgmt/poudriere-devel/Makefile Mon Nov 30 17:26:50 2015 (r402690)
@@ -2,7 +2,7 @@
PORTNAME= poudriere
DISTVERSION= 3.1.99.20151125
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
Added: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh Mon Nov 30 17:26:50 2015 (r402690)
@@ -0,0 +1,11 @@
+--- src/share/poudriere/common.sh.orig 2015-11-30 17:26:13 UTC
++++ src/share/poudriere/common.sh
+@@ -1856,7 +1856,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.
Added: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh Mon Nov 30 17:26:50 2015 (r402690)
@@ -0,0 +1,10 @@
+--- src/share/poudriere/include/fs.sh.orig 2015-11-30 17:26:08 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
+ }
Modified: head/ports-mgmt/poudriere/Makefile
==============================================================================
--- head/ports-mgmt/poudriere/Makefile Mon Nov 30 16:52:50 2015 (r402689)
+++ head/ports-mgmt/poudriere/Makefile Mon Nov 30 17:26:50 2015 (r402690)
@@ -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}/ \
Added: head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh Mon Nov 30 17:26:50 2015 (r402690)
@@ -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.
Added: head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh Mon Nov 30 17:26:50 2015 (r402690)
@@ -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
+ }
More information about the svn-ports-all
mailing list