From 762b3111f3124ee75404835da751fb95b8466fd4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 16 Dec 2015 16:02:45 +0200 Subject: cryptodev: update to 1.8 Drop 0001-ioctl.c-Fix-build-on-3.19.patch and 0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch, the code has been fixed upstream. Signed-off-by: Alexander Kanavin --- .../cryptodev/cryptodev-linux_1.7.bb | 13 ---------- .../cryptodev/cryptodev-linux_1.8.bb | 13 ++++++++++ .../cryptodev/cryptodev-module_1.7.bb | 18 -------------- .../cryptodev/cryptodev-module_1.8.bb | 17 +++++++++++++ .../cryptodev/cryptodev-tests_1.7.bb | 22 ---------------- .../cryptodev/cryptodev-tests_1.8.bb | 21 ++++++++++++++++ meta/recipes-kernel/cryptodev/cryptodev.inc | 13 ++++++++++ meta/recipes-kernel/cryptodev/cryptodev_1.7.inc | 13 ---------- .../files/0001-ioctl.c-Fix-build-on-3.19.patch | 29 ---------------------- ...ests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch | 29 ---------------------- 10 files changed, 64 insertions(+), 124 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev.inc delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.7.inc delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb deleted file mode 100644 index a33841d091..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -require cryptodev_${PV}.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.8.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb new file mode 100644 index 0000000000..c55577c661 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.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.7.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb deleted file mode 100644 index 5cd52eb871..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb +++ /dev/null @@ -1,18 +0,0 @@ -require cryptodev_${PV}.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-ioctl.c-Fix-build-on-3.19.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.8.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb new file mode 100644 index 0000000000..552eb6abaa --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb @@ -0,0 +1,17 @@ +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.7.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb deleted file mode 100644 index f1ca36eec5..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -require cryptodev_${PV}.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 \ -file://0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch \ -" - -EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' - -do_compile() { - oe_runmake testprogs -} - -do_install() { - oe_runmake install_tests -} - -FILES_${PN} = "${bindir}/tests_cryptodev/*" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb new file mode 100644 index 0000000000..c4005242a7 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.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}/tests_cryptodev/*" diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc new file mode 100644 index 0000000000..ade7ef9cea --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -0,0 +1,13 @@ +HOMEPAGE = "http://cryptodev-linux.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" + +SRC_URI[md5sum] = "02644cc4cd02301e0b503a332eb2f0b5" +SRC_URI[sha256sum] = "67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376" + +S = "${WORKDIR}/cryptodev-linux-${PV}" + +CLEANBROKEN = "1" diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc b/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc deleted file mode 100644 index cca69254cb..0000000000 --- a/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc +++ /dev/null @@ -1,13 +0,0 @@ -HOMEPAGE = "http://cryptodev-linux.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" - -SRC_URI[md5sum] = "0b63b3481cf2c90386b35f057481d36b" -SRC_URI[sha256sum] = "41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25" - -S = "${WORKDIR}/cryptodev-linux-${PV}" - -CLEANBROKEN = "1" diff --git a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch deleted file mode 100644 index 74c8972536..0000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -Date: Mon, 9 Feb 2015 13:51:56 +0100 -Subject: [PATCH] ioctl.c: Fix build on 3.19 - -get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the -actual output of the macro. - -Signed-off-by: Ricardo Ribalda Delgado ---- - ioctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ioctl.c b/ioctl.c -index f26cf93..cf8cc17 100644 ---- a/ioctl.c -+++ b/ioctl.c -@@ -529,7 +529,7 @@ static int - clonefd(struct file *filp) - { - int ret; -- ret = get_unused_fd(); -+ ret = get_unused_fd_flags(0); - if (ret >= 0) { - get_file(filp); - fd_install(ret, filp); --- -2.1.4 - diff --git a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch b/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch deleted file mode 100644 index f5ab8b4f96..0000000000 --- a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Sun, 6 Apr 2014 22:16:30 -0400 -Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS - -Libraries must come after objects, as link order matters, especially -when using linker flags like -Wl,--as-needed. - -Signed-off-by: Denys Dmytriyenko - -Upstream-Status: Pending ---- - tests/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile b/tests/Makefile -index cd202af..67c3c83 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -39,5 +39,5 @@ testprogs: $(hostprogs) - clean: - rm -f *.o *~ $(hostprogs) - --${comp_progs}: LDFLAGS += -lssl -lcrypto -+${comp_progs}: LDLIBS += -lssl -lcrypto - ${comp_progs}: %: %.o openssl_wrapper.o --- -1.9.1 - -- cgit 1.2.3-korg