From 5aff858a92df44d1960ab085fe29db33a6618f6c Mon Sep 17 00:00:00 2001
From: Yongxin Liu <yongxin.liu@windriver.com>
Date: Thu, 16 Jan 2020 09:56:39 +0800
Subject: zlib-qat: Upgrade to 0.4.10-003

Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-extended/zlib-qat/zlib-qat_0.4.10-001.bb | 43 ------------------------
 recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb | 43 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 recipes-extended/zlib-qat/zlib-qat_0.4.10-001.bb
 create mode 100644 recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb

diff --git a/recipes-extended/zlib-qat/zlib-qat_0.4.10-001.bb b/recipes-extended/zlib-qat/zlib-qat_0.4.10-001.bb
deleted file mode 100644
index 277a90f..0000000
--- a/recipes-extended/zlib-qat/zlib-qat_0.4.10-001.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-require zlib-qat.inc
-
-DEPENDS += "qat17"
-
-SRC_URI += "https://01.org/sites/default/files/downloads/intelr-quickassist-technology/zlibshim0.4.10-001.tar.gz;name=zlibqat \
-           file://zlib-qat-0.4.10-001-zlib-qat-add-a-install-target-to-makefile.patch \
-           file://zlib-qat-0.4.10-001-zlib-Remove-rpaths-from-makefile.patch \
-           file://zlib-qat-0.4.10-001-zlib-qat-correct-the-order-for-static-linking-libude.patch \
-           "
-
-SRC_URI[zlibqat.md5sum] = "449e5b8dd41e49df1cced144b54d5bc1"
-SRC_URI[zlibqat.sha256sum] = "d9d288951a1c4b92d3261d2fcbbacf79168b09bd6528fea31fa82bb7c3139f03"
-
-ZLIB_QAT_VERSION = "0.4.10-001"
-
-export ZLIB_MEMORY_DRIVER = "usdm_drv"
-export CMN_ROOT = "${STAGING_DIR_TARGET}/lib"
-export UPSTREAM_DRIVER_CMN_ROOT = "${STAGING_DIR_TARGET}/lib"
-
-zlibqat_do_patch() {
-        cd ${WORKDIR}
-        tar -xvzf zlib-${ZLIB_VERSION}-qat.L.${ZLIB_QAT_VERSION}.tar.gz
-        cd ${S}
-        if [ ! -d ${S}/debian/patches ]; then
-                mkdir -p ${S}/debian/patches
-                cp -f ${WORKDIR}/zlib-${ZLIB_VERSION}-qat.patch ${S}/debian/patches
-                echo "zlib-${ZLIB_VERSION}-qat.patch -p1" > ${S}/debian/patches/series
-        fi
-        quilt pop -a || true
-        if [ -d ${S}/.pc-zlibqat ]; then
-                rm -rf ${S}/.pc
-                mv ${S}/.pc-zlibqat ${S}/.pc
-                QUILT_PATCHES=${S}/debian/patches quilt pop -a
-                rm -rf ${S}/.pc
-        fi
-        QUILT_PATCHES=${S}/debian/patches quilt push -a
-        mv ${S}/.pc ${S}/.pc-zlibqat
-}
-
-do_install_append() {
-        install -m 660  ${MEM_PATH}/config/c3xxx/multi_thread_optimized/*	${D}${sysconfdir}/zlib_conf/
-        install -m 660  ${MEM_PATH}/config/c6xx/multi_thread_optimized/*	${D}${sysconfdir}/zlib_conf/
-}
diff --git a/recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb b/recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb
new file mode 100644
index 0000000..c3e623c
--- /dev/null
+++ b/recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb
@@ -0,0 +1,43 @@
+require zlib-qat.inc
+
+DEPENDS += "qat17"
+
+SRC_URI += "https://01.org/sites/default/files/downloads/zlibshim0.4.10-003.tar.gz;name=zlibqat \
+           file://zlib-qat-0.4.10-001-zlib-qat-add-a-install-target-to-makefile.patch \
+           file://zlib-qat-0.4.10-001-zlib-Remove-rpaths-from-makefile.patch \
+           file://zlib-qat-0.4.10-001-zlib-qat-correct-the-order-for-static-linking-libude.patch \
+           "
+
+SRC_URI[zlibqat.md5sum] = "cea60976411bcb8378adbe1007f7fa6a"
+SRC_URI[zlibqat.sha256sum] = "b01f40e2df1a456435972ba46812a23f898e4a592b17ed76240f836b5b992bbd"
+
+ZLIB_QAT_VERSION = "0.4.10-003"
+
+export ZLIB_MEMORY_DRIVER = "usdm_drv"
+export CMN_ROOT = "${STAGING_DIR_TARGET}${base_libdir}"
+export UPSTREAM_DRIVER_CMN_ROOT = "${STAGING_DIR_TARGET}${base_libdir}"
+
+zlibqat_do_patch() {
+        cd ${WORKDIR}
+        tar -xvzf zlib-${ZLIB_VERSION}-qat.L.${ZLIB_QAT_VERSION}.tar.gz
+        cd ${S}
+        if [ ! -d ${S}/debian/patches ]; then
+                mkdir -p ${S}/debian/patches
+                cp -f ${WORKDIR}/zlib-${ZLIB_VERSION}-qat.patch ${S}/debian/patches
+                echo "zlib-${ZLIB_VERSION}-qat.patch -p1" > ${S}/debian/patches/series
+        fi
+        quilt pop -a || true
+        if [ -d ${S}/.pc-zlibqat ]; then
+                rm -rf ${S}/.pc
+                mv ${S}/.pc-zlibqat ${S}/.pc
+                QUILT_PATCHES=${S}/debian/patches quilt pop -a
+                rm -rf ${S}/.pc
+        fi
+        QUILT_PATCHES=${S}/debian/patches quilt push -a
+        mv ${S}/.pc ${S}/.pc-zlibqat
+}
+
+do_install_append() {
+        install -m 660  ${MEM_PATH}/config/c3xxx/multi_thread_optimized/*	${D}${sysconfdir}/zlib_conf/
+        install -m 660  ${MEM_PATH}/config/c6xx/multi_thread_optimized/*	${D}${sysconfdir}/zlib_conf/
+}
-- 
cgit v1.2.3-54-g00ecf