From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8D0D158086 for ; Tue, 11 Jan 2022 05:03:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C3B22BC025; Tue, 11 Jan 2022 05:03:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 707C52BC025 for ; Tue, 11 Jan 2022 05:03:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB7A8342B1D for ; Tue, 11 Jan 2022 05:03:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A114A1BF for ; Tue, 11 Jan 2022 05:03:53 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1641877402.b949c4d70385609f4cba083b5db8d2417a90cdfa.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/base/make.defaults X-VCS-Directories: profiles/base/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: b949c4d70385609f4cba083b5db8d2417a90cdfa X-VCS-Branch: master Date: Tue, 11 Jan 2022 05:03:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b8e230a-e8cf-4f03-8d52-e32b4d6798df X-Archives-Hash: af28fbf0960f4143fe61a7582a94fbf3 commit: b949c4d70385609f4cba083b5db8d2417a90cdfa Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Dec 26 13:06:33 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jan 11 05:03:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b949c4d7 profiles/base/make.defaults: treat dtbs like modules when dist-kernel gets uninstalled, /lib/modules/ is left behind on purpose. However, on some systems kernels also install device-tree files to /boot/dtbs/ 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 gentoo.org> profiles/base/make.defaults | 6 +++--- 1 file 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 (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 (2013-08-23) # Make emerge messages default to English as per Council decision