Signed-off-by: Alexander Kanavin <[email protected]>
---
...-linux_1.10.bb => cryptodev-linux_1.11.bb} | 0
...odule_1.10.bb => cryptodev-module_1.11.bb} | 6 +--
...-tests_1.10.bb => cryptodev-tests_1.11.bb} | 0
meta/recipes-kernel/cryptodev/cryptodev.inc | 2 +-
.../0001-Fix-build-for-Linux-5.8-rc1.patch | 49 -------------------
5 files changed, 3 insertions(+), 54 deletions(-)
rename meta/recipes-kernel/cryptodev/{cryptodev-linux_1.10.bb =>
cryptodev-linux_1.11.bb} (100%)
rename meta/recipes-kernel/cryptodev/{cryptodev-module_1.10.bb =>
cryptodev-module_1.11.bb} (68%)
rename meta/recipes-kernel/cryptodev/{cryptodev-tests_1.10.bb =>
cryptodev-tests_1.11.bb} (100%)
delete mode 100644
meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb
b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb
similarity index 100%
rename from meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb
similarity index 68%
rename from meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb
index 6474599c45..b3b554c7d3 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb
@@ -7,10 +7,8 @@ inherit module
# Header file provided by a separate package
DEPENDS += "cryptodev-linux"
-SRC_URI += " \
-file://0001-Disable-installing-header-file-provided-by-another-p.patch \
-file://0001-Fix-build-for-Linux-5.8-rc1.patch \
-"
+SRC_URI +=
"file://0001-Disable-installing-header-file-provided-by-another-p.patch \
+ "
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb
b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb
similarity index 100%
rename from meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc
b/meta/recipes-kernel/cryptodev/cryptodev.inc
index f99f8bc9f0..906f4fc181 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
"
-SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b"
+SRCREV = "2299d39475e91392abd050ea09f2d20feecb4adf"
S = "${WORKDIR}/git"
diff --git
a/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
b/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
deleted file mode 100644
index 02c721a4f3..0000000000
--- a/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9e765068582aae3696520346a7500322ca6cc2de Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <[email protected]>
-Date: Sat, 13 Jun 2020 19:46:44 +0200
-Subject: [PATCH] Fix build for Linux 5.8-rc1
-
-See also:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9740ca4e95b43b91a4a848694a20d01ba6818f7b
-
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=da1c55f1b272f4bd54671d459b39ea7b54944ef9
-
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d8ed45c5dcd455fc5848d47f86883a1b872ac0d0
-
-Signed-off-by: Joan Bruguera <[email protected]>
-
-Upstream-Status: Backport [9e765068582aae3696520346a7500322ca6cc2de]
-
-Signed-off-by: He Zhe <[email protected]>
----
- zc.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/zc.c b/zc.c
-index ae464ff..2c286bb 100644
---- a/zc.c
-+++ b/zc.c
-@@ -58,7 +58,11 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int
write,
- return 0;
- }
-
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
- down_read(&mm->mmap_sem);
-+#else
-+ mmap_read_lock(mm);
-+#endif
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0))
- ret = get_user_pages(task, mm,
- (unsigned long)addr, pgcount, write, 0, pg, NULL);
-@@ -74,7 +78,11 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int
write,
- (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
- pg, NULL, NULL);
- #endif
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
- up_read(&mm->mmap_sem);
-+#else
-+ mmap_read_unlock(mm);
-+#endif
- if (ret != pgcount)
- return -EINVAL;
-
---
-2.17.1
-
--
2.28.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#141727):
https://lists.openembedded.org/g/openembedded-core/message/141727
Mute This Topic: https://lists.openembedded.org/mt/76372634/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
