cryptodev: split userspace header into a separate package

This relaxes the dependencies and openssl and gnutls are not ordered after
the kernel.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 61 insertions, 4 deletions

diff --git a/rules/cryptodev-api.in b/rules/cryptodev-api.in
new file mode 100644
index 000000000..d727df9f8
--- /dev/null
+++ b/rules/cryptodev-api.in
@@ -0,0 +1,9 @@
+## SECTION=project_specific
+
+config CRYPTODEV_API
+	tristate
+	select CRYPTODEV	if RUNTIME
+	prompt "cryptodev API"
+	help
+	  API headers for Cryptodev-linux. This is needed to build
+	  userspace code that uses Cryptodev-linux.
diff --git a/rules/cryptodev-api.make b/rules/cryptodev-api.make
new file mode 100644
index 000000000..606108bd9
--- /dev/null
+++ b/rules/cryptodev-api.make
@@ -0,0 +1,50 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_CRYPTODEV_API) += cryptodev-api
+
+#
+# Paths and names
+#
+CRYPTODEV_API_VERSION	= $(CRYPTODEV_VERSION)
+CRYPTODEV_API_MD5	= $(CRYPTODEV_MD5)
+CRYPTODEV_API		= cryptodev-api-$(CRYPTODEV_API_VERSION)
+CRYPTODEV_API_SUFFIX	= tar.gz
+CRYPTODEV_API_URL	= $(CRYPTODEV_URL)
+CRYPTODEV_API_SOURCE	= $(CRYPTODEV_SOURCE)
+CRYPTODEV_API_DIR	= $(BUILDDIR)/$(CRYPTODEV_API)
+CRYPTODEV_API_LICENSE	= $(CRYPTODEV_LICENSE)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+CRYPTODEV_API_CONF_TOOL	:= NO
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/cryptodev-api.compile:
+	@$(call targetinfo)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/cryptodev-api.install:
+	@$(call targetinfo)
+	@install -m644 -D $(CRYPTODEV_API_DIR)/crypto/cryptodev.h \
+		$(CRYPTODEV_API_PKGDIR)/usr/include/crypto/cryptodev.h
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/cryptodev.make b/rules/cryptodev.make
index d29d46bf5..9809bbb21 100644
--- a/rules/cryptodev.make
+++ b/rules/cryptodev.make
@@ -55,8 +55,6 @@ CRYPTODEV_MAKE_OPT = \
 
 $(STATEDIR)/cryptodev.install:
 	@$(call targetinfo)
-	@install -m644 -D $(CRYPTODEV_DIR)/crypto/cryptodev.h \
-		$(CRYPTODEV_PKGDIR)/usr/include/crypto/cryptodev.h
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/gnutls.in b/rules/gnutls.in
index c0f47b5cf..8b9443652 100644
--- a/rules/gnutls.in
+++ b/rules/gnutls.in
@@ -5,7 +5,7 @@ menuconfig GNUTLS
 	select LIBTASN1
 	select NETTLE
 	select GCCLIBS_CXX	if GNUTLS_CXX
-	select CRYPTODEV	if GNUTLS_CRYPTODEV
+	select CRYPTODEV_API	if GNUTLS_CRYPTODEV && BUILDTIME
 	prompt "gnutls                        "
 	help
 	  GnuTLS is a secure communications library implementing the SSL,
diff --git a/rules/openssl.in b/rules/openssl.in
index 2471376be..629ee3057 100644
--- a/rules/openssl.in
+++ b/rules/openssl.in
@@ -4,7 +4,7 @@ menuconfig OPENSSL
 	tristate
 	select LIBC_DL
 	select GCCLIBS_GCC_S
-	select CRYPTODEV		if OPENSSL_CRYPTODEV
+	select CRYPTODEV_API		if OPENSSL_CRYPTODEV && BUILDTIME
 	prompt "openssl                       "
 	help
 	  Secure Socket Layer (SSL) binary and related cryptographic tools