From e9d17c4dee86453aae69db46d31b39680d69e78a Mon Sep 17 00:00:00 2001 From: Hugo SIMELIERE Date: Thu, 29 Aug 2024 14:42:21 +0200 Subject: cryptodev-module: Fix build for linux 5.10.220 Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/157a624d7a892ea5fb2df4bbd4e71c008adbecb7] (From OE-Core rev: 047ee2fe7bc9920038213d014a920518a264ef17) Signed-off-by: Hugo SIMELIERE Signed-off-by: Steve Sakoman --- .../cryptodev/cryptodev-module_1.12.bb | 1 + .../files/0001-Fix-build-for-linux-5.10.220.patch | 32 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-linux-5.10.220.patch (limited to 'meta/recipes-kernel') 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 DEPENDS += "cryptodev-linux" SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch \ + file://0001-Fix-build-for-linux-5.10.220.patch \ " EXTRA_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 @@ +From 47f9d88ca5107d1814ecfc7faf6d02d1140978a8 Mon Sep 17 00:00:00 2001 +From: Alexandre Bard +Date: Wed, 3 Jul 2024 15:01:22 +0200 +Subject: [PATCH] Fix build for linux 5.10.220 + +The commit previously integrated is 5.11 has now been backported to +5.10.y branch. + +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=1aecdaa7e2c6619a7d2c0a81c8f5c06e52f870f3 + +Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/157a624d7a892ea5fb2df4bbd4e71c008adbecb7] +Signed-off-by: Hugo SIMELIERE +--- + ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ioctl.c b/ioctl.c +index 95481d4..11fa27a 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -871,7 +871,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_) + if (unlikely(ret)) { + #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + sys_close(fd); +-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 220)) + ksys_close(fd); + #else + close_fd(fd); +-- +2.46.0 + -- cgit v1.2.3-54-g00ecf