From edde9afcf9b5e581af8f4f455fc39ff9eb30c672 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 16 Dec 2015 16:02:45 +0200 Subject: 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 Signed-off-by: Richard Purdie --- .../files/0001-ioctl.c-Fix-build-on-3.19.patch | 29 ---------------------- ...ests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch | 29 ---------------------- 2 files changed, 58 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch (limited to 'meta/recipes-kernel/cryptodev/files') 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 @@ -From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -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 ---- - 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 - 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 @@ -From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -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 - -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 - -- cgit v1.2.3-54-g00ecf