From 81c152bac298f13df573e6c0b14c718bc989d4cb Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 12 Feb 2021 02:41:01 +0100 Subject: cryptodev: upgrade to 1.12 (From OE-Core rev: fc4a42442a31f094ef20d9d2f97b4e2e1a9bbead) Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- .../cryptodev/cryptodev-linux_1.11.bb | 13 ------------- .../cryptodev/cryptodev-linux_1.12.bb | 13 +++++++++++++ .../cryptodev/cryptodev-module_1.11.bb | 16 ---------------- .../cryptodev/cryptodev-module_1.12.bb | 16 ++++++++++++++++ .../cryptodev/cryptodev-tests_1.11.bb | 21 --------------------- .../cryptodev/cryptodev-tests_1.12.bb | 21 +++++++++++++++++++++ meta/recipes-kernel/cryptodev/cryptodev.inc | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb deleted file mode 100644 index c55577c661..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.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.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb new file mode 100644 index 0000000000..c55577c661 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.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.11.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb deleted file mode 100644 index b3b554c7d3..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb +++ /dev/null @@ -1,16 +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 \ - " - -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.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb new file mode 100644 index 0000000000..b3b554c7d3 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.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.11.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb deleted file mode 100644 index 9cb5dcb94f..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.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.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb new file mode 100644 index 0000000000..9cb5dcb94f --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.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 c050eda49e..fbbba2dcf4 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 = "fabe5989a3dc9fba0cd0a40b612247cdde351c01" +SRCREV = "e0c25e289d6baf1d83c2b9cb523d3bc237d0c0c9" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf