summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb1
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-linux-5.10.220.patch32
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb
index 5192cf03ed..71d7b0ede3 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb
@@ -8,6 +8,7 @@ inherit module
8DEPENDS += "cryptodev-linux" 8DEPENDS += "cryptodev-linux"
9 9
10SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch \ 10SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch \
11 file://0001-Fix-build-for-linux-5.10.220.patch \
11 " 12 "
12 13
13EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' 14EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-linux-5.10.220.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-linux-5.10.220.patch
new file mode 100644
index 0000000000..ebc4058814
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-linux-5.10.220.patch
@@ -0,0 +1,32 @@
1From 47f9d88ca5107d1814ecfc7faf6d02d1140978a8 Mon Sep 17 00:00:00 2001
2From: Alexandre Bard <alexandre.bard@netmodule.com>
3Date: Wed, 3 Jul 2024 15:01:22 +0200
4Subject: [PATCH] Fix build for linux 5.10.220
5
6The commit previously integrated is 5.11 has now been backported to
75.10.y branch.
8
9https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=1aecdaa7e2c6619a7d2c0a81c8f5c06e52f870f3
10
11Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/157a624d7a892ea5fb2df4bbd4e71c008adbecb7]
12Signed-off-by: Hugo SIMELIERE <hsimeliere.opensource@witekio.com>
13---
14 ioctl.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/ioctl.c b/ioctl.c
18index 95481d4..11fa27a 100644
19--- a/ioctl.c
20+++ b/ioctl.c
21@@ -871,7 +871,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
22 if (unlikely(ret)) {
23 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0))
24 sys_close(fd);
25-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
26+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 220))
27 ksys_close(fd);
28 #else
29 close_fd(fd);
30--
312.46.0
32