diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2023-05-01 12:34:12 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:26 +0100 |
commit | 2cd57b3f33803fb5f0bf12044941a2e1cc038b48 (patch) | |
tree | df67019e0029fcc3f66e94d484e1632a3992821d | |
parent | b729a12fc0409e6301c40f88a54c793396725709 (diff) | |
download | poky-2cd57b3f33803fb5f0bf12044941a2e1cc038b48.tar.gz |
cryptodev: upgrade to 1.13
Upgrade cryptodev to new release 1.13. This resoves the Kernel build
issues for 6.3.y, where Crypto API has been updated, see [1].
Refresh all layer patches with `devtool` to resolve hunks.
Link: [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=255e48eb17684157336bd6dd98d22c1b2d9e3f43
(From OE-Core rev: dc85b747af14f5262590e72e55d2c49670cf09a7)
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb (renamed from meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch | 38 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch | 11 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch | 3 |
7 files changed, 28 insertions, 26 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb index d5ea9d8529..d5ea9d8529 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.13.bb | |||
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb index 5192cf03ed..5192cf03ed 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.13.bb | |||
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb index c541478796..c541478796 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb | |||
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index ef342a157c..61c688f1d0 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc | |||
@@ -10,7 +10,7 @@ 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 = "e0c25e289d6baf1d83c2b9cb523d3bc237d0c0c9" | 13 | SRCREV = "795f5fda1485d447cdbad342e8304be317d4f7e8" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch index 84fd27e681..8c40e62389 100644 --- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch +++ b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1980a8f4779a955e73285e7a0d86549b69bea5c8 Mon Sep 17 00:00:00 2001 | 1 | From 3ba8ba9410464d0986bc6cc5ddb1819745af1eb2 Mon Sep 17 00:00:00 2001 |
2 | From: Yu Zongchun <b40527@freescale.com> | 2 | From: Yu Zongchun <b40527@freescale.com> |
3 | Date: Sun, 28 Apr 2013 14:39:22 +0800 | 3 | Date: Sun, 28 Apr 2013 14:39:22 +0800 |
4 | Subject: [PATCH] Add the compile and install rules for cryptodev tests folder | 4 | Subject: [PATCH] Add the compile and install rules for cryptodev tests folder |
@@ -10,27 +10,27 @@ Signed-off-by: Yu Zongchun <b40527@freescale.com> | |||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | --- | 12 | --- |
13 | Makefile | 6 ++++++ | 13 | Makefile | 6 ++++++ |
14 | tests/Makefile | 8 ++++++++ | 14 | tests/Makefile | 8 ++++++++ |
15 | 2 files changed, 14 insertions(+), 0 deletions(-) | 15 | 2 files changed, 14 insertions(+) |
16 | 16 | ||
17 | Index: git/Makefile | 17 | diff --git a/Makefile b/Makefile |
18 | =================================================================== | 18 | index d83aee6..3a750a1 100644 |
19 | --- git.orig/Makefile | 19 | --- a/Makefile |
20 | +++ git/Makefile | 20 | +++ b/Makefile |
21 | @@ -35,6 +35,9 @@ modules_install: | 21 | @@ -41,6 +41,9 @@ modules_install: |
22 | $(MAKE) $(KERNEL_MAKE_OPTS) modules_install | 22 | install_tests: tests |
23 | install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h | 23 | $(MAKE) -C tests install DESTDIR=$(PREFIX) |
24 | 24 | ||
25 | +install_tests: | 25 | +install_tests: |
26 | + make -C tests install DESTDIR=$(PREFIX) | 26 | + make -C tests install DESTDIR=$(PREFIX) |
27 | + | 27 | + |
28 | clean: | 28 | clean: |
29 | $(MAKE) $(KERNEL_MAKE_OPTS) clean | 29 | $(MAKE) $(KERNEL_MAKE_OPTS) clean |
30 | rm -f $(hostprogs) *~ | 30 | CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests clean |
31 | @@ -43,6 +46,9 @@ clean: | 31 | @@ -54,6 +57,9 @@ tests: |
32 | check: | 32 | |
33 | CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests check | 33 | .PHONY: install modules_install tests install_tests |
34 | 34 | ||
35 | +testprogs: | 35 | +testprogs: |
36 | + KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs | 36 | + KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs |
@@ -38,10 +38,10 @@ Index: git/Makefile | |||
38 | CPOPTS = | 38 | CPOPTS = |
39 | ifneq ($(SHOW_TYPES),) | 39 | ifneq ($(SHOW_TYPES),) |
40 | CPOPTS += --show-types | 40 | CPOPTS += --show-types |
41 | Index: git/tests/Makefile | 41 | diff --git a/tests/Makefile b/tests/Makefile |
42 | =================================================================== | 42 | index 2502f32..2fb7a9a 100644 |
43 | --- git.orig/tests/Makefile | 43 | --- a/tests/Makefile |
44 | +++ git/tests/Makefile | 44 | +++ b/tests/Makefile |
45 | @@ -23,6 +23,12 @@ bindir = $(execprefix)/bin | 45 | @@ -23,6 +23,12 @@ bindir = $(execprefix)/bin |
46 | 46 | ||
47 | all: $(hostprogs) | 47 | all: $(hostprogs) |
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 index 885b5823e4..c7fdef4da4 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8a884f55bd1527baa82fab68c186ba546273860c Mon Sep 17 00:00:00 2001 | 1 | From 66d85d3f26e21cf7c38b27de0dcc42376f5d853e Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Sun, 6 Apr 2014 19:51:39 -0400 | 3 | Date: Sun, 6 Apr 2014 19:51:39 -0400 |
4 | Subject: [PATCH] Disable installing header file provided by another package | 4 | Subject: [PATCH] Disable installing header file provided by another package |
@@ -6,19 +6,20 @@ Subject: [PATCH] Disable installing header file provided by another package | |||
6 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | 6 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [ OE specific ] | 8 | Upstream-Status: Inappropriate [ OE specific ] |
9 | |||
9 | --- | 10 | --- |
10 | Makefile | 1 - | 11 | Makefile | 1 - |
11 | 1 file changed, 1 deletion(-) | 12 | 1 file changed, 1 deletion(-) |
12 | 13 | ||
13 | diff --git a/Makefile b/Makefile | 14 | diff --git a/Makefile b/Makefile |
14 | index 5a080e0..bf02396 100644 | 15 | index d83aee6..c8d8ae5 100644 |
15 | --- a/Makefile | 16 | --- a/Makefile |
16 | +++ b/Makefile | 17 | +++ b/Makefile |
17 | @@ -33,7 +33,6 @@ install: modules_install | 18 | @@ -36,7 +36,6 @@ install: modules_install |
18 | 19 | ||
19 | modules_install: | 20 | modules_install: |
20 | $(MAKE) $(KERNEL_MAKE_OPTS) modules_install | 21 | $(MAKE) $(KERNEL_MAKE_OPTS) modules_install |
21 | - install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h | 22 | - install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h |
22 | 23 | ||
23 | clean: | 24 | install_tests: tests |
24 | $(MAKE) $(KERNEL_MAKE_OPTS) clean | 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 index 347a4aef0f..3285548a57 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From e2c2895d52761ddc6384a31364236dd13f677c34 Mon Sep 17 00:00:00 2001 | 1 | From 47438e53e1156db0916c0f4683a24fe4d82152f2 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Fri, 10 Sep 2021 10:44:42 +0200 | 3 | Date: Fri, 10 Sep 2021 10:44:42 +0200 |
4 | Subject: [PATCH] tests/Makefile: do not use -Werror | 4 | Subject: [PATCH] tests/Makefile: do not use -Werror |
@@ -8,6 +8,7 @@ Reported at https://github.com/cryptodev-linux/cryptodev-linux/issues/67 | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [upstream needs to update the code] | 9 | Upstream-Status: Inappropriate [upstream needs to update the code] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
11 | --- | 12 | --- |
12 | tests/Makefile | 2 +- | 13 | tests/Makefile | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |