| Message ID | 20230630154912.3630297-1-jose.quaresma@foundries.io |
|---|---|
| State | Accepted, archived |
| Commit | 075c309bd28bc8e19a82569a2e75da14fa5795dd |
| Headers | show |
| Series | kernel-module-split add systemd modulesloaddir and modprobedir config | expand |
Hi, Forgot the colon in "kernel-module-split:" is it necessary to send a v2 for this? Jose Jose Quaresma <quaresma.jose@gmail.com> escreveu no dia sexta, 30/06/2023 à(s) 16:49: > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > --- > 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 > >
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"
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> --- meta/classes-recipe/kernel-module-split.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)