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 224D1158086 for ; Sun, 26 Dec 2021 13:06:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCCA42BC02F; Sun, 26 Dec 2021 13:06:47 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F07322BC026 for ; Sun, 26 Dec 2021 13:06:46 +0000 (UTC) From: Georgy Yakovlev To: gentoo-dev@lists.gentoo.org Cc: dist-kernel@gentoo.org, Georgy Yakovlev Subject: [gentoo-dev] [PATCH] profiles/base/make.defaults: treat dtbs like modules Date: Sun, 26 Dec 2021 05:06:33 -0800 Message-Id: <20211226130633.2813725-1-gyakovlev@gentoo.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 996c618c-48df-4ecb-8b2f-e5131bc66a28 X-Archives-Hash: 2c0c77c1f219909b88a9b011fc1701f9 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 --- 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 f25074f9d81a..be5651f0ac43 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 -- 2.34.1