> -----Original Message-----
> From: Jose Quaresma <[email protected]>
> Sent: den 20 juni 2023 01:14
> To: [email protected]
> Cc: Jose Quaresma <[email protected]>; Ola x Nilsson
> <[email protected]>; Peter Kjellerstedt <[email protected]>
> Subject: [PATCH V2 1/2] kernel-module-split: make autoload and probeconf
> distribution specific
>
> The modules-load.d [1] - Configure kernel modules to load at boot
> should install their configuration files in /usr/lib/modules-load.d.
>
> The modprobe.d [2] - Configuration directory for modprobe
> should install their configuration files in /lib/modprobe.d
>
> [1] https://www.freedesktop.org/software/systemd/man/modules-load.d.html
> [2] https://www.man7.org/linux/man-pages//man5/modprobe.d.5.html
>
> [YOCTO #12212] https://bugzilla.yoctoproject.org/show_bug.cgi?id=12212
>
> CC: Ola x Nilsson <[email protected]>
> CC: Peter Kjellerstedt <[email protected]>
> Signed-off-by: Jose Quaresma <[email protected]>
> ---
>
> V2: use the same location as before on the class and define the new
> location just for systemd.
>
> .../kernel-module-split.bbclass | 30 +++++++++----------
> .../distro/include/init-manager-systemd.inc | 4 +++
> 2 files changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes-recipe/kernel-module-split.bbclass
> b/meta/classes-recipe/kernel-module-split.bbclass
> index 50882c31a7..ee14bb6910 100644
> --- a/meta/classes-recipe/kernel-module-split.bbclass
> +++ b/meta/classes-recipe/kernel-module-split.bbclass
[cut]
> @@ -169,8 +168,7 @@ python split_kernel_module_packages () {
> postrm = d.getVar('pkg_postrm:modules')
>
> if splitmods != '1':
> - etcdir = d.getVar('sysconfdir')
> - d.appendVar('FILES:' + metapkg, '%s/modules-load.d/ %s/modprobe.d/
> %s/modules/' % (etcdir, etcdir, d.getVar("nonarch_base_libdir")))
> + d.appendVar('FILES:' + metapkg, '%s/ %s/ %s/modules/' %
> (modulesloaddir, modprobedir, d.getVar("nonarch_base_libdir")))
There is no need for the trailing slashes in FILES:${PN}, so the above
can be simplified to:
d.appendVar('FILES:' + metapkg, '%s %s %s/modules' % (modulesloaddir,
modprobedir, d.getVar("nonarch_base_libdir")))
Not sure that warrants a new patch though.
> d.appendVar('pkg_postinst:%s' % metapkg, postinst)
> d.prependVar('pkg_postrm:%s' % metapkg, postrm);
> return
Reviewed-by: Peter Kjellerstedt <[email protected]>
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183127):
https://lists.openembedded.org/g/openembedded-core/message/183127
Mute This Topic: https://lists.openembedded.org/mt/99634397/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
