summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2024-05-06 12:53:43 -0400
committerIonen Wolkens <ionen@gentoo.org>2024-05-06 13:07:25 -0400
commit25df2b9b57d98be95930ec595206af60db6c340a (patch)
treed6e823f124d448b925fd2964fe5b56b5e91c892c
parentapp-emacs/org-mode: Stabilize 9.6.24 ALLARCHES, #931312 (diff)
downloadgentoo-25df2b9b57d98be95930ec595206af60db6c340a.tar.gz
gentoo-25df2b9b57d98be95930ec595206af60db6c340a.tar.bz2
gentoo-25df2b9b57d98be95930ec595206af60db6c340a.zip
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@gentoo.org>
-rw-r--r--eclass/linux-mod-r1.eclass2
1 files changed, 1 insertions, 1 deletions
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