[meta-intel] [master & jethro][PATCH 2/2] meta-isg: openssl-qat: fix build with zlib-qat

[Rahul Kumar Gupta]

openssl & zlib shim layers both install the qat_mem.ko driver.
Make openssl shim dependent on zlib-qat and ensure that only zlib-qat
installs this kernel module.

This may change in future when qat_mem module has been forked into
a separate package.

Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta at intel.com>
---
 meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc b/meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc
index ae661b7..9303311 100644
--- a/meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc
+++ b/meta-isg/common/recipes-extended/openssl-qat/openssl-qat.inc
@@ -22,7 +22,7 @@ SRC_URI  = "https://01.org/sites/default/files/page/libcrypto_shim_${PV}_withdoc
             "
 
 DEPENDS         += " qat16 zlib"
-RDEPENDS_${PN}  += " qat16 zlib"
+RDEPENDS_${PN}  += " qat16 zlib zlib-qat"
 
 inherit pkgconfig module
 
@@ -71,9 +71,6 @@ do_configure () {
 
 do_compile() {
         oe_runmake
-        
-        cd ${S}/engines/qat_engine/qat_mem
-        oe_runmake
 }
 
 do_install() {
@@ -85,9 +82,6 @@ do_install() {
 
         cp --dereference -R include/openssl ${D}${OPENSSL_PREFIX}/include
         
-        cd ${S}/engines/qat_engine/qat_mem
-        oe_runmake DESTDIR="${D}${bindir}" INSTALL_MOD_PATH=${D} INSTALL_MOD_DIR="kernel/drivers" install
-
         cp ${WORKDIR}/openssl_qat-${PV}/libcrypto_shim_${PV}_withdocumentation/qat/config/dh895xcc/multi_process_optimized/* ${D}${sysconfdir}/openssl_conf/
 }
 
-- 
1.9.1