commit:     e3eb201b5e5c4ab9cc9849cd4580545b0a53e994
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 16:17:02 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 16:17:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=e3eb201b

portage/stages: apply -filecaps globally

 releases/weekly/portage/stages/package.use/releng/iputils     | 2 --
 releases/weekly/portage/stages/package.use/releng/no-filecaps | 7 +++++++
 releases/weekly/portage/stages/package.use/releng/pam         | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/releases/weekly/portage/stages/package.use/releng/iputils 
b/releases/weekly/portage/stages/package.use/releng/iputils
deleted file mode 100644
index 4257bb4c..00000000
--- a/releases/weekly/portage/stages/package.use/releng/iputils
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disable caps and filecaps or ping on the stage will only work for root
-net-misc/iputils -caps -filecaps

diff --git a/releases/weekly/portage/stages/package.use/releng/no-filecaps 
b/releases/weekly/portage/stages/package.use/releng/no-filecaps
new file mode 100644
index 00000000..901e5c36
--- /dev/null
+++ b/releases/weekly/portage/stages/package.use/releng/no-filecaps
@@ -0,0 +1,7 @@
+# For stage building, we cannot be sure the final unpack destination will have
+# xattr/fcaps support.  To be safe, we build stages without filecaps, but allow
+# filecaps to be turned back on @ next full world upgrade.  The ebuilds using
+# fcaps eclass will have more logic to safely fall back in case of missing
+# support.
+
+*/* -filecaps

diff --git a/releases/weekly/portage/stages/package.use/releng/pam 
b/releases/weekly/portage/stages/package.use/releng/pam
deleted file mode 100644
index 196ad1b7..00000000
--- a/releases/weekly/portage/stages/package.use/releng/pam
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disable filecaps or we get a circular dep between sys-libs/pam and 
sys-libs/filecaps
-sys-libs/pam -filecaps

Reply via email to