summaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.globals8
1 files changed, 7 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index f379fb1c..8b9db7a0 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -38,7 +38,13 @@ FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\"
RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
# Default user options
-FEATURES="distlocks parallel-fetch sandbox sfperms strict unmerge-orphans userfetch"
+FEATURES="distlocks parallel-fetch protect-owned sandbox
+ sfperms strict unmerge-orphans userfetch"
+
+# Ignore file collisions in /lib/modules since files inside this directory
+# are never unmerged, and therefore collisions must be ignored in order for
+# FEATURES=protect-owned to operate smoothly in all cases.
+COLLISION_IGNORE="/lib/modules"
# Enable for global testing
FEATURES="${FEATURES} preserve-libs"