sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

cryptodev: update to 1.8 

Drop 0001-ioctl.c-Fix-build-on-3.19.patch and
0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch, the code
has been fixed upstream.

(From OE-Core rev: 762b3111f3124ee75404835da751fb95b8466fd4)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2015-12-16 16:02:45 +02:00 committed by Richard Purdie
parent 9da9308781
commit edde9afcf9
6 changed files with 5 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb → meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb
View File

@ -1,4 +1,4 @@
require cryptodev_${PV}.inc
require cryptodev.inc
SUMMARY = "A /dev/crypto device driver header file"

3
meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb → meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb
View File

@ -1,4 +1,4 @@
require cryptodev_${PV}.inc
require cryptodev.inc
SUMMARY = "A /dev/crypto device driver kernel module"
@ -9,7 +9,6 @@ DEPENDS += "cryptodev-linux"
SRC_URI += " \
file://0001-Disable-installing-header-file-provided-by-another-p.patch \
file://0001-ioctl.c-Fix-build-on-3.19.patch \
"
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'

3
meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb → meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb
View File

@ -1,4 +1,4 @@
require cryptodev_${PV}.inc
require cryptodev.inc
SUMMARY = "A test suite for /dev/crypto device driver"
@ -6,7 +6,6 @@ DEPENDS += "openssl"
SRC_URI += " \
file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \
file://0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch \
"
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"'

4
meta/recipes-kernel/cryptodev/cryptodev_1.7.inc → meta/recipes-kernel/cryptodev/cryptodev.inc
View File

@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz"
SRC_URI[md5sum] = "0b63b3481cf2c90386b35f057481d36b"
SRC_URI[sha256sum] = "41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25"
SRC_URI[md5sum] = "02644cc4cd02301e0b503a332eb2f0b5"
SRC_URI[sha256sum] = "67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376"
S = "${WORKDIR}/cryptodev-linux-${PV}"

29
meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch
View File

@ -1,29 +0,0 @@
From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Mon, 9 Feb 2015 13:51:56 +0100
Subject: [PATCH] ioctl.c: Fix build on 3.19
get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the
actual output of the macro.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ioctl.c b/ioctl.c
index f26cf93..cf8cc17 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -529,7 +529,7 @@ static int
clonefd(struct file *filp)
{
int ret;
- ret = get_unused_fd();
+ ret = get_unused_fd_flags(0);
if (ret >= 0) {
get_file(filp);
fd_install(ret, filp);
--
2.1.4

29
meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
View File

@ -1,29 +0,0 @@
From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Sun, 6 Apr 2014 22:16:30 -0400
Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS
Libraries must come after objects, as link order matters, especially
when using linker flags like -Wl,--as-needed.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Upstream-Status: Pending
---
tests/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index cd202af..67c3c83 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -39,5 +39,5 @@ testprogs: $(hostprogs)
clean:
rm -f *.o *~ $(hostprogs)
-${comp_progs}: LDFLAGS += -lssl -lcrypto
+${comp_progs}: LDLIBS += -lssl -lcrypto
${comp_progs}: %: %.o openssl_wrapper.o
--
1.9.1