summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-20 01:09:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:24 +0100
commit04419c189e86f38331865de9480eab8f7d9528c3 (patch)
tree16fab4da68212f5a19bdfabdc833ab3cfeda0007 /meta
parent6184951031340cee648ea3eba20d10dd2b897ac3 (diff)
downloadpoky-04419c189e86f38331865de9480eab8f7d9528c3.tar.gz
cryptodev: 1.6 -> 1.7
* Remove 0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch since it was a backported patch. * Updated 0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch. (From OE-Core rev: 9347311ca444c3128653c96f9f2845713c646fa7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb)4
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb)1
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb)0
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev_1.7.inc (renamed from meta/recipes-kernel/cryptodev/cryptodev_1.6.inc)4
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch23
-rw-r--r--meta/recipes-kernel/cryptodev/files/0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch86
6 files changed, 13 insertions, 105 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb
index 43f58f311c..a33841d091 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb
@@ -2,9 +2,7 @@ require cryptodev_${PV}.inc
2 2
3SUMMARY = "A /dev/crypto device driver header file" 3SUMMARY = "A /dev/crypto device driver header file"
4 4
5do_compile() { 5do_compile[noexec] = "1"
6 :
7}
8 6
9# Just install cryptodev.h which is the only header file needed to be exported 7# Just install cryptodev.h which is the only header file needed to be exported
10do_install() { 8do_install() {
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb
index e6b10257f0..5cd52eb871 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb
@@ -9,7 +9,6 @@ DEPENDS += "cryptodev-linux"
9 9
10SRC_URI += " \ 10SRC_URI += " \
11file://0001-Disable-installing-header-file-provided-by-another-p.patch \ 11file://0001-Disable-installing-header-file-provided-by-another-p.patch \
12file://0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch \
13file://0001-ioctl.c-Fix-build-on-3.19.patch \ 12file://0001-ioctl.c-Fix-build-on-3.19.patch \
14" 13"
15 14
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb
index efc41ae427..efc41ae427 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc b/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc
index 6a93a35a39..cca69254cb 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 5
6SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" 6SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz"
7 7
8SRC_URI[md5sum] = "eade38998313c25fd7934719cdf8a2ea" 8SRC_URI[md5sum] = "0b63b3481cf2c90386b35f057481d36b"
9SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f" 9SRC_URI[sha256sum] = "41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25"
10 10
11S = "${WORKDIR}/cryptodev-linux-${PV}" 11S = "${WORKDIR}/cryptodev-linux-${PV}"
12 12
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
index cb871f6b44..3f0298b0b0 100644
--- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
+++ b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
@@ -15,12 +15,12 @@ Upstream-Status: Pending
15 2 files changed, 14 insertions(+), 0 deletions(-) 15 2 files changed, 14 insertions(+), 0 deletions(-)
16 16
17diff --git a/Makefile b/Makefile 17diff --git a/Makefile b/Makefile
18index 2be8825..4cbb865 100644 18index 31c4b3f..2ecf2a9 100644
19--- a/Makefile 19--- a/Makefile
20+++ b/Makefile 20+++ b/Makefile
21@@ -17,6 +17,9 @@ install: 21@@ -34,6 +34,9 @@ modules_install:
22 @echo "Installing cryptodev.h in /usr/include/crypto ..." 22 @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..."
23 @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h 23 @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h
24 24
25+install_tests: 25+install_tests:
26+ make -C tests install DESTDIR=$(PREFIX) 26+ make -C tests install DESTDIR=$(PREFIX)
@@ -28,18 +28,18 @@ index 2be8825..4cbb865 100644
28 clean: 28 clean:
29 make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean 29 make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
30 rm -f $(hostprogs) *~ 30 rm -f $(hostprogs) *~
31@@ -25,6 +28,9 @@ clean: 31@@ -42,6 +45,9 @@ clean:
32 check: 32 check:
33 KERNEL_DIR=$(KERNEL_DIR) make -C tests check 33 CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) make -C tests check
34 34
35+testprogs: 35+testprogs:
36+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs 36+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs
37+ 37+
38 FILEBASE = cryptodev-linux-$(VERSION) 38 CPOPTS =
39 TMPDIR ?= /tmp 39 ifneq (${SHOW_TYPES},)
40 OUTPUT = $(FILEBASE).tar.gz 40 CPOPTS += --show-types
41diff --git a/tests/Makefile b/tests/Makefile 41diff --git a/tests/Makefile b/tests/Makefile
42index 87ca3c7..0488cf6 100644 42index c9f04e8..cd202af 100644
43--- a/tests/Makefile 43--- a/tests/Makefile
44+++ b/tests/Makefile 44+++ b/tests/Makefile
45@@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o 45@@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o
@@ -64,6 +64,3 @@ index 87ca3c7..0488cf6 100644
64 clean: 64 clean:
65 rm -f *.o *~ $(hostprogs) 65 rm -f *.o *~ $(hostprogs)
66 66
67--
681.7.5.4
69
diff --git a/meta/recipes-kernel/cryptodev/files/0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch b/meta/recipes-kernel/cryptodev/files/0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch
deleted file mode 100644
index c5c7ec75f9..0000000000
--- a/meta/recipes-kernel/cryptodev/files/0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch
+++ /dev/null
@@ -1,86 +0,0 @@
1From 57b5544de80db85c8955499831fdaa30829db77a Mon Sep 17 00:00:00 2001
2From: Cosmin Paraschiv <cosmin.paraschiv@freescale.com>
3Date: Thu, 23 Jan 2014 03:40:00 +0100
4Subject: [PATCH] In the 3.13-rc1 Linux kernel, the INIT_COMPLETION macro has
5 been replaced with an inline function, reinit_completion [1][2]. We are
6 currently using the 3.13-rc3 Linux kernel, which leads to the following
7 error:
8
9cryptlib.c:279:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]
10 INIT_COMPLETION(cdata->async.result->completion);
11
12[1] https://github.com/torvalds/linux/commit/c32f74ab2872994bc8336ed367313da3139350ca
13[2] https://github.com/torvalds/linux/commit/62026aedaacedbe1ffe94a3599ad4acd8ecdf587
14
15Signed-off-by: Cosmin Paraschiv <cosmin.paraschiv@freescale.com>
16Reviewed-by: Cristian Stoica <cristian.stoica@freescale.com>
17Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
18Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
19Signed-off-by: Phil Sutter <phil@nwl.cc>
20
21Upstream-Status: Backport
22---
23 cryptlib.c | 8 ++++----
24 cryptodev_int.h | 6 ++++++
25 2 files changed, 10 insertions(+), 4 deletions(-)
26
27diff --git a/cryptlib.c b/cryptlib.c
28index 54d5d41..a923c14 100644
29--- a/cryptlib.c
30+++ b/cryptlib.c
31@@ -217,7 +217,7 @@ ssize_t cryptodev_cipher_encrypt(struct cipher_data *cdata,
32 {
33 int ret;
34
35- INIT_COMPLETION(cdata->async.result->completion);
36+ reinit_completion(&cdata->async.result->completion);
37
38 if (cdata->aead == 0) {
39 ablkcipher_request_set_crypt(cdata->async.request,
40@@ -240,7 +240,7 @@ ssize_t cryptodev_cipher_decrypt(struct cipher_data *cdata,
41 {
42 int ret;
43
44- INIT_COMPLETION(cdata->async.result->completion);
45+ reinit_completion(&cdata->async.result->completion);
46 if (cdata->aead == 0) {
47 ablkcipher_request_set_crypt(cdata->async.request,
48 (struct scatterlist *)src, dst,
49@@ -351,7 +351,7 @@ ssize_t cryptodev_hash_update(struct hash_data *hdata,
50 {
51 int ret;
52
53- INIT_COMPLETION(hdata->async.result->completion);
54+ reinit_completion(&hdata->async.result->completion);
55 ahash_request_set_crypt(hdata->async.request, sg, NULL, len);
56
57 ret = crypto_ahash_update(hdata->async.request);
58@@ -363,7 +363,7 @@ int cryptodev_hash_final(struct hash_data *hdata, void* output)
59 {
60 int ret;
61
62- INIT_COMPLETION(hdata->async.result->completion);
63+ reinit_completion(&hdata->async.result->completion);
64 ahash_request_set_crypt(hdata->async.request, NULL, output, 0);
65
66 ret = crypto_ahash_final(hdata->async.request);
67diff --git a/cryptodev_int.h b/cryptodev_int.h
68index 12dd5b1..188063d 100644
69--- a/cryptodev_int.h
70+++ b/cryptodev_int.h
71@@ -2,6 +2,12 @@
72 #ifndef CRYPTODEV_INT_H
73 # define CRYPTODEV_INT_H
74
75+#include <linux/version.h>
76+
77+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0))
78+# define reinit_completion(x) INIT_COMPLETION(*(x))
79+#endif
80+
81 #include <linux/init.h>
82 #include <linux/sched.h>
83 #include <linux/fs.h>
84--
851.9.1
86