From 7069940be6f1308381b778ec31ab1523adc7018a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 9 May 2023 19:23:36 +0200 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../cryptodev/cryptodev-tests_1.13.bb | 7 +-- ...pile-and-install-rules-for-cryptodev-test.patch | 66 ---------------------- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch 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" DEPENDS += "openssl" SRC_URI += " \ -file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ -file://0001-tests-Makefile-do-not-use-Werror.patch \ -" + file://0001-tests-Makefile-do-not-use-Werror.patch \ + " EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' do_compile() { - oe_runmake testprogs + oe_runmake tests } do_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 @@ -From 3ba8ba9410464d0986bc6cc5ddb1819745af1eb2 Mon Sep 17 00:00:00 2001 -From: Yu Zongchun -Date: Sun, 28 Apr 2013 14:39:22 +0800 -Subject: [PATCH] Add the compile and install rules for cryptodev tests folder - -This is required to install the cryptodev tests folder to rootfs - -Signed-off-by: Yu Zongchun - -Upstream-Status: Pending - ---- - Makefile | 6 ++++++ - tests/Makefile | 8 ++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/Makefile b/Makefile -index d83aee6..3a750a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,6 +41,9 @@ modules_install: - install_tests: tests - $(MAKE) -C tests install DESTDIR=$(PREFIX) - -+install_tests: -+ make -C tests install DESTDIR=$(PREFIX) -+ - clean: - $(MAKE) $(KERNEL_MAKE_OPTS) clean - CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests clean -@@ -54,6 +57,9 @@ tests: - - .PHONY: install modules_install tests install_tests - -+testprogs: -+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs -+ - CPOPTS = - ifneq ($(SHOW_TYPES),) - CPOPTS += --show-types -diff --git a/tests/Makefile b/tests/Makefile -index 2502f32..2fb7a9a 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -23,6 +23,12 @@ bindir = $(execprefix)/bin - - all: $(hostprogs) - -+install: -+ install -d $(DESTDIR)/usr/bin/tests_cryptodev -+ for bin in $(hostprogs); do \ -+ install -m 755 $${bin} $(DESTDIR)/usr/bin/tests_cryptodev/; \ -+ done -+ - check: $(hostprogs) - ./cipher - ./hmac -@@ -38,6 +44,8 @@ install: - install -m 755 $$prog $(DESTDIR)/$(bindir); \ - done - -+testprogs: $(hostprogs) -+ - clean: - rm -f *.o *~ $(hostprogs) - -- cgit v1.2.3-54-g00ecf