From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1628395-garchives=archives.gentoo.org@lists.gentoo.org>
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 E0726158064
for <garchives@archives.gentoo.org>; Mon, 6 May 2024 17:12:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 26FB1E2AB5;
Mon, 6 May 2024 17:12:01 +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 00723E2AB5
for <gentoo-commits@lists.gentoo.org>; Mon, 6 May 2024 17:12:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 smtp.gentoo.org (Postfix) with ESMTPS id E85FB343136
for <gentoo-commits@lists.gentoo.org>; Mon, 6 May 2024 17:11:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 53EBF16F9
for <gentoo-commits@lists.gentoo.org>; Mon, 6 May 2024 17:11:58 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1715015245.25df2b9b57d98be95930ec595206af60db6c340a.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/linux-mod-r1.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 25df2b9b57d98be95930ec595206af60db6c340a
X-VCS-Branch: master
Date: Mon, 6 May 2024 17:11:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a3a6f4db-4ba9-45d7-9e52-ccf3a82c4b20
X-Archives-Hash: fa7b53bf441e8428bbc5d2bd9a288f19
commit: 25df2b9b57d98be95930ec595206af60db6c340a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 16:53:43 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 6 17:07:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25df2b9b
linux-mod-r1.eclass: update depmod --config paths for kmod-32
kmod-32's tools/depmod.c adds 'DISTCONFDIR "/depmod.d"' which
is $prefix/lib/depmod.d.
Largely a no-op on merged-usr because of the /lib -> /usr/lib symlink,
but could potentially impact split-usr if both directories get used
(albeit this is only used when a different ROOT is used).
Ordering matches the current depmod.c (etc first, then run, etc...).
On a side-note, kmod-32 also now has configurable /lib/modules path
albeit this is not done on Gentoo at the moment (the default without
the prefix is used). May need updates in the future to figure out
which to use though.
Don't believe this is worth a ML review.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
eclass/linux-mod-r1.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass
index 8d384c2b30c8..4b267aae4db1 100644
--- a/eclass/linux-mod-r1.eclass
+++ b/eclass/linux-mod-r1.eclass
@@ -1260,7 +1260,7 @@ _modules_update_depmod() {
# EROOT from -b is not used when looking for configuration
# directories, so pass the whole list from kmod's tools/depmod.c
- --config="${EROOT}"/{etc,run,usr/local/lib,lib}/depmod.d
+ --config="${EROOT}"/{etc,run,{usr/{local/,},}lib}/depmod.d
)
nonfatal edob depmod "${depmodargs[@]}" && return 0