summaryrefslogtreecommitdiff
path: root/profiles/base/make.defaults
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-12 06:32:46 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-12 06:32:46 +0100
commit28e3d252dc8ac8a5635206dfefe1cfe05058d1db (patch)
treee75bce604750fb72e53ed3684059e2e5d2094509 /profiles/base/make.defaults
parentf625b9919a60a30f1bd860f7d1b2eac183ced593 (diff)
gentoo resync : 12.08.2018
Diffstat (limited to 'profiles/base/make.defaults')
-rw-r--r--profiles/base/make.defaults5
1 files changed, 2 insertions, 3 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 01744a72fa90..a0a1d4f977ba 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -135,10 +135,9 @@ PYTHON_SINGLE_TARGET="python3_6"
# Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
# Moved from portage's make.globals.
# 1) do not uninstall kernel modules and therefore allow replacing them,
-# 2) allow replacing unowned compiled Python modules (python-r1 migration),
-# 3) allow replacing unowned dropin.cache files (twisted-r1 migration).
+# 2,3) removed wrt bug #663170,
# 4) protect /var/{run,lock} symlinks for bug 519620
-COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache"
+COLLISION_IGNORE="/lib/modules/*"
UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)