summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb)2
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb)3
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb)3
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev.inc (renamed from meta/recipes-kernel/cryptodev/cryptodev_1.7.inc)4
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch29
-rw-r--r--meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch29
6 files changed, 5 insertions, 65 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb
index a33841d091..c55577c661 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb
@@ -1,4 +1,4 @@
1require cryptodev_${PV}.inc 1require cryptodev.inc
2 2
3SUMMARY = "A /dev/crypto device driver header file" 3SUMMARY = "A /dev/crypto device driver header file"
4 4
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb
index 5cd52eb871..552eb6abaa 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb
@@ -1,4 +1,4 @@
1require cryptodev_${PV}.inc 1require cryptodev.inc
2 2
3SUMMARY = "A /dev/crypto device driver kernel module" 3SUMMARY = "A /dev/crypto device driver kernel module"
4 4
@@ -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://0001-ioctl.c-Fix-build-on-3.19.patch \
13" 12"
14 13
15EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' 14EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb
index f1ca36eec5..c4005242a7 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb
@@ -1,4 +1,4 @@
1require cryptodev_${PV}.inc 1require cryptodev.inc
2 2
3SUMMARY = "A test suite for /dev/crypto device driver" 3SUMMARY = "A test suite for /dev/crypto device driver"
4 4
@@ -6,7 +6,6 @@ DEPENDS += "openssl"
6 6
7SRC_URI += " \ 7SRC_URI += " \
8file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ 8file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \
9file://0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch \
10" 9"
11 10
12EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' 11EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index cca69254cb..ade7ef9cea 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.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] = "0b63b3481cf2c90386b35f057481d36b" 8SRC_URI[md5sum] = "02644cc4cd02301e0b503a332eb2f0b5"
9SRC_URI[sha256sum] = "41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25" 9SRC_URI[sha256sum] = "67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376"
10 10
11S = "${WORKDIR}/cryptodev-linux-${PV}" 11S = "${WORKDIR}/cryptodev-linux-${PV}"
12 12
diff --git a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch
deleted file mode 100644
index 74c8972536..0000000000
--- a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001
2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
3Date: Mon, 9 Feb 2015 13:51:56 +0100
4Subject: [PATCH] ioctl.c: Fix build on 3.19
5
6get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the
7actual output of the macro.
8
9Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
10---
11 ioctl.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/ioctl.c b/ioctl.c
15index f26cf93..cf8cc17 100644
16--- a/ioctl.c
17+++ b/ioctl.c
18@@ -529,7 +529,7 @@ static int
19 clonefd(struct file *filp)
20 {
21 int ret;
22- ret = get_unused_fd();
23+ ret = get_unused_fd_flags(0);
24 if (ret >= 0) {
25 get_file(filp);
26 fd_install(ret, filp);
27--
282.1.4
29
diff --git a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch b/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
deleted file mode 100644
index f5ab8b4f96..0000000000
--- a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Sun, 6 Apr 2014 22:16:30 -0400
4Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS
5
6Libraries must come after objects, as link order matters, especially
7when using linker flags like -Wl,--as-needed.
8
9Signed-off-by: Denys Dmytriyenko <denys@ti.com>
10
11Upstream-Status: Pending
12---
13 tests/Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/tests/Makefile b/tests/Makefile
17index cd202af..67c3c83 100644
18--- a/tests/Makefile
19+++ b/tests/Makefile
20@@ -39,5 +39,5 @@ testprogs: $(hostprogs)
21 clean:
22 rm -f *.o *~ $(hostprogs)
23
24-${comp_progs}: LDFLAGS += -lssl -lcrypto
25+${comp_progs}: LDLIBS += -lssl -lcrypto
26 ${comp_progs}: %: %.o openssl_wrapper.o
27--
281.9.1
29