qoriq cryptodev-{linux,tests,module}: remove

All patches were merged in upstream cryptodev-linux repository.
cryptodev recipes for qoriq in this layer used the same codes with
the ones in poky. Remove to avoid maintenance efforts.

Signed-off-by: Ting Liu <ting.liu@nxp.com>

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index e982f3703f24b93e24cf190f00a42c54bf680cbc..e482b8575c685227d863a6c0497823b4689fb491 100644 (file)
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -1,7 +1,4 @@
 # common providers of QorIQ targets
-PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux"
-PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
-PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/bootloader ?= "${PREFERRED_PROVIDER_u-boot}"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
@@ -35,6 +32,5 @@ MACHINE_SOCARCH_SUFFIX ?= ""
 MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
-MACHINE_SOCARCH_FILTER_append_qoriq = " cryptodev-qoriq-linux cryptodev-qoriq-module cryptodev-qoriq-test"
 
 INHERIT += "fsl-dynamic-packagearch"

diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc b/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc
deleted file mode 100644 (file)
index 72fb6a6..0000000
--- a/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-HOMEPAGE = "http://cryptodev-linux.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-python() {
-    d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', ''))
-    pkgs = d.getVar('PACKAGES').split()
-    for p in pkgs:
-        if '-qoriq' in p:
-            d.appendVar("RPROVIDES_" + p, ' ' + p.replace('-qoriq', ''))
-            d.appendVar("RCONFLICTS_" + p, ' ' + p.replace('-qoriq', ''))
-            d.appendVar("RREPLACES_" + p, ' ' + p.replace('-qoriq', ''))
-}
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cryptodev-linux;protocol=https;nobranch=1"
-SRCREV = "fabe5989a3dc9fba0cd0a40b612247cdde351c01"
-
-S = "${WORKDIR}/git"
-
-CLEANBROKEN = "1"

diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb
deleted file mode 100644 (file)
index c2cbc71..0000000
--- a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require recipes-kernel/cryptodev/cryptodev-linux_${PV}.bb
-require cryptodev-qoriq-${PV}.inc
-
-BBCLASSEXTEND = ""
-COMPATIBLE_MACHINE = "(qoriq)"

diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb
deleted file mode 100644 (file)
index 86078c5..0000000
--- a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require recipes-kernel/cryptodev/cryptodev-module_${PV}.bb
-require cryptodev-qoriq-${PV}.inc
-
-inherit qoriq_build_64bit_kernel
-
-SRC_URI += " \
-file://0001-Disable-installing-header-file-provided-by-another-p.patch \
-"
-
-COMPATIBLE_MACHINE = "(qoriq)"

diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb
deleted file mode 100644 (file)
index 784c38b..0000000
--- a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require recipes-kernel/cryptodev/cryptodev-tests_${PV}.bb
-require cryptodev-qoriq-${PV}.inc
-
-SRC_URI += " \
-file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \
-"
-
-COMPATIBLE_MACHINE = "(qoriq)"

diff --git a/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
deleted file mode 100644 (file)
index 84fd27e..0000000
--- a/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1980a8f4779a955e73285e7a0d86549b69bea5c8 Mon Sep 17 00:00:00 2001
-From: Yu Zongchun <b40527@freescale.com>
-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 <b40527@freescale.com>
-
-Upstream-Status: Pending
-
----
- Makefile       |    6 ++++++
- tests/Makefile |    8 ++++++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -35,6 +35,9 @@ modules_install:
-       $(MAKE) $(KERNEL_MAKE_OPTS) modules_install
-       install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h
- 
-+install_tests:
-+      make -C tests install DESTDIR=$(PREFIX)
-+
- clean:
-       $(MAKE) $(KERNEL_MAKE_OPTS) clean
-       rm -f $(hostprogs) *~
-@@ -43,6 +46,9 @@ clean:
- check:
-       CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests check
- 
-+testprogs:
-+      KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs
-+
- CPOPTS =
- ifneq ($(SHOW_TYPES),)
- CPOPTS += --show-types
-Index: git/tests/Makefile
-===================================================================
---- git.orig/tests/Makefile
-+++ git/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)
- 

diff --git a/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
deleted file mode 100644 (file)
index 885b582..0000000
--- a/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8a884f55bd1527baa82fab68c186ba546273860c 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 5a080e0..bf02396 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,7 +33,6 @@ install: modules_install
- 
- modules_install:
-       $(MAKE) $(KERNEL_MAKE_OPTS) modules_install
--      install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h
- 
- clean:
-       $(MAKE) $(KERNEL_MAKE_OPTS) clean