diff mbox

[LEDE-DEV] packages/utils/cryptodev-linux: Update to current master

Message ID 20170215131958.4506-1-abrodkin@synopsys.com
State Superseded
Headers show

Commit Message

Alexey Brodkin Feb. 15, 2017, 1:19 p.m. UTC
From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

This allows us to build kernel's crypto modules in Linux v4.9.
Otherwise we're seeing the following breakage:
------------------->8-----------------
...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c: In function 'cryptodev_cipher_init':
...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c:138:18: error: implicit declaration of function 'crypto_alloc_ablkcipher' [-Werror=implicit-function-declaration]
   out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0);
                  ^~~~~~~~~~~~~~~~~~~~~~~
...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c:138:16: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
   out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0);
                ^
cc1: some warnings being treated as errors
------------------->8-----------------

Actual fix is in https://github.com/cryptodev-linux/cryptodev-linux/commit/6818263667ca488f9b1c86e36ea624c4ea1c309f
but given amount of changes since 1.8 release adaptation of this patch
requires quite a lot of changes and so let's just grab latest sources
from git.

Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
 utils/cryptodev-linux/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

John Crispin Feb. 20, 2017, 8:24 a.m. UTC | #1
On 15/02/2017 14:19, Alexey Brodkin wrote:
> From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> 
> This allows us to build kernel's crypto modules in Linux v4.9.
> Otherwise we're seeing the following breakage:
> ------------------->8-----------------
> ...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c: In function 'cryptodev_cipher_init':
> ...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c:138:18: error: implicit declaration of function 'crypto_alloc_ablkcipher' [-Werror=implicit-function-declaration]
>    out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0);
>                   ^~~~~~~~~~~~~~~~~~~~~~~
> ...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c:138:16: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>    out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0);
>                 ^
> cc1: some warnings being treated as errors
> ------------------->8-----------------
> 
> Actual fix is in https://github.com/cryptodev-linux/cryptodev-linux/commit/6818263667ca488f9b1c86e36ea624c4ea1c309f
> but given amount of changes since 1.8 release adaptation of this patch
> requires quite a lot of changes and so let's just grab latest sources
> from git.
> 
> Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> ---
>  utils/cryptodev-linux/Makefile | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/utils/cryptodev-linux/Makefile b/utils/cryptodev-linux/Makefile
> index 4f187c8..1cbf282 100644
> --- a/utils/cryptodev-linux/Makefile
> +++ b/utils/cryptodev-linux/Makefile
> @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
>  include $(INCLUDE_DIR)/kernel.mk
>  
>  PKG_NAME:=cryptodev-linux
> -PKG_VERSION:=1.8
> -PKG_RELEASE:=2
> -
> -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> -PKG_SOURCE_URL:=http://download.gna.org/cryptodev-linux/
> -PKG_MD5SUM:=02644cc4cd02301e0b503a332eb2f0b5
> +PKG_SOURCE_PROTO:=git
> +PKG_SOURCE_URL=https://github.com/cryptodev-linux/cryptodev-linux.git

Hi,

is this the official repo ? i would prefer to not pull from github if
possible

	John

> +PKG_SOURCE_DATE:=2016-11-17
> +PKG_SOURCE_VERSION:=6818263667ca488f9b1c86e36ea624c4ea1c309f
> +PKG_MIRROR_HASH:=53034831b0936b0b5ad07030337bd0e7a62b407d4e1dee9385aa3b806ef553fa
> +PKG_VERSION=$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
>  
>  PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
>  
>
Alexey Brodkin Feb. 27, 2017, 6:14 p.m. UTC | #2
Hi John,

On Mon, 2017-02-20 at 09:24 +0100, John Crispin wrote:
> 

> On 15/02/2017 14:19, Alexey Brodkin wrote:

> > 

> > From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

> > 

> > This allows us to build kernel's crypto modules in Linux v4.9.

> > Otherwise we're seeing the following breakage:

> > ------------------->8-----------------

> > ...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c: In function

> > 'cryptodev_cipher_init':

> > ...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c:138:18: error:

> > implicit declaration of function 'crypto_alloc_ablkcipher' [-Werror=implicit-function-declaration]

> >    out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0);

> >                   ^~~~~~~~~~~~~~~~~~~~~~~

> > ...//openwrt/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/cryptodev-linux-1.8/cryptlib.c:138:16: warning:

> > assignment makes pointer from integer without a cast [-Wint-conversion]

> >    out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0);

> >                 ^

> > cc1: some warnings being treated as errors

> > ------------------->8-----------------

> > 

> > Actual fix is in https://github.com/cryptodev-linux/cryptodev-linux/commit/6818263667ca488f9b1c86e36ea624c4ea1c309f

> > but given amount of changes since 1.8 release adaptation of this patch

> > requires quite a lot of changes and so let's just grab latest sources

> > from git.

> > 

> > Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

> > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>

> > ---

> >  utils/cryptodev-linux/Makefile | 12 ++++++------

> >  1 file changed, 6 insertions(+), 6 deletions(-)

> > 

> > diff --git a/utils/cryptodev-linux/Makefile b/utils/cryptodev-linux/Makefile

> > index 4f187c8..1cbf282 100644

> > --- a/utils/cryptodev-linux/Makefile

> > +++ b/utils/cryptodev-linux/Makefile

> > @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk

> >  include $(INCLUDE_DIR)/kernel.mk

> >  

> >  PKG_NAME:=cryptodev-linux

> > -PKG_VERSION:=1.8

> > -PKG_RELEASE:=2

> > -

> > -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

> > -PKG_SOURCE_URL:=http://download.gna.org/cryptodev-linux/

> > -PKG_MD5SUM:=02644cc4cd02301e0b503a332eb2f0b5

> > +PKG_SOURCE_PROTO:=git

> > +PKG_SOURCE_URL=https://github.com/cryptodev-linux/cryptodev-linux.git

> 

> Hi,

> 

> is this the official repo ? i would prefer to not pull from github if

> possible


Looking at their official web-site http://cryptodev-linux.org/download.html
I would think https://github.com/cryptodev-linux/cryptodev-linux is their
official git repo.

-Alexey
diff mbox

Patch

diff --git a/utils/cryptodev-linux/Makefile b/utils/cryptodev-linux/Makefile
index 4f187c8..1cbf282 100644
--- a/utils/cryptodev-linux/Makefile
+++ b/utils/cryptodev-linux/Makefile
@@ -10,12 +10,12 @@  include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=cryptodev-linux
-PKG_VERSION:=1.8
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.gna.org/cryptodev-linux/
-PKG_MD5SUM:=02644cc4cd02301e0b503a332eb2f0b5
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=https://github.com/cryptodev-linux/cryptodev-linux.git
+PKG_SOURCE_DATE:=2016-11-17
+PKG_SOURCE_VERSION:=6818263667ca488f9b1c86e36ea624c4ea1c309f
+PKG_MIRROR_HASH:=53034831b0936b0b5ad07030337bd0e7a62b407d4e1dee9385aa3b806ef553fa
+PKG_VERSION=$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)