Skip to contentSkip to conversation

ocf: new package

PATCH Superseded Gustavo Zacarias 2 participants 4 messages Jan 27, 2011

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ocf: new package

---
 package/Config.in                    |    1 +
 package/ocf/Config.in                |   19 ++
 package/ocf/ocf-cryptodev-20101223.h |  480 ++++++++++++++++++++++++++++++++++
 package/ocf/ocf.mk                   |   42 +++
 4 files changed, 542 insertions(+), 0 deletions(-)
 create mode 100644 package/ocf/Config.in
 create mode 100644 package/ocf/ocf-cryptodev-20101223.h
 create mode 100644 package/ocf/ocf.mk
package/Config.in +1 -0
index 8154907..c82e6ce 100644
@@ -245,6 +245,7 @@ menu "Crypto"
 source "package/beecrypt/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/ocf/Config.in"
 source "package/openssl/Config.in"
 endmenu
 
package/ocf/Config.in new file +19 -0
new file mode 100644
index 0000000..a09c6eb
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_OCF
+	bool "ocf"
+	help
+	  OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
+	  Framework (OCF). This port aims to bring full asynchronous HW/SW
+	  crypto acceleration to the Linux kernel and applications
+	  running under Linux.
+	  
+	  http://ocf-linux.sourceforge.net/
+
+config BR2_PACKAGE_OPENSSL_OCF
+	bool "openssl ocf support"
+	depends on BR2_PACKAGE_OPENSSL
+	help
+	  Enable openssl cryptodev (OCF) hardware acceleration support.
+	  This requires kernel patches from the ocf-linux project otherwise
+	  you'll just have a bigger openssl library that works as usual.
+
+	  http://ocf-linux.sourceforge.net/
package/ocf/ocf-cryptodev-20101223.h new file +480 -0

480 lines not on this page · raw message

package/ocf/ocf.mk new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 2/2 openssl: split out ocf

Since OCF is a separate entity split it out in it's own package. And make openssl select/depend on it.

---
 package/openssl/Config.in                |    1 +
 package/openssl/ocf-cryptodev-20101223.h |  480 ------------------------------
 package/openssl/openssl.mk               |   10 +-
 3 files changed, 3 insertions(+), 488 deletions(-)
 delete mode 100644 package/openssl/ocf-cryptodev-20101223.h
package/openssl/Config.in +1 -0
index 3e09d88..0240603 100644
@@ -25,6 +25,7 @@ config BR2_PACKAGE_OPENSSL_ENGINES
 config BR2_PACKAGE_OPENSSL_OCF
 	bool "openssl ocf support"
 	depends on BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OCF
 	help
 	  Enable openssl cryptodev (OCF) hardware acceleration support.
 	  This requires kernel patches from the ocf-linux project otherwise
package/openssl/ocf-cryptodev-20101223.h deleted +0 -480

480 lines not on this page · raw message

package/openssl/openssl.mk +2 -8
index 866d4e5..e35eaa3 100644
@@ -12,14 +12,8 @@ OPENSSL_TARGET_ARCH = generic32
 OPENSSL_CFLAGS = $(TARGET_CFLAGS)
 
 ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
-OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
-
-define OPENSSL_INSTALL_CRYPTODEV_H
-$(INSTALL) -D package/openssl/ocf-cryptodev-20101223.h \
-	$(STAGING_DIR)/usr/include/crypto/cryptodev.h
-endef
-
-OPENSSL_POST_EXTRACT_HOOKS += OPENSSL_INSTALL_CRYPTODEV_H
+	OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
+	OPENSSL_DEPENDENCIES += ocf
 endif
 
 # Some architectures are optimized in OpenSSL
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 1/2 ocf: new package

In reply to Gustavo Zacarias

package/ocf/ocf.mk line 35

Quoted 2 lines · On Thu, 27 Jan 2011 12:06:44 -0300 Gustavo Zacarias <[email protected]>…
package/ocf/ocf.mk new file +2 -0
+OCF_SRCDIR = $(call qstrip,$(BR2_PACKAGE_OCF_SRC))
+OCF_BUILDDIR = $(OCF_DIR)

Why is this needed ?

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/2 ocf: new package

Quoted 9 lines · Thomas Petazzoni

package/ocf/ocf.mk line 35

Quoted 2 lines · On Thu, 27 Jan 2011 12:06:44 -0300 Gustavo Zacarias <[email protected]>…
package/ocf/ocf.mk new file +2 -0
+OCF_SRCDIR = $(call qstrip,$(BR2_PACKAGE_OCF_SRC))
+OCF_BUILDDIR = $(OCF_DIR)

Why is this needed ?

Thomas

Copy/Paste too much from your example maybe?