From: Jose Quaresma <quaresma.j...@gmail.com> Because busybox doesn't support other path than /etc [1] we can't change the default path unconditionally so change it only for systemd.
The modules-load.d [2] - Configure kernel modules to load at boot should install their configuration files in /usr/lib/modules-load.d. The modprobe.d [3] - Configuration directory for modprobe should install their configuration files in /lib/modprobe.d [1] https://git.busybox.net/busybox/tree/modutils/modprobe.c?id=669c40ed8ebf480c95ce36135104e474e361a7e6#n658 [2] https://man7.org/linux/man-pages/man5/modules-load.d.5.html [3] https://man7.org/linux/man-pages/man5/modprobe.d.5.html [YOCTO #12212] https://bugzilla.yoctoproject.org/show_bug.cgi?id=12212 Signed-off-by: Jose Quaresma <jose.quare...@foundries.io> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> (cherry picked from commit 075c309bd28bc8e19a82569a2e75da14fa5795dd) Signed-off-by: Steve Sakoman <st...@sakoman.com> --- meta/classes-recipe/kernel-module-split.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass index 0e4f9a6ec3..c1208d55e0 100644 --- a/meta/classes-recipe/kernel-module-split.bbclass +++ b/meta/classes-recipe/kernel-module-split.bbclass @@ -30,8 +30,8 @@ fi PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross" -modulesloaddir ??= "${sysconfdir}/modules-load.d" -modprobedir ??= "${sysconfdir}/modprobe.d" +modulesloaddir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_libdir}', '${sysconfdir}', d)}/modules-load.d" +modprobedir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_base_libdir}', '${sysconfdir}', d)}/modprobe.d" KERNEL_SPLIT_MODULES ?= "1" PACKAGESPLITFUNCS =+ "split_kernel_module_packages" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#184987): https://lists.openembedded.org/g/openembedded-core/message/184987 Mute This Topic: https://lists.openembedded.org/mt/100397620/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
