summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2021-12-26 05:06:33 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2022-01-10 21:03:22 -0800
commitb949c4d70385609f4cba083b5db8d2417a90cdfa (patch)
treefae51cfab4e1a02115a0d0d794333cbb60fc6413 /profiles/base
parentsys-kernel/gentoo-kernel-bin: install dtbs to /boot if present (diff)
downloadgentoo-b949c4d70385609f4cba083b5db8d2417a90cdfa.tar.gz
gentoo-b949c4d70385609f4cba083b5db8d2417a90cdfa.tar.bz2
gentoo-b949c4d70385609f4cba083b5db8d2417a90cdfa.zip
profiles/base/make.defaults: treat dtbs like modules
when dist-kernel gets uninstalled, /lib/modules/<kver> is left behind on purpose. However, on some systems kernels also install device-tree files to /boot/dtbs/<kver> leaving /lib/modules, but removing device-tree file may leave system unbootable, so let's treat dtbs directory similar to modules. Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/make.defaults6
1 files changed, 3 insertions, 3 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 6548a518da5e..8b1a489be4ad 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -134,11 +134,11 @@ PYTHON_SINGLE_TARGET="python3_9"
# Michał Górny <mgorny@gentoo.org> (2013-08-10)
# Moved from portage's make.globals.
-# 1) do not uninstall kernel modules and therefore allow replacing them,
+# 1) do not uninstall kernel modules/dtbs and therefore allow replacing them,
# 2,3) removed wrt bug #663170,
# 4) protect /var/{run,lock} symlinks for bug 519620
-COLLISION_IGNORE="/lib/modules/*"
-UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
+COLLISION_IGNORE="/boot/dtbs/* /lib/modules/*"
+UNINSTALL_IGNORE="/boot/dtbs/* /lib/modules/* /var/run /var/lock"
# Andreas K. Hüttel <dilfridge@gentoo.org> (2013-08-23)
# Make emerge messages default to English as per Council decision