Patchwork [meta-fsl-ppc,33/39] cryptodev: upgrade to sdk v1.6

login
register
mail settings
Submitter ting.liu@freescale.com
Date July 2, 2014, 3:01 a.m.
Message ID <1404270108-3448-34-git-send-email-ting.liu@freescale.com>
Download mbox | patch
Permalink /patch/74631/
State Superseded
Headers show

Comments

ting.liu@freescale.com - July 2, 2014, 3:01 a.m.
From: Zhenhua Luo <zhenhua.luo@freescale.com>

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 recipes-kernel/cryptodev/cryptodev-headers_1.6.bb  |   18 +++++
 .../{cryptodev_1.5.bb => cryptodev_1.6.bb}         |   24 ++-----
 ...pile-and-install-rules-for-cryptodev-test.patch |   69 --------------------
 .../cryptodev/files/makefile_fixup.patch           |   26 --------
 4 files changed, 24 insertions(+), 113 deletions(-)
 create mode 100644 recipes-kernel/cryptodev/cryptodev-headers_1.6.bb
 rename recipes-kernel/cryptodev/{cryptodev_1.5.bb => cryptodev_1.6.bb} (62%)
 delete mode 100644 recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch
 delete mode 100644 recipes-kernel/cryptodev/files/makefile_fixup.patch

Patch

diff --git a/recipes-kernel/cryptodev/cryptodev-headers_1.6.bb b/recipes-kernel/cryptodev/cryptodev-headers_1.6.bb
new file mode 100644
index 0000000..741bcbc
--- /dev/null
+++ b/recipes-kernel/cryptodev/cryptodev-headers_1.6.bb
@@ -0,0 +1,18 @@ 
+SECTION = "devel"
+SUMMARY = "Linux Cryptodev Header"
+DESCRIPTION = "/dev/crypto ioctl interface to Linux kernel crypto operations"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+RCONFLICTS_${PN} = "ocf-linux"
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/cryptodev-linux.git;nobranch=1"
+SRCREV = "c9baf0623bdc55e8adfc91bf675e8148826d57d1"
+
+S = "${WORKDIR}/git"
+do_install () {
+    install -D ${S}/crypto/cryptodev.h ${D}/${includedir}/crypto/cryptodev.h
+}
+
+do_compile[noexec] = "1"
+BBCLASSEXTEND = "native nativesdk"
+
diff --git a/recipes-kernel/cryptodev/cryptodev_1.5.bb b/recipes-kernel/cryptodev/cryptodev_1.6.bb
similarity index 62%
rename from recipes-kernel/cryptodev/cryptodev_1.5.bb
rename to recipes-kernel/cryptodev/cryptodev_1.6.bb
index 4c1dade..5d13547 100644
--- a/recipes-kernel/cryptodev/cryptodev_1.5.bb
+++ b/recipes-kernel/cryptodev/cryptodev_1.6.bb
@@ -1,20 +1,13 @@ 
 SECTION = "devel"
 SUMMARY = "Linux Cryptodev KERNEL MODULE"
-DESCRIPTION = "The Cryptodev package contains the kernel /dev/crypto module"
+DESCRIPTION = "/dev/crypto ioctl interface to Linux kernel crypto operations"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-RCONFLICTS_${PN} = "ocf-linux"
 
 inherit module
 
-PR = "r1"
-DEPENDS += "openssl"
-
-SRCREV = "1c24a0aa996630518d47826a2e3fea129ea094c7"
-
-SRC_URI = "git://repo.or.cz/cryptodev-linux.git;protocol=git \
-           file://makefile_fixup.patch \
-           file://Add-the-compile-and-install-rules-for-cryptodev-test.patch"
+SRC_URI = "git://git.freescale.com/ppc/sdk/cryptodev-linux.git;nobranch=1"
+SRCREV = "c9baf0623bdc55e8adfc91bf675e8148826d57d1"
 
 EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 
@@ -38,14 +31,9 @@  python () {
 		d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
 }
 
-do_compile_append() {
-        oe_runmake testprogs
-}
-
-do_install_append() {
-        oe_runmake install_tests
+do_install_append () {
+    rm -fr ${D}/usr
 }
 
-PACKAGES += "${PN}-tests"
 FILES_${PN}-dbg += "${bindir}/tests_cryptodev/.debug"
-FILES_${PN}-tests = "${bindir}/tests_cryptodev/*"
+FILES_${PN} += "${bindir}/tests_cryptodev/*"
diff --git a/recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch b/recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch
deleted file mode 100644
index cb871f6..0000000
--- a/recipes-kernel/cryptodev/files/Add-the-compile-and-install-rules-for-cryptodev-test.patch
+++ /dev/null
@@ -1,69 +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(-)
-
-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/recipes-kernel/cryptodev/files/makefile_fixup.patch b/recipes-kernel/cryptodev/files/makefile_fixup.patch
deleted file mode 100644
index 323aacd..0000000
--- a/recipes-kernel/cryptodev/files/makefile_fixup.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-diff --git a/Makefile b/Makefile
-index 2be8825..b36d68c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,7 @@
- KBUILD_CFLAGS += -I$(src)
- KERNEL_DIR = /lib/modules/$(shell uname -r)/build
- VERSION = 1.5
-+PREFIX =
- 
- cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o
- 
-@@ -12,10 +13,10 @@ build: version.h
- version.h: Makefile
- 	@echo "#define VERSION \"$(VERSION)\"" > version.h
- 
--install:
-+modules_install:
- 	make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install
--	@echo "Installing cryptodev.h in /usr/include/crypto ..."
--	@install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h
-+	@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