summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schultz <d.schultz@phytec.de>2018-01-05 14:37:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:22:46 (GMT)
commit037fa4103888f6e174dfb7e3aae456d9245709d6 (patch)
treee341c7b5e97bef5382a0cc8a9a9e448a84738405
parentf29fea340f3048c794905b6da3a20bc53269fa27 (diff)
downloadpoky-037fa4103888f6e174dfb7e3aae456d9245709d6.tar.gz
cryptodev: Fix build errors with v4.13+
Without this compiles of 4.13 and later kernels fail. Backport from https://github.com/cryptodev-linux/cryptodev-linux Based on commit f0d69774afb27ffc62bf353465fba145e70cb85a (From OE-Core rev: 317fd9814653ee22496dda63a02e628e8a16899b) (From OE-Core rev: 8894f352fd1f2a087528808cc3dc52d7a5cc72bd) Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb1
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch49
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
index 552eb6a..ed6d0ec 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
@@ -9,6 +9,7 @@ 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-with-linux-4.13.patch \
12" 13"
13 14
14EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' 15EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch
new file mode 100644
index 0000000..a41efac
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch
@@ -0,0 +1,49 @@
1From f0d69774afb27ffc62bf353465fba145e70cb85a Mon Sep 17 00:00:00 2001
2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
3Date: Mon, 4 Sep 2017 11:05:08 +0200
4Subject: [PATCH] ioctl.c: Fix build with linux 4.13
5
6git/ioctl.c:1127:3: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init]
7 {0, },
8 ^
9note: (near initialization for 'verbosity_ctl_dir[1]')
10git/ioctl.c:1136:3: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init]
11 {0, },
12 ^
13
14Linux kernel has added -Werror=designated-init around 4.11 (c834f0e8a8b)
15triggering build errors with gcc 5 and 6 (but not with gcc 4)
16
17Upstream-Status: Backport
18
19Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
20Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
21---
22 ioctl.c | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25diff --git a/ioctl.c b/ioctl.c
26index 0385203..8d4a162 100644
27--- a/ioctl.c
28+++ b/ioctl.c
29@@ -1124,7 +1124,7 @@ static struct ctl_table verbosity_ctl_dir[] = {
30 .mode = 0644,
31 .proc_handler = proc_dointvec,
32 },
33- {0, },
34+ {},
35 };
36
37 static struct ctl_table verbosity_ctl_root[] = {
38@@ -1133,7 +1133,7 @@ static struct ctl_table verbosity_ctl_root[] = {
39 .mode = 0555,
40 .child = verbosity_ctl_dir,
41 },
42- {0, },
43+ {},
44 };
45 static struct ctl_table_header *verbosity_sysctl_header;
46 static int __init init_cryptodev(void)
47--
482.7.4
49