package/kmod: enable compression in host variant

Message ID 20180408081231.24250-1-yann.morin.1998@free.fr
State New
Headers show
Series
  • package/kmod: enable compression in host variant
Related show

Commit Message

Yann E. MORIN April 8, 2018, 8:12 a.m.
When the modules are compressed by the kernel at install, it needs a
depmod with compression support to br able to generate the modules.dep
and associated files.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/kmod/kmod.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni April 8, 2018, 11:28 a.m. | #1
Hello,

On Sun,  8 Apr 2018 10:12:31 +0200, Yann E. MORIN wrote:
> When the modules are compressed by the kernel at install, it needs a
> depmod with compression support to br able to generate the modules.dep
> and associated files.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> ---
>  package/kmod/kmod.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
> index e1149b7b65..c6264e16ab 100644
> --- a/package/kmod/kmod.mk
> +++ b/package/kmod/kmod.mk
> @@ -9,7 +9,7 @@ KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
>  KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
>  KMOD_INSTALL_STAGING = YES
>  KMOD_DEPENDENCIES = host-pkgconf
> -HOST_KMOD_DEPENDENCIES = host-pkgconf
> +HOST_KMOD_DEPENDENCIES = host-pkgconf host-xz host-zlib

It is a bit annoying to add those dependencies unconditionally :-/

Thomas
Yann E. MORIN April 8, 2018, 11:56 a.m. | #2
Thomas, All,

On 2018-04-08 13:28 +0200, Thomas Petazzoni spake thusly:
> On Sun,  8 Apr 2018 10:12:31 +0200, Yann E. MORIN wrote:
> > When the modules are compressed by the kernel at install, it needs a
> > depmod with compression support to br able to generate the modules.dep
> > and associated files.
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Yegor Yefremov <yegorslists@googlemail.com>
> > ---
> >  package/kmod/kmod.mk | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
> > index e1149b7b65..c6264e16ab 100644
> > --- a/package/kmod/kmod.mk
> > +++ b/package/kmod/kmod.mk
> > @@ -9,7 +9,7 @@ KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
> >  KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
> >  KMOD_INSTALL_STAGING = YES
> >  KMOD_DEPENDENCIES = host-pkgconf
> > -HOST_KMOD_DEPENDENCIES = host-pkgconf
> > +HOST_KMOD_DEPENDENCIES = host-pkgconf host-xz host-zlib
> 
> It is a bit annoying to add those dependencies unconditionally :-/

Yep, bt we can't automatically know whether the user will be using
compressed modules or not. And by the time we can look at the kernel's
.config file, it is too late to add those dependencies to host-kmod.

The alternative is to add new options to linux/Config.in to enable
module compression (which one, or none), and automatically derive the
extra needed dependencies.

TBH, I'm not too fond of either solution...

Regards,
Yann E. MORIN.

Patch

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index e1149b7b65..c6264e16ab 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -9,7 +9,7 @@  KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
-HOST_KMOD_DEPENDENCIES = host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-pkgconf host-xz host-zlib
 
 # license info for libkmod only, conditionally add more below
 KMOD_LICENSE = LGPL-2.1+ (library)
@@ -26,7 +26,7 @@  endif
 KMOD_CONF_OPTS = --disable-static --enable-shared
 
 KMOD_CONF_OPTS += --disable-manpages
-HOST_KMOD_CONF_OPTS = --disable-manpages
+HOST_KMOD_CONF_OPTS = --disable-manpages --with-xz --with-zlib
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 KMOD_DEPENDENCIES += zlib