summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-05-09 19:23:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-22 10:53:47 +0100
commit7069940be6f1308381b778ec31ab1523adc7018a (patch)
tree0f9c5560dab06ed6d8c52c473b4a6631bd86e25b
parent4858d204d2c8e5b6b4b00233a1ae43da695c074e (diff)
downloadpoky-7069940be6f1308381b778ec31ab1523adc7018a.tar.gz
cryptodev: remove unneeded patch
With 1.13 version the needed rules are available directly upstream. This wasn't noticed in 1.12->1.13 patch rebase. I verified that installed files are exactly same with and without the patch. (From OE-Core rev: 71a36a0c3e84c3a2b6bc5c52349eda12f0bede0d) Signed-off-by: Alexander Kanavin <alex@linutronix.de> 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-tests_1.13.bb7
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch66
2 files changed, 3 insertions, 70 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb
index c541478796..458ad8ecf2 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.13.bb
@@ -5,14 +5,13 @@ SUMMARY = "A test suite for /dev/crypto device driver"
5DEPENDS += "openssl" 5DEPENDS += "openssl"
6 6
7SRC_URI += " \ 7SRC_URI += " \
8file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ 8 file://0001-tests-Makefile-do-not-use-Werror.patch \
9file://0001-tests-Makefile-do-not-use-Werror.patch \ 9 "
10"
11 10
12EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' 11EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"'
13 12
14do_compile() { 13do_compile() {
15 oe_runmake testprogs 14 oe_runmake tests
16} 15}
17 16
18do_install() { 17do_install() {
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
deleted file mode 100644
index 8c40e62389..0000000000
--- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1From 3ba8ba9410464d0986bc6cc5ddb1819745af1eb2 Mon Sep 17 00:00:00 2001
2From: Yu Zongchun <b40527@freescale.com>
3Date: Sun, 28 Apr 2013 14:39:22 +0800
4Subject: [PATCH] Add the compile and install rules for cryptodev tests folder
5
6This is required to install the cryptodev tests folder to rootfs
7
8Signed-off-by: Yu Zongchun <b40527@freescale.com>
9
10Upstream-Status: Pending
11
12---
13 Makefile | 6 ++++++
14 tests/Makefile | 8 ++++++++
15 2 files changed, 14 insertions(+)
16
17diff --git a/Makefile b/Makefile
18index d83aee6..3a750a1 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -41,6 +41,9 @@ modules_install:
22 install_tests: tests
23 $(MAKE) -C tests install DESTDIR=$(PREFIX)
24
25+install_tests:
26+ make -C tests install DESTDIR=$(PREFIX)
27+
28 clean:
29 $(MAKE) $(KERNEL_MAKE_OPTS) clean
30 CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests clean
31@@ -54,6 +57,9 @@ tests:
32
33 .PHONY: install modules_install tests install_tests
34
35+testprogs:
36+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs
37+
38 CPOPTS =
39 ifneq ($(SHOW_TYPES),)
40 CPOPTS += --show-types
41diff --git a/tests/Makefile b/tests/Makefile
42index 2502f32..2fb7a9a 100644
43--- a/tests/Makefile
44+++ b/tests/Makefile
45@@ -23,6 +23,12 @@ bindir = $(execprefix)/bin
46
47 all: $(hostprogs)
48
49+install:
50+ install -d $(DESTDIR)/usr/bin/tests_cryptodev
51+ for bin in $(hostprogs); do \
52+ install -m 755 $${bin} $(DESTDIR)/usr/bin/tests_cryptodev/; \
53+ done
54+
55 check: $(hostprogs)
56 ./cipher
57 ./hmac
58@@ -38,6 +44,8 @@ install:
59 install -m 755 $$prog $(DESTDIR)/$(bindir); \
60 done
61
62+testprogs: $(hostprogs)
63+
64 clean:
65 rm -f *.o *~ $(hostprogs)
66