[Buildroot] [PATCH 06/11] package/cryptodev-linux: use the kernel-module helper

[Yann E. MORIN]

Doug, All,

On 2015-06-08 07:33 -0500, rdkehn at yahoo.com spake thusly:
> On Sun, Jun 07, 2015 at 12:20:42AM +0200, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> > ---
> >  package/cryptodev-linux/cryptodev-linux.mk | 13 ++++---------
> >  1 file changed, 4 insertions(+), 9 deletions(-)
> > 
> > diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk
> > index 6f41930..02f59f8 100644
> > --- a/package/cryptodev-linux/cryptodev-linux.mk
> > +++ b/package/cryptodev-linux/cryptodev-linux.mk
> > @@ -6,23 +6,18 @@
> >  
> >  CRYPTODEV_LINUX_VERSION = 1.7
> >  CRYPTODEV_LINUX_SITE = http://download.gna.org/cryptodev-linux
> > -CRYPTODEV_LINUX_DEPENDENCIES = linux
> >  CRYPTODEV_LINUX_INSTALL_STAGING = YES
> >  CRYPTODEV_LINUX_LICENSE = GPLv2+
> >  CRYPTODEV_LINUX_LICENSE_FILES = COPYING
> >  
> > -define CRYPTODEV_LINUX_BUILD_CMDS
> > -	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_DIR=$(LINUX_DIR)
> > -endef
> > -
> > -define CRYPTODEV_LINUX_INSTALL_TARGET_CMDS
> > -	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_DIR=$(LINUX_DIR) \
> > -		PREFIX=$(TARGET_DIR) modules_install
> > -endef
> > +CRYPTODEV_LINUX_MODULE_MAKE_OPTS = \
> > +	KERNEL_DIR=$(LINUX_DIR) \
> > +	PREFIX=$(TARGET_DIR)
> >  
> >  define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS
> >  	$(INSTALL) -D -m 644 $(@D)/crypto/cryptodev.h \
> >  		$(STAGING_DIR)/usr/include/crypto/cryptodev.h
> >  endef
> >  
> > +$(eval $(kernel-module))
> >  $(eval $(generic-package))
> > -- 
> > 1.9.1
> 
> cryptodev-linux fails to build because version.h does not get
> generated before compiling the source.  Adding a PRE_BUILD_HOOK
> resolves the problem.

Weird, I'm pretty sure it did build here without that hook.
But you're right, it does not.

Maybe I tested the wrong patch... Who knows? ;-)

> Regards,
> ...doug
> 
> diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk
> index 6f41930..9e1d53d 100644
> --- a/package/cryptodev-linux/cryptodev-linux.mk
> +++ b/package/cryptodev-linux/cryptodev-linux.mk
> @@ -6,23 +6,24 @@
>  
>  CRYPTODEV_LINUX_VERSION = 1.7
>  CRYPTODEV_LINUX_SITE = http://download.gna.org/cryptodev-linux
> -CRYPTODEV_LINUX_DEPENDENCIES = linux
>  CRYPTODEV_LINUX_INSTALL_STAGING = YES
>  CRYPTODEV_LINUX_LICENSE = GPLv2+
>  CRYPTODEV_LINUX_LICENSE_FILES = COPYING
>  
> -define CRYPTODEV_LINUX_BUILD_CMDS
> -       $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_DIR=$(LINUX_DIR)
> +define CRYPTODEV_LINUX_VERSION_H
> +       $(MAKE) -C $(@D) version.h

Indeed, that makes it work. Thanks! :-)
May I add your Signed-off-by to the patch?

Regards,
Yann E. MORIN.

>  endef
>  
> -define CRYPTODEV_LINUX_INSTALL_TARGET_CMDS
> -       $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_DIR=$(LINUX_DIR) \
> -               PREFIX=$(TARGET_DIR) modules_install
> -endef
> +CRYPTODEV_LINUX_PRE_BUILD_HOOKS += CRYPTODEV_LINUX_VERSION_H
> +
> +CRYPTODEV_LINUX_MODULE_MAKE_OPTS = \
> +       KERNEL_DIR=$(LINUX_DIR) \
> +       PREFIX=$(TARGET_DIR)
>  
>  define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS
>         $(INSTALL) -D -m 644 $(@D)/crypto/cryptodev.h \
>                 $(STAGING_DIR)/usr/include/crypto/cryptodev.h
>  endef
>  
> +$(eval $(kernel-module))
>  $(eval $(generic-package))
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'