From: Wang Mingyu Date: Thu, 1 Aug 2024 05:40:23 +0000 (+0800) Subject: cryptodev: upgrade 1.13 -> 1.14 X-Git-Tag: yocto-5.2~2229 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a0ee7a20d956589623f501bb4a835573d5b2439;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cryptodev: upgrade 1.13 -> 1.14 0001-Disable-installing-header-file-provided-by-another-p.patch 0001-tests-Makefile-do-not-use-Werror.patch removed since they're included in 1.14 Changelog: =========== * Fix compilation issues after API changes in several Linux kernels * Split install targets to help package maintainers Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb similarity index 100% rename from meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb rename to meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb similarity index 74% rename from meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb rename to meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb index 5192cf03ed3..6fb75675bb7 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb @@ -7,9 +7,6 @@ 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" diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb similarity index 74% rename from meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb rename to meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb index 458ad8ecf2a..f6a286e1b79 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb @@ -4,10 +4,6 @@ SUMMARY = "A test suite for /dev/crypto device driver" DEPENDS += "openssl" -SRC_URI += " \ - file://0001-tests-Makefile-do-not-use-Werror.patch \ - " - EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' do_compile() { diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 64a9c2926b8..8d0aad4a01c 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protocol=https \ " -SRCREV = "bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f" -PV = "1.13+git${SRCPV}" +SRCREV = "135cbff90af2ba97d88f1472be595ce78721972c" +PV = "1.14" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch deleted file mode 100644 index c7fdef4da48..00000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 66d85d3f26e21cf7c38b27de0dcc42376f5d853e Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Sun, 6 Apr 2014 19:51:39 -0400 -Subject: [PATCH] Disable installing header file provided by another package - -Signed-off-by: Denys Dmytriyenko - -Upstream-Status: Inappropriate [ OE specific ] - ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d83aee6..c8d8ae5 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,6 @@ install: modules_install - - modules_install: - $(MAKE) $(KERNEL_MAKE_OPTS) modules_install -- install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h - - install_tests: tests - $(MAKE) -C tests install DESTDIR=$(PREFIX) diff --git a/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch b/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch deleted file mode 100644 index 3285548a579..00000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 47438e53e1156db0916c0f4683a24fe4d82152f2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 10 Sep 2021 10:44:42 +0200 -Subject: [PATCH] tests/Makefile: do not use -Werror - -Otherwise, openssl 3 deprecation warnings become errors. -Reported at https://github.com/cryptodev-linux/cryptodev-linux/issues/67 - -Upstream-Status: Inappropriate [upstream needs to update the code] -Signed-off-by: Alexander Kanavin - ---- - tests/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile b/tests/Makefile -index 2fb7a9a..e94f80e 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -1,4 +1,4 @@ --CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall -Werror -+CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall - - comp_progs := cipher_comp hash_comp hmac_comp -