From ebee6e8953309fc7c2bb52f4aabdec5020be3de4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 23 Aug 2020 22:20:03 +0200 Subject: cryptodev: upgrade 1.10 -> 1.11 (From OE-Core rev: 7d1532e4dc0dfe78660bb076018847aaf3fa8f2f) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../cryptodev/cryptodev-linux_1.10.bb | 13 ------ .../cryptodev/cryptodev-linux_1.11.bb | 13 ++++++ .../cryptodev/cryptodev-module_1.10.bb | 18 -------- .../cryptodev/cryptodev-module_1.11.bb | 16 +++++++ .../cryptodev/cryptodev-tests_1.10.bb | 21 ---------- .../cryptodev/cryptodev-tests_1.11.bb | 21 ++++++++++ meta/recipes-kernel/cryptodev/cryptodev.inc | 2 +- .../files/0001-Fix-build-for-Linux-5.8-rc1.patch | 49 ---------------------- 8 files changed, 51 insertions(+), 102 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch (limited to 'meta/recipes-kernel/cryptodev') diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb deleted file mode 100644 index c55577c661..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb +++ /dev/null @@ -1,13 +0,0 @@ -require cryptodev.inc - -SUMMARY = "A /dev/crypto device driver header file" - -do_compile[noexec] = "1" - -# Just install cryptodev.h which is the only header file needed to be exported -do_install() { - install -D ${S}/crypto/cryptodev.h ${D}${includedir}/crypto/cryptodev.h -} - -ALLOW_EMPTY_${PN} = "1" -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb new file mode 100644 index 0000000000..c55577c661 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb @@ -0,0 +1,13 @@ +require cryptodev.inc + +SUMMARY = "A /dev/crypto device driver header file" + +do_compile[noexec] = "1" + +# Just install cryptodev.h which is the only header file needed to be exported +do_install() { + install -D ${S}/crypto/cryptodev.h ${D}${includedir}/crypto/cryptodev.h +} + +ALLOW_EMPTY_${PN} = "1" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb deleted file mode 100644 index 6474599c45..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb +++ /dev/null @@ -1,18 +0,0 @@ -require cryptodev.inc - -SUMMARY = "A /dev/crypto device driver kernel module" - -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 \ -" - -EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' - -RCONFLICTS_${PN} = "ocf-linux" -RREPLACES_${PN} = "ocf-linux" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb new file mode 100644 index 0000000000..b3b554c7d3 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb @@ -0,0 +1,16 @@ +require cryptodev.inc + +SUMMARY = "A /dev/crypto device driver kernel module" + +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 \ + " + +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' + +RCONFLICTS_${PN} = "ocf-linux" +RREPLACES_${PN} = "ocf-linux" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb deleted file mode 100644 index 9cb5dcb94f..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb +++ /dev/null @@ -1,21 +0,0 @@ -require cryptodev.inc - -SUMMARY = "A test suite for /dev/crypto device driver" - -DEPENDS += "openssl" - -SRC_URI += " \ -file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ -" - -EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' - -do_compile() { - oe_runmake testprogs -} - -do_install() { - oe_runmake install_tests -} - -FILES_${PN} = "${bindir}/*" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb new file mode 100644 index 0000000000..9cb5dcb94f --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb @@ -0,0 +1,21 @@ +require cryptodev.inc + +SUMMARY = "A test suite for /dev/crypto device driver" + +DEPENDS += "openssl" + +SRC_URI += " \ +file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ +" + +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' + +do_compile() { + oe_runmake testprogs +} + +do_install() { + oe_runmake install_tests +} + +FILES_${PN} = "${bindir}/*" 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 -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 - -Upstream-Status: Backport [9e765068582aae3696520346a7500322ca6cc2de] - -Signed-off-by: He Zhe ---- - 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 - -- cgit v1.2.3-54-g00ecf