diff options
| author | Jose Quaresma <quaresma.jose@gmail.com> | 2023-07-04 10:36:09 +0000 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-08-01 06:17:28 -1000 |
| commit | 204d9088616eedef444e5e005a46689e0da24e42 (patch) | |
| tree | ed6979160d38bfa395ccabbd6d176c25c13c0efd /meta/classes-recipe | |
| parent | 9b6c564afc1358d04cce3d4d3bc389090b3b6e33 (diff) | |
| download | poky-204d9088616eedef444e5e005a46689e0da24e42.tar.gz | |
kernel-module-split add systemd modulesloaddir and modprobedir config
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
(From OE-Core rev: 174b446b7c8167934b13ec679407093924d324e3)
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 075c309bd28bc8e19a82569a2e75da14fa5795dd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/kernel-module-split.bbclass | 4 |
1 files 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 | |||
| 30 | 30 | ||
| 31 | PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross" | 31 | PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross" |
| 32 | 32 | ||
| 33 | modulesloaddir ??= "${sysconfdir}/modules-load.d" | 33 | modulesloaddir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_libdir}', '${sysconfdir}', d)}/modules-load.d" |
| 34 | modprobedir ??= "${sysconfdir}/modprobe.d" | 34 | modprobedir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_base_libdir}', '${sysconfdir}', d)}/modprobe.d" |
| 35 | 35 | ||
| 36 | KERNEL_SPLIT_MODULES ?= "1" | 36 | KERNEL_SPLIT_MODULES ?= "1" |
| 37 | PACKAGESPLITFUNCS =+ "split_kernel_module_packages" | 37 | PACKAGESPLITFUNCS =+ "split_kernel_module_packages" |