meta-isg: qat16: fix v2.5.0 build with kernel v4.4

The qat recipe currently relies on EXTRA_OEMAKE having been set to
"-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
 explicit so that the default in bitbake.conf can be changed.

The prototype of a func used in QAT16 is changed in kernel v4.4

Also, make sure that we point to the correct include path to the local
headers.

Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/meta-isg/common/recipes-extended/qat/qat16.inc b/meta-isg/common/recipes-extended/qat/qat16.inc
index 90765ea0..c789fda6 100644
--- a/meta-isg/common/recipes-extended/qat/qat16.inc
+++ b/meta-isg/common/recipes-extended/qat/qat16.inc
@@ -15,6 +15,8 @@ SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \
          file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \
          file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
          file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \
+         file://qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch \
+         file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \
          "
 
 COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64"
@@ -47,8 +49,8 @@ PARALLEL_MAKE = ""
 #To get around the double slashes in paths in QAT makefiles
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
-EXTRA_OEMAKE_append = " CFLAGS+=-fgnu89-inline"
-
+EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'"
+EXTRA_OEMAKE = "-e MAKEFLAGS="
 do_unpack2() {
         cd ${S}/
         tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz
@@ -60,7 +62,7 @@ do_compile () {
         export LD="${LD} --hash-style=gnu"
         export MACHINE="${TARGET_ARCH}"
         cd ${S}/quickassist
-        oe_runmake EXTRA_OEMAKE="'CFLAGS=${CFLAGS} -fPIC'"
+        oe_runmake
 
         cd ${SAMPLE_CODE_DIR}
         touch ${SAMPLE_CODE_DIR}/performance/compression/calgary