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

(From OE-Core rev: 0a0ee7a20d956589623f501bb4a835573d5b2439)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2024-08-01 13:40:23 +08:00
committed by Richard Purdie
parent a7260ae9ba
commit bf1f24e8f6
6 changed files with 2 additions and 59 deletions

View File

@@ -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"

View File

@@ -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() {

View File

@@ -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"

View File

@@ -1,25 +0,0 @@
From 66d85d3f26e21cf7c38b27de0dcc42376f5d853e Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Sun, 6 Apr 2014 19:51:39 -0400
Subject: [PATCH] Disable installing header file provided by another package
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
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)

View File

@@ -1,25 +0,0 @@
From 47438e53e1156db0916c0f4683a24fe4d82152f2 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
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 <alex@linutronix.de>
---
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