diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-16 16:02:45 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-28 09:25:14 +0000 |
| commit | edde9afcf9b5e581af8f4f455fc39ff9eb30c672 (patch) | |
| tree | d929c9af30f744503a895936909ae979f35083d1 /meta/recipes-kernel/cryptodev/files | |
| parent | 9da93087810a991b356f0d84ae9edd8919f22fda (diff) | |
| download | poky-edde9afcf9b5e581af8f4f455fc39ff9eb30c672.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-kernel/cryptodev/files')
| -rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch | 29 |
2 files changed, 0 insertions, 58 deletions
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 @@ | |||
| 1 | From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | ||
| 3 | Date: Mon, 9 Feb 2015 13:51:56 +0100 | ||
| 4 | Subject: [PATCH] ioctl.c: Fix build on 3.19 | ||
| 5 | |||
| 6 | get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the | ||
| 7 | actual output of the macro. | ||
| 8 | |||
| 9 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | ||
| 10 | --- | ||
| 11 | ioctl.c | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/ioctl.c b/ioctl.c | ||
| 15 | index 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 | -- | ||
| 28 | 2.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 @@ | |||
| 1 | From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Denys Dmytriyenko <denys@ti.com> | ||
| 3 | Date: Sun, 6 Apr 2014 22:16:30 -0400 | ||
| 4 | Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS | ||
| 5 | |||
| 6 | Libraries must come after objects, as link order matters, especially | ||
| 7 | when using linker flags like -Wl,--as-needed. | ||
| 8 | |||
| 9 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | --- | ||
| 13 | tests/Makefile | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/tests/Makefile b/tests/Makefile | ||
| 17 | index 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 | -- | ||
| 28 | 1.9.1 | ||
| 29 | |||
