diff options
| -rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-module_1.14.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb) | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-tests_1.14.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb) | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch | 25 |
6 files changed, 2 insertions, 59 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.14.bb index d5ea9d8529..d5ea9d8529 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb +++ b/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 index 5192cf03ed..6fb75675bb 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 | |||
| 7 | # Header file provided by a separate package | 7 | # Header file provided by a separate package |
| 8 | DEPENDS += "cryptodev-linux" | 8 | DEPENDS += "cryptodev-linux" |
| 9 | 9 | ||
| 10 | SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch \ | ||
| 11 | " | ||
| 12 | |||
| 13 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' | 10 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' |
| 14 | 11 | ||
| 15 | RCONFLICTS:${PN} = "ocf-linux" | 12 | 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 index 458ad8ecf2..f6a286e1b7 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" | |||
| 4 | 4 | ||
| 5 | DEPENDS += "openssl" | 5 | DEPENDS += "openssl" |
| 6 | 6 | ||
| 7 | SRC_URI += " \ | ||
| 8 | file://0001-tests-Makefile-do-not-use-Werror.patch \ | ||
| 9 | " | ||
| 10 | |||
| 11 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' | 7 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' |
| 12 | 8 | ||
| 13 | do_compile() { | 9 | do_compile() { |
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 64a9c2926b..8d0aad4a01 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" | |||
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protocol=https \ | 11 | SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protocol=https \ |
| 12 | " | 12 | " |
| 13 | SRCREV = "bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f" | 13 | SRCREV = "135cbff90af2ba97d88f1472be595ce78721972c" |
| 14 | PV = "1.13+git${SRCPV}" | 14 | PV = "1.14" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
| 17 | 17 | ||
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 c7fdef4da4..0000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From 66d85d3f26e21cf7c38b27de0dcc42376f5d853e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Denys Dmytriyenko <denys@ti.com> | ||
| 3 | Date: Sun, 6 Apr 2014 19:51:39 -0400 | ||
| 4 | Subject: [PATCH] Disable installing header file provided by another package | ||
| 5 | |||
| 6 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [ OE specific ] | ||
| 9 | |||
| 10 | --- | ||
| 11 | Makefile | 1 - | ||
| 12 | 1 file changed, 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/Makefile b/Makefile | ||
| 15 | index d83aee6..c8d8ae5 100644 | ||
| 16 | --- a/Makefile | ||
| 17 | +++ b/Makefile | ||
| 18 | @@ -36,7 +36,6 @@ install: modules_install | ||
| 19 | |||
| 20 | modules_install: | ||
| 21 | $(MAKE) $(KERNEL_MAKE_OPTS) modules_install | ||
| 22 | - install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h | ||
| 23 | |||
| 24 | install_tests: tests | ||
| 25 | $(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 3285548a57..0000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From 47438e53e1156db0916c0f4683a24fe4d82152f2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Fri, 10 Sep 2021 10:44:42 +0200 | ||
| 4 | Subject: [PATCH] tests/Makefile: do not use -Werror | ||
| 5 | |||
| 6 | Otherwise, openssl 3 deprecation warnings become errors. | ||
| 7 | Reported at https://github.com/cryptodev-linux/cryptodev-linux/issues/67 | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [upstream needs to update the code] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 11 | |||
| 12 | --- | ||
| 13 | tests/Makefile | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/tests/Makefile b/tests/Makefile | ||
| 17 | index 2fb7a9a..e94f80e 100644 | ||
| 18 | --- a/tests/Makefile | ||
| 19 | +++ b/tests/Makefile | ||
| 20 | @@ -1,4 +1,4 @@ | ||
| 21 | -CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall -Werror | ||
| 22 | +CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall | ||
| 23 | |||
| 24 | comp_progs := cipher_comp hash_comp hmac_comp | ||
| 25 | |||
