| 1 |
commit: b949c4d70385609f4cba083b5db8d2417a90cdfa |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 26 13:06:33 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 11 05:03:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b949c4d7 |
| 7 |
|
| 8 |
profiles/base/make.defaults: treat dtbs like modules |
| 9 |
|
| 10 |
when dist-kernel gets uninstalled, /lib/modules/<kver> |
| 11 |
is left behind on purpose. However, on some systems kernels also install |
| 12 |
device-tree files to /boot/dtbs/<kver> |
| 13 |
|
| 14 |
leaving /lib/modules, but removing device-tree file may leave system |
| 15 |
unbootable, so let's treat dtbs directory similar to modules. |
| 16 |
|
| 17 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 18 |
|
| 19 |
profiles/base/make.defaults | 6 +++--- |
| 20 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 23 |
index 6548a518da5e..8b1a489be4ad 100644 |
| 24 |
--- a/profiles/base/make.defaults |
| 25 |
+++ b/profiles/base/make.defaults |
| 26 |
@@ -134,11 +134,11 @@ PYTHON_SINGLE_TARGET="python3_9" |
| 27 |
|
| 28 |
# Michał Górny <mgorny@g.o> (2013-08-10) |
| 29 |
# Moved from portage's make.globals. |
| 30 |
-# 1) do not uninstall kernel modules and therefore allow replacing them, |
| 31 |
+# 1) do not uninstall kernel modules/dtbs and therefore allow replacing them, |
| 32 |
# 2,3) removed wrt bug #663170, |
| 33 |
# 4) protect /var/{run,lock} symlinks for bug 519620 |
| 34 |
-COLLISION_IGNORE="/lib/modules/*" |
| 35 |
-UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock" |
| 36 |
+COLLISION_IGNORE="/boot/dtbs/* /lib/modules/*" |
| 37 |
+UNINSTALL_IGNORE="/boot/dtbs/* /lib/modules/* /var/run /var/lock" |
| 38 |
|
| 39 |
# Andreas K. Hüttel <dilfridge@g.o> (2013-08-23) |
| 40 |
# Make emerge messages default to English as per Council decision |
Archives