From e2705425ba27840af7dc40c16ad4f4f4dd972fbc Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 24 Aug 2018 23:44:08 +0800 Subject: cryptodev: remove patch for 4.13+ kernels This fix is in OE-core rocko now and isn't needed here anymore. Signed-off-by: Anuj Mittal --- .../0001-ioctl.c-Fix-build-with-linux-4.13.patch | 51 ---------------------- .../cryptodev/cryptodev-module_%.bbappend | 2 - 2 files changed, 53 deletions(-) delete mode 100644 common/recipes-kernel/cryptodev/cryptodev-module/0001-ioctl.c-Fix-build-with-linux-4.13.patch diff --git a/common/recipes-kernel/cryptodev/cryptodev-module/0001-ioctl.c-Fix-build-with-linux-4.13.patch b/common/recipes-kernel/cryptodev/cryptodev-module/0001-ioctl.c-Fix-build-with-linux-4.13.patch deleted file mode 100644 index a013d8d7..00000000 --- a/common/recipes-kernel/cryptodev/cryptodev-module/0001-ioctl.c-Fix-build-with-linux-4.13.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f0d69774afb27ffc62bf353465fba145e70cb85a Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -Date: Mon, 4 Sep 2017 11:05:08 +0200 -Subject: [PATCH] ioctl.c: Fix build with linux 4.13 - -git/ioctl.c:1127:3: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] - {0, }, - ^ -note: (near initialization for 'verbosity_ctl_dir[1]') -git/ioctl.c:1136:3: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] - {0, }, - ^ - -Linux kernel has added -Werror=designated-init around 4.11 (c834f0e8a8b) -triggering build errors with gcc 5 and 6 (but not with gcc 4) - -Signed-off-by: Ricardo Ribalda Delgado -Signed-off-by: Cristian Stoica - -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f0d69774afb27ffc62bf353465fba145e70cb85a] - -Signed-off-by: Anuj Mittal ---- - ioctl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ioctl.c b/ioctl.c -index 0385203..8d4a162 100644 ---- a/ioctl.c -+++ b/ioctl.c -@@ -1124,7 +1124,7 @@ static struct ctl_table verbosity_ctl_dir[] = { - .mode = 0644, - .proc_handler = proc_dointvec, - }, -- {0, }, -+ {}, - }; - - static struct ctl_table verbosity_ctl_root[] = { -@@ -1133,7 +1133,7 @@ static struct ctl_table verbosity_ctl_root[] = { - .mode = 0555, - .child = verbosity_ctl_dir, - }, -- {0, }, -+ {}, - }; - static struct ctl_table_header *verbosity_sysctl_header; - static int __init init_cryptodev(void) --- -2.17.1 - diff --git a/common/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/common/recipes-kernel/cryptodev/cryptodev-module_%.bbappend index b5b56f01..c59ddb2f 100644 --- a/common/recipes-kernel/cryptodev/cryptodev-module_%.bbappend +++ b/common/recipes-kernel/cryptodev/cryptodev-module_%.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" -SRC_URI_append_intel-x86-common = " file://0001-ioctl.c-Fix-build-with-linux-4.13.patch" - python() { # When we add more kernels for linux-intel, we may have to add a Version check if (d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel"): -- cgit v1.2.3-54-g00ecf