All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests
@ 2014-04-07  2:29 Denys Dmytriyenko
  2014-04-07  2:29 ` [PATCH 2/4] cryptodev-linux: create common .inc file to be shared by " Denys Dmytriyenko
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-07  2:29 UTC (permalink / raw)
  To: openembedded-core; +Cc: Denys Dmytriyenko

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../openssl => recipes-kernel/cryptodev}/cryptodev-linux_1.6.bb           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/{recipes-connectivity/openssl => recipes-kernel/cryptodev}/cryptodev-linux_1.6.bb (100%)

diff --git a/meta/recipes-connectivity/openssl/cryptodev-linux_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb
similarity index 100%
rename from meta/recipes-connectivity/openssl/cryptodev-linux_1.6.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb
-- 
1.9.1



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH 2/4] cryptodev-linux: create common .inc file to be shared by module and tests
  2014-04-07  2:29 [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests Denys Dmytriyenko
@ 2014-04-07  2:29 ` Denys Dmytriyenko
  2014-04-07  2:29 ` [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver Denys Dmytriyenko
  2014-04-07  2:29 ` [PATCH 4/4] cryptodev-tests: recipe for cryptodev test suite based on OpenSSL Denys Dmytriyenko
  2 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-07  2:29 UTC (permalink / raw)
  To: openembedded-core; +Cc: Denys Dmytriyenko

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb | 11 ++---------
 meta/recipes-kernel/cryptodev/cryptodev_1.6.inc      | 11 +++++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.6.inc

diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb
index 320716d..43f58f3 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.6.bb
@@ -1,13 +1,6 @@
-SUMMARY = "A /dev/crypto device driver"
-HOMEPAGE = "http://cryptodev-linux.org/"
+require cryptodev_${PV}.inc
 
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = "http://download.gna.org/cryptodev-linux/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "eade38998313c25fd7934719cdf8a2ea"
-SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f"
+SUMMARY = "A /dev/crypto device driver header file"
 
 do_compile() {
 	:
diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc b/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc
new file mode 100644
index 0000000..946faac
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc
@@ -0,0 +1,11 @@
+HOMEPAGE = "http://cryptodev-linux.org/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "eade38998313c25fd7934719cdf8a2ea"
+SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f"
+
+S = "${WORKDIR}/cryptodev-linux-${PV}"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver
  2014-04-07  2:29 [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests Denys Dmytriyenko
  2014-04-07  2:29 ` [PATCH 2/4] cryptodev-linux: create common .inc file to be shared by " Denys Dmytriyenko
@ 2014-04-07  2:29 ` Denys Dmytriyenko
  2014-04-07 22:13   ` Saul Wold
  2014-04-07  2:29 ` [PATCH 4/4] cryptodev-tests: recipe for cryptodev test suite based on OpenSSL Denys Dmytriyenko
  2 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-07  2:29 UTC (permalink / raw)
  To: openembedded-core; +Cc: Denys Dmytriyenko

From: Denys Dmytriyenko <denys@ti.com>

Depends on cryptodev-linux for providing a header file

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../cryptodev/cryptodev-module_1.6.bb              | 15 ++++++++++++
 ...talling-header-file-provided-by-another-p.patch | 28 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
 create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch

diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
new file mode 100644
index 0000000..fdf07b2
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
@@ -0,0 +1,15 @@
+require cryptodev_${PV}.inc
+
+SUMMARY = "A /dev/crypto device driver kernel module"
+
+inherit module
+
+# Header file provided by a separate package
+DEPENDS += "cryptodev-linux"
+
+SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch"
+
+EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
+
+RCONFLICTS_${PN} = "ocf-linux"
+RREPLACES_${PN} = "ocf-linux"
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
new file mode 100644
index 0000000..a580fc6
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
@@ -0,0 +1,28 @@
+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 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d66ef26..8e97c6a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,6 @@ install: modules_install
+ 
+ modules_install:
+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install
+-	@echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..."
+-	@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h
+ 
+ clean:
+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
+-- 
+1.9.1
+
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 4/4] cryptodev-tests: recipe for cryptodev test suite based on OpenSSL
  2014-04-07  2:29 [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests Denys Dmytriyenko
  2014-04-07  2:29 ` [PATCH 2/4] cryptodev-linux: create common .inc file to be shared by " Denys Dmytriyenko
  2014-04-07  2:29 ` [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver Denys Dmytriyenko
@ 2014-04-07  2:29 ` Denys Dmytriyenko
  2 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-07  2:29 UTC (permalink / raw)
  To: openembedded-core; +Cc: Denys Dmytriyenko

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../cryptodev/cryptodev-tests_1.6.bb               | 23 ++++++++
 ...pile-and-install-rules-for-cryptodev-test.patch | 69 ++++++++++++++++++++++
 ...ests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch | 29 +++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
 create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
 create mode 100644 meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch

diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
new file mode 100644
index 0000000..efc41ae
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
@@ -0,0 +1,23 @@
+require cryptodev_${PV}.inc
+
+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://0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch \
+"
+
+EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
+
+do_compile() {
+	oe_runmake testprogs
+}
+
+do_install() {
+	oe_runmake install_tests
+}
+
+FILES_${PN}-dbg += "${bindir}/tests_cryptodev/.debug"
+FILES_${PN} = "${bindir}/tests_cryptodev/*"
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
new file mode 100644
index 0000000..cb871f6
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
@@ -0,0 +1,69 @@
+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(-)
+
+diff --git a/Makefile b/Makefile
+index 2be8825..4cbb865 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,9 @@ install:
+ 	@echo "Installing cryptodev.h in /usr/include/crypto ..."
+ 	@install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h
+ 
++install_tests:
++	make -C tests install DESTDIR=$(PREFIX)
++
+ clean:
+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
+ 	rm -f $(hostprogs) *~
+@@ -25,6 +28,9 @@ clean:
+ check:
+ 	KERNEL_DIR=$(KERNEL_DIR) make -C tests check
+ 
++testprogs:
++	KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs
++
+ FILEBASE = cryptodev-linux-$(VERSION)
+ TMPDIR ?= /tmp
+ OUTPUT = $(FILEBASE).tar.gz
+diff --git a/tests/Makefile b/tests/Makefile
+index 87ca3c7..0488cf6 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o
+ example-async-speed-objs := async_speed.o
+ example-hashcrypt-speed-objs := hashcrypt_speed.c
+ 
++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
+@@ -28,6 +34,8 @@ check: $(hostprogs)
+ 	./cipher-gcm
+ 	./cipher-aead
+ 
++testprogs: $(hostprogs)
++
+ clean:
+ 	rm -f *.o *~ $(hostprogs)
+ 
+-- 
+1.7.5.4
+
diff --git a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch b/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
new file mode 100644
index 0000000..f5ab8b4
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
@@ -0,0 +1,29 @@
+From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Sun, 6 Apr 2014 22:16:30 -0400
+Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS
+
+Libraries must come after objects, as link order matters, especially
+when using linker flags like -Wl,--as-needed.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+
+Upstream-Status: Pending
+---
+ tests/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index cd202af..67c3c83 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -39,5 +39,5 @@ testprogs: $(hostprogs)
+ clean:
+ 	rm -f *.o *~ $(hostprogs)
+ 
+-${comp_progs}: LDFLAGS += -lssl -lcrypto
++${comp_progs}: LDLIBS += -lssl -lcrypto
+ ${comp_progs}: %: %.o openssl_wrapper.o
+-- 
+1.9.1
+
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver
  2014-04-07  2:29 ` [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver Denys Dmytriyenko
@ 2014-04-07 22:13   ` Saul Wold
  2014-04-08  0:50     ` Denys Dmytriyenko
  0 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2014-04-07 22:13 UTC (permalink / raw)
  To: Denys Dmytriyenko, openembedded-core; +Cc: Denys Dmytriyenko

On 04/06/2014 07:29 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Depends on cryptodev-linux for providing a header file
>

I am seeing failure on the Autobuilder with multilib enabled (lib32), I 
am not sure if this is a multilib issue, but it shows up here


> NOTE: Running task 14174 of 19826 (ID: 13044, virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-core/libcgroup/libcgroup_0.41.bb, do_configure)
> ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322)
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322
> Log data follows:
> | DEBUG: Executing shell function do_compile
> | NOTE: make -j 16 KERNEL_DIR=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel PREFIX=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/image KERNEL_PATH=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel KERNEL_SRC=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel KERNEL_VERSION=3.14.0-yocto-standard CC=i586-poky-linux-gcc  LD=i586-poky-linux-ld.bfd  AR=i586-poky-linux-ar
> | make -C /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel SUBDIRS=`pwd` modules
> | make[1]: Entering directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel'
> | make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
> |   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.o
> | /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.c:710:21: warning: 'is_known_accelerated' defined but not used [-Wunused-function]
> |  static unsigned int is_known_accelerated(struct crypto_tfm *tfm)
> |                      ^
> |   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/main.o
> |   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.o
> | /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.c: In function 'cryptodev_cipher_encrypt':
> | /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.c:223:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]
> |   INIT_COMPLETION(cdata->async.result->completion);
> |   ^
> | cc1: some warnings being treated as errors
> | make[2]: *** [/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.o] Error 1
> | make[1]: *** [_module_/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6] Error 2
> | make[1]: Leaving directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel'
> | make: *** [build] Error 2
> | ERROR: oe_runmake failed
> | WARNING: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/run.do_compile.19322:1 exit 1 from
> |   exit 1
> | ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322)
> NOTE: recipe cryptodev-module-1.6-r0: task do_compile: Failed
> ERROR: Task 13808 (/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb, do_compile) failed with exit code '1'
> NOTE: Running task 14175 of 19826 (ID: 13002, virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-devtools/python/python-mako_0.9.1.bb, do_configure)
> NOTE: recipe liburcu-0.8.1-r0: task do_package_write_deb: Succeeded



> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>   .../cryptodev/cryptodev-module_1.6.bb              | 15 ++++++++++++
>   ...talling-header-file-provided-by-another-p.patch | 28 ++++++++++++++++++++++
>   2 files changed, 43 insertions(+)
>   create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
>   create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
>
> diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> new file mode 100644
> index 0000000..fdf07b2
> --- /dev/null
> +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> @@ -0,0 +1,15 @@
> +require cryptodev_${PV}.inc
> +
> +SUMMARY = "A /dev/crypto device driver kernel module"
> +
> +inherit module
> +
> +# Header file provided by a separate package
> +DEPENDS += "cryptodev-linux"
> +
> +SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch"
> +
> +EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
> +
> +RCONFLICTS_${PN} = "ocf-linux"
> +RREPLACES_${PN} = "ocf-linux"
> diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> new file mode 100644
> index 0000000..a580fc6
> --- /dev/null
> +++ b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> @@ -0,0 +1,28 @@
> +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 | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index d66ef26..8e97c6a 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -23,8 +23,6 @@ install: modules_install
> +
> + modules_install:
> + 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install
> +-	@echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..."
> +-	@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h
> +
> + clean:
> + 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
> +--
> +1.9.1
> +
>


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver
  2014-04-07 22:13   ` Saul Wold
@ 2014-04-08  0:50     ` Denys Dmytriyenko
  2014-04-10 17:58       ` Denys Dmytriyenko
  0 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-08  0:50 UTC (permalink / raw)
  To: Saul Wold; +Cc: openembedded-core

On Mon, Apr 07, 2014 at 03:13:14PM -0700, Saul Wold wrote:
> On 04/06/2014 07:29 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >Depends on cryptodev-linux for providing a header file
> >
> 
> I am seeing failure on the Autobuilder with multilib enabled
> (lib32), I am not sure if this is a multilib issue, but it shows up
> here

Ah, only tested it on 3.12 and 3.13+ requires this patch:
http://patchwork.ozlabs.org/patch/312943/

Will re-submit shortly...


> >NOTE: Running task 14174 of 19826 (ID: 13044, virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-core/libcgroup/libcgroup_0.41.bb, do_configure)
> >ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322)
> >ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322
> >Log data follows:
> >| DEBUG: Executing shell function do_compile
> >| NOTE: make -j 16 KERNEL_DIR=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel PREFIX=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/image KERNEL_PATH=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel KERNEL_SRC=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel KERNEL_VERSION=3.14.0-yocto-standard CC=i586-poky-linux-gcc  LD=i586-poky-linux-ld.bfd  AR=i586-poky-linux-ar
> >| make -C /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel SUBDIRS=`pwd` modules
> >| make[1]: Entering directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel'
> >| make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
> >|   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.o
> >| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.c:710:21: warning: 'is_known_accelerated' defined but not used [-Wunused-function]
> >|  static unsigned int is_known_accelerated(struct crypto_tfm *tfm)
> >|                      ^
> >|   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/main.o
> >|   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.o
> >| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.c: In function 'cryptodev_cipher_encrypt':
> >| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.c:223:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]
> >|   INIT_COMPLETION(cdata->async.result->completion);
> >|   ^
> >| cc1: some warnings being treated as errors
> >| make[2]: *** [/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.o] Error 1
> >| make[1]: *** [_module_/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6] Error 2
> >| make[1]: Leaving directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel'
> >| make: *** [build] Error 2
> >| ERROR: oe_runmake failed
> >| WARNING: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/run.do_compile.19322:1 exit 1 from
> >|   exit 1
> >| ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322)
> >NOTE: recipe cryptodev-module-1.6-r0: task do_compile: Failed
> >ERROR: Task 13808 (/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb, do_compile) failed with exit code '1'
> >NOTE: Running task 14175 of 19826 (ID: 13002, virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-devtools/python/python-mako_0.9.1.bb, do_configure)
> >NOTE: recipe liburcu-0.8.1-r0: task do_package_write_deb: Succeeded
> 
> 
> 
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> >  .../cryptodev/cryptodev-module_1.6.bb              | 15 ++++++++++++
> >  ...talling-header-file-provided-by-another-p.patch | 28 ++++++++++++++++++++++
> >  2 files changed, 43 insertions(+)
> >  create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> >  create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> >
> >diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> >new file mode 100644
> >index 0000000..fdf07b2
> >--- /dev/null
> >+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> >@@ -0,0 +1,15 @@
> >+require cryptodev_${PV}.inc
> >+
> >+SUMMARY = "A /dev/crypto device driver kernel module"
> >+
> >+inherit module
> >+
> >+# Header file provided by a separate package
> >+DEPENDS += "cryptodev-linux"
> >+
> >+SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch"
> >+
> >+EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
> >+
> >+RCONFLICTS_${PN} = "ocf-linux"
> >+RREPLACES_${PN} = "ocf-linux"
> >diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> >new file mode 100644
> >index 0000000..a580fc6
> >--- /dev/null
> >+++ b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> >@@ -0,0 +1,28 @@
> >+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 | 2 --
> >+ 1 file changed, 2 deletions(-)
> >+
> >+diff --git a/Makefile b/Makefile
> >+index d66ef26..8e97c6a 100644
> >+--- a/Makefile
> >++++ b/Makefile
> >+@@ -23,8 +23,6 @@ install: modules_install
> >+
> >+ modules_install:
> >+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install
> >+-	@echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..."
> >+-	@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h
> >+
> >+ clean:
> >+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
> >+--
> >+1.9.1
> >+
> >
> 


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver
  2014-04-08  0:50     ` Denys Dmytriyenko
@ 2014-04-10 17:58       ` Denys Dmytriyenko
  0 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-10 17:58 UTC (permalink / raw)
  To: Saul Wold; +Cc: openembedded-core

On Mon, Apr 07, 2014 at 08:50:39PM -0400, Denys Dmytriyenko wrote:
> On Mon, Apr 07, 2014 at 03:13:14PM -0700, Saul Wold wrote:
> > On 04/06/2014 07:29 PM, Denys Dmytriyenko wrote:
> > >From: Denys Dmytriyenko <denys@ti.com>
> > >
> > >Depends on cryptodev-linux for providing a header file
> > >
> > 
> > I am seeing failure on the Autobuilder with multilib enabled
> > (lib32), I am not sure if this is a multilib issue, but it shows up
> > here
> 
> Ah, only tested it on 3.12 and 3.13+ requires this patch:
> http://patchwork.ozlabs.org/patch/312943/
> 
> Will re-submit shortly...

Sorry for the delay - BBB BSP took priority. I just re-submitted the entire 
set with an updated version of this patch #3, please let me know the results.

-- 
Denys


> > >NOTE: Running task 14174 of 19826 (ID: 13044, virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-core/libcgroup/libcgroup_0.41.bb, do_configure)
> > >ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322)
> > >ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322
> > >Log data follows:
> > >| DEBUG: Executing shell function do_compile
> > >| NOTE: make -j 16 KERNEL_DIR=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel PREFIX=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/image KERNEL_PATH=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel KERNEL_SRC=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel KERNEL_VERSION=3.14.0-yocto-standard CC=i586-poky-linux-gcc  LD=i586-poky-linux-ld.bfd  AR=i586-poky-linux-ar
> > >| make -C /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel SUBDIRS=`pwd` modules
> > >| make[1]: Entering directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel'
> > >| make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
> > >|   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.o
> > >| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.c:710:21: warning: 'is_known_accelerated' defined but not used [-Wunused-function]
> > >|  static unsigned int is_known_accelerated(struct crypto_tfm *tfm)
> > >|                      ^
> > >|   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/main.o
> > >|   CC [M]  /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.o
> > >| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.c: In function 'cryptodev_cipher_encrypt':
> > >| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.c:223:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]
> > >|   INIT_COMPLETION(cdata->async.result->completion);
> > >|   ^
> > >| cc1: some warnings being treated as errors
> > >| make[2]: *** [/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/cryptlib.o] Error 1
> > >| make[1]: *** [_module_/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6] Error 2
> > >| make[1]: Leaving directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86/usr/src/kernel'
> > >| make: *** [build] Error 2
> > >| ERROR: oe_runmake failed
> > >| WARNING: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/run.do_compile.19322:1 exit 1 from
> > >|   exit 1
> > >| ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/work/qemux86-poky-linux/cryptodev-module/1.6-r0/temp/log.do_compile.19322)
> > >NOTE: recipe cryptodev-module-1.6-r0: task do_compile: Failed
> > >ERROR: Task 13808 (/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb, do_compile) failed with exit code '1'
> > >NOTE: Running task 14175 of 19826 (ID: 13002, virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/meta/recipes-devtools/python/python-mako_0.9.1.bb, do_configure)
> > >NOTE: recipe liburcu-0.8.1-r0: task do_package_write_deb: Succeeded
> > 
> > 
> > 
> > >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > >---
> > >  .../cryptodev/cryptodev-module_1.6.bb              | 15 ++++++++++++
> > >  ...talling-header-file-provided-by-another-p.patch | 28 ++++++++++++++++++++++
> > >  2 files changed, 43 insertions(+)
> > >  create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> > >  create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> > >
> > >diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> > >new file mode 100644
> > >index 0000000..fdf07b2
> > >--- /dev/null
> > >+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb
> > >@@ -0,0 +1,15 @@
> > >+require cryptodev_${PV}.inc
> > >+
> > >+SUMMARY = "A /dev/crypto device driver kernel module"
> > >+
> > >+inherit module
> > >+
> > >+# Header file provided by a separate package
> > >+DEPENDS += "cryptodev-linux"
> > >+
> > >+SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch"
> > >+
> > >+EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
> > >+
> > >+RCONFLICTS_${PN} = "ocf-linux"
> > >+RREPLACES_${PN} = "ocf-linux"
> > >diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> > >new file mode 100644
> > >index 0000000..a580fc6
> > >--- /dev/null
> > >+++ b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
> > >@@ -0,0 +1,28 @@
> > >+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 | 2 --
> > >+ 1 file changed, 2 deletions(-)
> > >+
> > >+diff --git a/Makefile b/Makefile
> > >+index d66ef26..8e97c6a 100644
> > >+--- a/Makefile
> > >++++ b/Makefile
> > >+@@ -23,8 +23,6 @@ install: modules_install
> > >+
> > >+ modules_install:
> > >+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install
> > >+-	@echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..."
> > >+-	@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h
> > >+
> > >+ clean:
> > >+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
> > >+--
> > >+1.9.1
> > >+
> > >
> > 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH 4/4] cryptodev-tests: recipe for cryptodev test suite based on OpenSSL
  2014-04-10 17:55 [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests Denys Dmytriyenko
@ 2014-04-10 17:55 ` Denys Dmytriyenko
  0 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2014-04-10 17:55 UTC (permalink / raw)
  To: openembedded-core; +Cc: Denys Dmytriyenko

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../cryptodev/cryptodev-tests_1.6.bb               | 23 ++++++++
 ...pile-and-install-rules-for-cryptodev-test.patch | 69 ++++++++++++++++++++++
 ...ests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch | 29 +++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
 create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
 create mode 100644 meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch

diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
new file mode 100644
index 0000000..efc41ae
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.6.bb
@@ -0,0 +1,23 @@
+require cryptodev_${PV}.inc
+
+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://0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch \
+"
+
+EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
+
+do_compile() {
+	oe_runmake testprogs
+}
+
+do_install() {
+	oe_runmake install_tests
+}
+
+FILES_${PN}-dbg += "${bindir}/tests_cryptodev/.debug"
+FILES_${PN} = "${bindir}/tests_cryptodev/*"
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
new file mode 100644
index 0000000..cb871f6
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
@@ -0,0 +1,69 @@
+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(-)
+
+diff --git a/Makefile b/Makefile
+index 2be8825..4cbb865 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,9 @@ install:
+ 	@echo "Installing cryptodev.h in /usr/include/crypto ..."
+ 	@install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h
+ 
++install_tests:
++	make -C tests install DESTDIR=$(PREFIX)
++
+ clean:
+ 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
+ 	rm -f $(hostprogs) *~
+@@ -25,6 +28,9 @@ clean:
+ check:
+ 	KERNEL_DIR=$(KERNEL_DIR) make -C tests check
+ 
++testprogs:
++	KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs
++
+ FILEBASE = cryptodev-linux-$(VERSION)
+ TMPDIR ?= /tmp
+ OUTPUT = $(FILEBASE).tar.gz
+diff --git a/tests/Makefile b/tests/Makefile
+index 87ca3c7..0488cf6 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o
+ example-async-speed-objs := async_speed.o
+ example-hashcrypt-speed-objs := hashcrypt_speed.c
+ 
++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
+@@ -28,6 +34,8 @@ check: $(hostprogs)
+ 	./cipher-gcm
+ 	./cipher-aead
+ 
++testprogs: $(hostprogs)
++
+ clean:
+ 	rm -f *.o *~ $(hostprogs)
+ 
+-- 
+1.7.5.4
+
diff --git a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch b/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
new file mode 100644
index 0000000..f5ab8b4
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
@@ -0,0 +1,29 @@
+From 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Sun, 6 Apr 2014 22:16:30 -0400
+Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS
+
+Libraries must come after objects, as link order matters, especially
+when using linker flags like -Wl,--as-needed.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+
+Upstream-Status: Pending
+---
+ tests/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index cd202af..67c3c83 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -39,5 +39,5 @@ testprogs: $(hostprogs)
+ clean:
+ 	rm -f *.o *~ $(hostprogs)
+ 
+-${comp_progs}: LDFLAGS += -lssl -lcrypto
++${comp_progs}: LDLIBS += -lssl -lcrypto
+ ${comp_progs}: %: %.o openssl_wrapper.o
+-- 
+1.9.1
+
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-04-10 17:58 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-07  2:29 [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests Denys Dmytriyenko
2014-04-07  2:29 ` [PATCH 2/4] cryptodev-linux: create common .inc file to be shared by " Denys Dmytriyenko
2014-04-07  2:29 ` [PATCH 3/4] cryptodev-module: recipe for out-of-tree cryptodev device driver Denys Dmytriyenko
2014-04-07 22:13   ` Saul Wold
2014-04-08  0:50     ` Denys Dmytriyenko
2014-04-10 17:58       ` Denys Dmytriyenko
2014-04-07  2:29 ` [PATCH 4/4] cryptodev-tests: recipe for cryptodev test suite based on OpenSSL Denys Dmytriyenko
2014-04-10 17:55 [PATCH 1/4] cryptodev-linux: move to recipes-kernel to be shared with module and tests Denys Dmytriyenko
2014-04-10 17:55 ` [PATCH 4/4] cryptodev-tests: recipe for cryptodev test suite based on OpenSSL Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.