cryptodev: upgrade 1.13 -> 1.14
From: Wang Mingyu <[email protected]>
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
--- .../cryptodev/cryptodev-linux_1.13.bb | 13 ----------- .../cryptodev/cryptodev-linux_1.14.bb | 13 +++++++++++ .../cryptodev/cryptodev-module_1.13.bb | 16 -------------- .../cryptodev/cryptodev-module_1.14.bb | 13 +++++++++++ .../cryptodev/cryptodev-tests_1.13.bb | 21 ------------------ .../cryptodev/cryptodev-tests_1.14.bb | 17 +++++++++++++++ meta/recipes-kernel/cryptodev/cryptodev.inc | 4 ++-- ...talling-header-file-provided-by-another-p.patch | 25 ---------------------- .../0001-tests-Makefile-do-not-use-Werror.patch | 25 ---------------------- 9 files changed, 45 insertions(+), 102 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch
meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb deleted +0 -13
@@ -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"
meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb new file +13 -0
@@ -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"
meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb deleted +0 -16
@@ -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"
meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb new file +13 -0
@@ -0,0 +1,13 @@ +require cryptodev.inc + +SUMMARY = "A /dev/crypto device driver kernel module" + +inherit module + +# Header file provided by a separate package +DEPENDS += "cryptodev-linux" + +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' + +RCONFLICTS:${PN} = "ocf-linux" +RREPLACES:${PN} = "ocf-linux"
meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb deleted +0 -21
@@ -1,21 +0,0 @@ -require cryptodev.inc - -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() { - oe_runmake tests -} - -do_install() { - oe_runmake install_tests -} - -FILES:${PN} = "${bindir}/*"
meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb new file +17 -0
@@ -0,0 +1,17 @@ +require cryptodev.inc + +SUMMARY = "A test suite for /dev/crypto device driver" + +DEPENDS += "openssl" + +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' + +do_compile() { + oe_runmake tests +} + +do_install() { + oe_runmake install_tests +} + +FILES:${PN} = "${bindir}/*"
meta/recipes-kernel/cryptodev/cryptodev.inc +2 -2
@@ -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"
meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 66d85d3f26e21cf7c38b27de0dcc42376f5d853e Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Sun, 6 Apr 2014 19:51:39 -0400 -Subject: [PATCH] Disable installing header file provided by another package - -Signed-off-by: Denys Dmytriyenko <[email protected]> - -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)
meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 47438e53e1156db0916c0f4683a24fe4d82152f2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -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 <[email protected]> - ---- - 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 -
Signature · 1 line
cgit 1.2.3-korg
Chirag Shilwant
Acked-byHi,
This back-port from oe-core:master certainly fixes build errors observed with cryptodev 1.13 in oe-core:scarthgap with kernel tip (i.e 6.12-rc1)
Quoted 14 lines · Ryan Eatmon via lists.openembedded.org
From: Wang Mingyu <wangmy@ fujitsu. com> 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 ZjQcmQRYFpfptBannerStart
This message was sent from outside of Texas Instruments.
Do not click links or open attachments unless you recognize the source of this email and know the content is safe.
Report Suspicious
<https://us-phishalarm-ewt.proofpoint.com/EWT/v1/G3vK!uFdqXRfP9k0bKoZEnPPjvChtWQEhifZLq8O7CtulK1UFf3XihEYiQnDb88KEbuUHFzKchMH1NBnCeM755lo$>ZjQcmQRYFpfptBannerEnd
From: Wang Mingyu <[email protected]>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
Quoted 7 lines
Changelog:
===========
* Fix compilation issues after API changes in several Linux kernels
* Split install targets to help package maintainersSigned-off-by Wang Mingyu <[email protected]>Signed-off-by Richard Purdie <[email protected]>
Quoted 238 lines
--- .../cryptodev/cryptodev-linux_1.13.bb | 13 ----------- .../cryptodev/cryptodev-linux_1.14.bb | 13 +++++++++++ .../cryptodev/cryptodev-module_1.13.bb | 16 -------------- .../cryptodev/cryptodev-module_1.14.bb | 13 +++++++++++ .../cryptodev/cryptodev-tests_1.13.bb | 21 ------------------ .../cryptodev/cryptodev-tests_1.14.bb | 17 +++++++++++++++ meta/recipes-kernel/cryptodev/cryptodev.inc | 4 ++-- ...talling-header-file-provided-by-another-p.patch | 25 ---------------------- .../0001-tests-Makefile-do-not-use-Werror.patch | 25 ---------------------- 9 files changed, 45 insertions(+), 102 deletions(-)delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb
create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb
delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb
create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb
delete mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb
create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb
delete mode 100644meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patchdelete mode 100644meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patchmeta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb deleted +0
-13@@ -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"meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb new file +13
-0@@ -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"meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb deleted +0
-16@@ -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"meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb new file +13
-0@@ -0,0 +1,13 @@ +require cryptodev.inc + +SUMMARY = "A /dev/crypto device driver kernel module" + +inherit module + +# Header file provided by a separate package +DEPENDS += "cryptodev-linux" + +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' + +RCONFLICTS:${PN} = "ocf-linux" +RREPLACES:${PN} = "ocf-linux"meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb deleted +0
-21@@ -1,21 +0,0 @@ -require cryptodev.inc - -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() { - oe_runmake tests -} - -do_install() { - oe_runmake install_tests -} - -FILES:${PN} = "${bindir}/*"meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb new file +17
-0@@ -0,0 +1,17 @@ +require cryptodev.inc + +SUMMARY = "A test suite for /dev/crypto device driver" + +DEPENDS += "openssl" + +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' + +do_compile() { + oe_runmake tests +} + +do_install() { + oe_runmake install_tests +} + +FILES:${PN} = "${bindir}/*"meta/recipes-kernel/cryptodev/cryptodev.inc +2
-2@@ -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"meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch deleted +0
-25@@ -1,25 +0,0 @@ -From 66d85d3f26e21cf7c38b27de0dcc42376f5d853e Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Sun, 6 Apr 2014 19:51:39 -0400 -Subject: [PATCH] Disable installing header file provided by another package - -Signed-off-by: Denys Dmytriyenko <[email protected]> - -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)meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch deleted +0
-25@@ -1,25 +0,0 @@ -From 47438e53e1156db0916c0f4683a24fe4d82152f2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -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 athttps://urldefense.com/v3/__https://github.com/cryptodev-linux/cryptodev-linux/issues/67__;!!G3vK!VTKl15T7qwj_TgE0YSGLB5hqqLhPa2QS5bG0HPNMZitM5KjMaZ3WTI2e7ff7M5gN9cxuscB5KQOGjjQFx0YnpfRDJqr-JxKoFg$ - -Upstream-Status: Inappropriate [upstream needs to update the code] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - 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 -Signature · 10 lines
cgit 1.2.3-korg -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#205235): https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/205235__;!!G3vK!VTKl15T7qwj_TgE0YSGLB5hqqLhPa2QS5bG0HPNMZitM5KjMaZ3WTI2e7ff7M5gN9cxuscB5KQOGjjQFx0YnpfRDJqrtMNtNnw$ Mute This Topic: https://urldefense.com/v3/__https://lists.openembedded.org/mt/108818948/7030289__;!!G3vK!VTKl15T7qwj_TgE0YSGLB5hqqLhPa2QS5bG0HPNMZitM5KjMaZ3WTI2e7ff7M5gN9cxuscB5KQOGjjQFx0YnpfRDJqr9uMEUnQ$ Group Owner: [email protected] Unsubscribe: https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/unsub__;!!G3vK!VTKl15T7qwj_TgE0YSGLB5hqqLhPa2QS5bG0HPNMZitM5KjMaZ3WTI2e7ff7M5gN9cxuscB5KQOGjjQFx0YnpfRDJqq9anKlOQ$ [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-