meta-crystalforest: zlib-qat: simplify do_install

Use the install targets from makefiles.

Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

2 files changed, 58 insertions, 6 deletions

diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch
new file mode 100644
index 00000000..c7aec55a
--- /dev/null
+++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch
@@ -0,0 +1,46 @@
+From d78121d790c4a248bc47d1c662791fe57ac4af38 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anujx.mittal@intel.com>
+Date: Thu, 18 Jun 2015 11:53:23 +0800
+Subject: [PATCH] zlib-qat: add a install target to makefile
+
+Upstream-Status: Inappropriate [Configuration]
+
+This adds an install target to qat_zlib_test and qat_mem makefiles
+to facilitate the installation of test binaries to {D}.
+
+Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
+---
+ contrib/qat/qat_mem/Makefile       |    3 +++
+ contrib/qat/qat_zlib_test/Makefile |    3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/contrib/qat/qat_mem/Makefile b/contrib/qat/qat_mem/Makefile
+index ad6d4a4..e4d77b6 100644
+--- a/contrib/qat/qat_mem/Makefile
++++ b/contrib/qat/qat_mem/Makefile
+@@ -74,6 +74,9 @@ else
+   obj-m        := $(MODULENAME).o
+ endif
+ 
++install: modules_install
++       cp qat_mem_test $(INSTALL_MOD_PATH)$(bindir)
++
+ modules_install:
+        $(MAKE) -C $(KDIR) M=$(PWD) modules_install
+ 
+diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile
+index ca31dd2..7da5ddd 100644
+--- a/contrib/qat/qat_zlib_test/Makefile
++++ b/contrib/qat/qat_zlib_test/Makefile
+@@ -112,5 +112,8 @@ comptestappsh$(EXE): $(OBJS) Makefile
+        $(CC) -o comptestappsh $(OBJS) $(COVERAGE) \
+        $(SHAREDLIBQAT)
+ 
++install:
++       cp comptestapp $(DESTDIR)$(bindir)
++
+ clean:
+        rm -f $(OBJS) $(COVERAGE_OBJS) comptestapp comptestappsh
+-- 
+1.7.9.5
+
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
index 514a15dc..30e6700c 100644
--- a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
+++ b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
@@ -19,6 +19,7 @@ DEPENDS += "cryptodev-linux pkgconfig qat16"
 SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \
            https://01.org/sites/default/files/page/zlib_shim_0.4.7-002_withdocumentation.zip;name=zlibqat \
            file://zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch \
+           file://zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch \
            "
 
 SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40"
@@ -66,6 +67,7 @@ do_patch() {
         cd ${S}
         patch -p1  < ${WORKDIR}/zlib-1.2.8-qat.patch
         patch -p1  < ${WORKDIR}/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch
+        patch -p1  < ${WORKDIR}/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch
 }
 
 do_configure() {
@@ -85,15 +87,19 @@ do_compile() {
 
 do_install() {
         chrpath -d ${MEM_PATH}/qat_zlib_test/comptestapp
-        install -m 0755 -d              ${MODULE_DIR}/
         install -m 0755 -d              ${D}${bindir}/
         install -m 0755 -d              ${D}${sysconfdir}/zlib_conf/
-        install -m 640  ${MEM_PATH}/qat_mem/qat_mem.ko          ${MODULE_DIR}/
-        install -m 0755 ${WORKDIR}/zlib-${ZLIB_VERSION}/zpipe           ${D}${bindir}/
-        install -m 0755 ${WORKDIR}/zlib-${ZLIB_VERSION}/minigzip        ${D}${bindir}/
-        install -m 0755 ${MEM_PATH}/qat_zlib_test/comptestapp           ${D}${bindir}/
+
+        install -m 0755 zpipe ${D}${bindir}
+        install -m 0755 minigzip ${D}${bindir}
+
+        cd ${MEM_PATH}/qat_mem
+        oe_runmake INSTALL_MOD_PATH=${D} INSTALL_MOD_DIR="kernel/drivers" install
+
+        cd ${S}/contrib/qat/qat_zlib_test
+        oe_runmake DESTDIR=${D} install
+
         install -m 660  ${MEM_PATH}/config/dh895xcc/multi_thread_optimized/*    ${D}${sysconfdir}/zlib_conf/
-        install -m 660  ${MEM_PATH}/config/dh89xxcc/multi_thread_optimized/*    ${D}${sysconfdir}/zlib_conf/
 }
 
 PACKAGES += "${PN}-app"