From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 9BC74E0076B; Wed, 9 Jul 2014 01:16:58 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [207.46.163.139 listed in list.dnswl.org] * -0.0 SPF_HELO_PASS SPF: HELO matches SPF record * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1lp0139.outbound.protection.outlook.com [207.46.163.139]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id CABEAE00744 for ; Wed, 9 Jul 2014 01:16:49 -0700 (PDT) Received: from BN3PR0301CA0083.namprd03.prod.outlook.com (25.160.152.179) by BY2PR03MB160.namprd03.prod.outlook.com (10.242.36.22) with Microsoft SMTP Server (TLS) id 15.0.985.8; Wed, 9 Jul 2014 08:16:46 +0000 Received: from BY2FFO11FD047.protection.gbl (2a01:111:f400:7c0c::180) by BN3PR0301CA0083.outlook.office365.com (2a01:111:e400:401e::51) with Microsoft SMTP Server (TLS) id 15.0.980.8 via Frontend Transport; Wed, 9 Jul 2014 08:16:45 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD047.mail.protection.outlook.com (10.1.15.175) with Microsoft SMTP Server (TLS) id 15.0.980.11 via Frontend Transport; Wed, 9 Jul 2014 08:16:45 +0000 Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s698GhpQ022068; Wed, 9 Jul 2014 01:16:44 -0700 From: To: Date: Wed, 9 Jul 2014 03:16:40 -0500 Message-ID: <1404893803-3879-1-git-send-email-ting.liu@freescale.com> X-Mailer: git-send-email 1.7.9.7 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(189002)(199002)(92726001)(110136001)(86152002)(92566001)(6806004)(50226001)(104016002)(46102001)(33646001)(48376002)(74662001)(21056001)(99396002)(79102001)(84676001)(62966002)(81342001)(20776003)(88136002)(105606002)(47776003)(104166001)(31966008)(97736001)(87936001)(76482001)(64706001)(87286001)(95666004)(77156001)(106466001)(26826002)(229853001)(107046002)(2351001)(36756003)(50466002)(80022001)(44976005)(81542001)(83072002)(19580405001)(85852003)(89996001)(74502001)(19580395003)(83322001)(77982001)(102836001)(85306003)(4396001)(575784001)(50986999)(93916002)(68736004)(86362001); DIR:OUT; SFP:; SCL:1; SRVR:BY2PR03MB160; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 0267E514F9 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=ting.liu@freescale.com; X-OriginatorOrg: freescale.com Subject: [meta-fsl-ppc][PATCH 1/4] cryptodev-linux/module: use fsl maintained source X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jul 2014 08:16:58 -0000 Content-Type: text/plain From: Zhenhua Luo FSL SDK released its own cryptodev based on 1.6, but not all the codes was upstreamed, add bbappend to use fsl maintained source. This change only be applied for fsl machines Signed-off-by: Zhenhua Luo Signed-off-by: Ting Liu --- recipes-kernel/cryptodev/cryptodev-fsl.inc | 5 ++ .../cryptodev/cryptodev-linux_1.6.bbappend | 2 + .../cryptodev/cryptodev-module_1.6.bbappend | 25 +++++++ recipes-kernel/cryptodev/cryptodev_1.5.bb | 51 --------------- ...pile-and-install-rules-for-cryptodev-test.patch | 69 -------------------- .../cryptodev/files/makefile_fixup.patch | 26 -------- 6 files changed, 32 insertions(+), 146 deletions(-) create mode 100644 recipes-kernel/cryptodev/cryptodev-fsl.inc create mode 100644 recipes-kernel/cryptodev/cryptodev-linux_1.6.bbappend create mode 100644 recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend delete mode 100644 recipes-kernel/cryptodev/cryptodev_1.5.bb 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 diff --git a/recipes-kernel/cryptodev/cryptodev-fsl.inc b/recipes-kernel/cryptodev/cryptodev-fsl.inc new file mode 100644 index 0000000..7520152 --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-fsl.inc @@ -0,0 +1,5 @@ +SRC_URI_fslmachine = "git://git.freescale.com/ppc/sdk/cryptodev-linux.git;nobranch=1" +SRCREV_fslmachine = "c9baf0623bdc55e8adfc91bf675e8148826d57d1" + +S_fslmachine = "${WORKDIR}/git" + diff --git a/recipes-kernel/cryptodev/cryptodev-linux_1.6.bbappend b/recipes-kernel/cryptodev/cryptodev-linux_1.6.bbappend new file mode 100644 index 0000000..3cbbb3d --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-linux_1.6.bbappend @@ -0,0 +1,2 @@ +require recipes-kernel/cryptodev/cryptodev-fsl.inc + diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend new file mode 100644 index 0000000..80cef70 --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend @@ -0,0 +1,25 @@ +require recipes-kernel/cryptodev/cryptodev-fsl.inc + +python () { + ma = d.getVar("DISTRO_FEATURES", True) + arch = d.getVar("OVERRIDES", True) + + # the : after the arch is to skip the message on 64b + if not "multiarch" in ma and "e6500:" in arch: + raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") + + promote_kernel = d.getVar('BUILD_64BIT_KERNEL') + + if promote_kernel == "1": + d.setVar('KERNEL_CC_append', ' -m64') + d.setVar('KERNEL_LD_append', ' -melf64ppc') + + error_qa = d.getVar('ERROR_QA', True) + if 'arch' in error_qa: + d.setVar('ERROR_QA', error_qa.replace(' arch', '')) +} + +do_install_append_fslmachine () { + rm -fr ${D}/usr +} + diff --git a/recipes-kernel/cryptodev/cryptodev_1.5.bb b/recipes-kernel/cryptodev/cryptodev_1.5.bb deleted file mode 100644 index 4c1dade..0000000 --- a/recipes-kernel/cryptodev/cryptodev_1.5.bb +++ /dev/null @@ -1,51 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Cryptodev KERNEL MODULE" -DESCRIPTION = "The Cryptodev package contains the kernel /dev/crypto module" -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" - -EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' - -S = "${WORKDIR}/git" -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch): - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} - -do_compile_append() { - oe_runmake testprogs -} - -do_install_append() { - oe_runmake install_tests -} - -PACKAGES += "${PN}-tests" -FILES_${PN}-dbg += "${bindir}/tests_cryptodev/.debug" -FILES_${PN}-tests = "${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 -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 - -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 -- 1.7.9.7