From: Chee Yang Lee <[email protected]> This is no longer maintained.
Signed-off-by: Chee Yang Lee <[email protected]> --- recipes-extended/zlib-qat/zlib-qat.inc | 86 ------------------- ...01-qat_zlib.h-Add-pthread.h-for-MUSL.patch | 29 ------- ...001-zlib-Remove-rpaths-from-makefile.patch | 63 -------------- ...qat-add-a-install-target-to-makefile.patch | 30 ------- ...-the-order-for-static-linking-libude.patch | 31 ------- .../zlib-qat/zlib-qat_0.4.10-003.bb | 43 ---------- 6 files changed, 282 deletions(-) delete mode 100644 recipes-extended/zlib-qat/zlib-qat.inc delete mode 100644 recipes-extended/zlib-qat/zlib-qat/0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-Remove-rpaths-from-makefile.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-add-a-install-target-to-makefile.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-correct-the-order-for-static-linking-libude.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb diff --git a/recipes-extended/zlib-qat/zlib-qat.inc b/recipes-extended/zlib-qat/zlib-qat.inc deleted file mode 100644 index 9f2dfb4..0000000 --- a/recipes-extended/zlib-qat/zlib-qat.inc +++ /dev/null @@ -1,86 +0,0 @@ -SUMMARY = "Zlib QAT_MEM Memory Management Module for Intel Quick Assist \ -Technology" - -DESCRIPTION = "This software acelerates the data compression algorithm \ -in the zlib software library via the Intel QuickAssist Technology" - -HOMEPAGE = "http://zlib.net/"; -SECTION = "libs" -LICENSE = "Zlib & GPL-2.0-only & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${WORKDIR}/zlib-${ZLIB_VERSION}/zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd \ - file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" - -# For target side versions of openssl enable support for OCF Linux driver -# if they are available. -DEPENDS += "cryptodev-linux pkgconfig udev" - -SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ - " -SRC_URI:append:libc-musl = " file://0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch" - -SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" -SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" - -COMPATIBLE_MACHINE = "null" - -ZLIB_VERSION = "1.2.8" - -S = "${WORKDIR}/zlib-${ZLIB_VERSION}" - -export ICP_ROOT = "${STAGING_DIR_TARGET}/opt/intel/QAT" -export ZLIB_ROOT = "${S}" -export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" -export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" -export ICP_BUILD_OUTPUT = "${STAGING_DIR_TARGET}" - -CFLAGS += " -I${ICP_ROOT}/quickassist/utilities/libusdm_drv" -EXTRA_OEMAKE = "-e MAKEFLAGS=" -TARGET_CC_ARCH += "${LDFLAGS}" - -MEM_PATH = "${S}/contrib/qat" - -# We invoke base do_patch at end, to incorporate any local patch -python do_patch() { - bb.build.exec_func('zlibqat_do_patch', d) - bb.build.exec_func('patch_do_patch', d) -} - -do_configure() { - ./configure --prefix=${prefix} --shared --libdir=${libdir} -} - -do_compile() { - unset CFLAGS CXXFLAGS - oe_runmake - - cd ${S}/contrib/qat/qat_zlib_test - oe_runmake -} - -do_install() { - install -m 0755 -d ${D}${bindir}/ - install -m 0755 -d ${D}${sysconfdir}/zlib_conf/ - - install -m 0755 zpipe ${D}${bindir} - install -m 0755 minigzip ${D}${bindir} - - cd ${S}/contrib/qat/qat_zlib_test - oe_runmake DESTDIR=${D} install -} - -PACKAGE_BEFORE_PN = "${PN}-app" - -FILES:${PN} += " \ - ${sysconfdir}/zlib_conf/ \ - " - -FILES:${PN}-app += " \ - ${bindir}/* \ - " - -FILES:${PN}-dbg += " \ - ${bindir}/.debug \ - " - -EXCLUDE_FROM_WORLD:core2-32-intel-common = "1" diff --git a/recipes-extended/zlib-qat/zlib-qat/0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch b/recipes-extended/zlib-qat/zlib-qat/0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch deleted file mode 100644 index b45ae79..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 30c4a1181cbe696dd1b9f52c8e9422ef8c331e8f Mon Sep 17 00:00:00 2001 -From: Saul Wold <[email protected]> -Date: Thu, 9 Feb 2017 12:40:47 -0800 -Subject: [PATCH] qat_zlib.h: Add pthread.h for MUSL - -MUSL is stricter when it comes to header file inclusion, so add -the additional header thats needed to compile with MUSL. - -Upstream-Status: Pending -Signed-off-by: Saul Wold <[email protected]> ---- - qat_zlib.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qat_zlib.h b/qat_zlib.h -index 2747f84..d9ac312 100644 ---- a/qat_zlib.h -+++ b/qat_zlib.h -@@ -8,6 +8,7 @@ - #include <stdlib.h> - #include <assert.h> - #include <time.h> -+#include <pthread.h> - - #include "cpa_dc.h" - #ifdef USE_QAE_MEM --- -2.7.4 - diff --git a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-Remove-rpaths-from-makefile.patch b/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-Remove-rpaths-from-makefile.patch deleted file mode 100644 index 2da2bb7..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-Remove-rpaths-from-makefile.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d14d6ea2072ede5d1afddf738cb1801263e90d70 Mon Sep 17 00:00:00 2001 -From: "Tan, Raymond" <[email protected]> -Date: Fri, 10 Aug 2018 15:45:38 +0800 -Subject: [PATCH 2/3] zlib: Remove rpaths from makefile - -Upstream-Status: Inappropriate [configuration] - -This removes references to RPATHS that are no longer -necesary when building using bitbake. - -Signed-off-by: Tan, Raymond <[email protected]> ---- - Makefile.in | 9 +++++---- - contrib/qat/qat_zlib_test/Makefile | 3 --- - 2 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 0100f59..8978ef1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -59,12 +59,13 @@ ICP_LAC_API_DIR=$(ICP_API_DIR)/lac/ - ICP_DC_API_DIR=$(ICP_API_DIR)/dc/ - CFLAGS+=-D_GNU_SOURCE -I$(ICP_API_DIR) -I$(ICP_DC_API_DIR) -I$(ICP_LAC_API_DIR) -I$(ICP_SAL_API_DIR) - SFLAGS+=-D_GNU_SOURCE -I$(ICP_API_DIR) -I$(ICP_DC_API_DIR) -I$(ICP_LAC_API_DIR) -I$(ICP_SAL_API_DIR) --ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz --SHARED_APP_FLAGS=-Wl,-rpath,$(ZLIB_ROOT) -L$(ZLIB_ROOT) -lz -+#ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz -+#SHARED_APP_FLAGS=-Wl,-rpath,$(ZLIB_ROOT) -L$(ZLIB_ROOT) -lz -+SHARED_APP_FLAGS=-L$(ZLIB_ROOT) -lz - - ifdef ICP_BUILD_OUTPUT - TEST_LDFLAGS+=-L$(ICP_BUILD_OUTPUT) -- ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) -+# ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) - endif - - ifdef UPSTREAM_DRIVER_CMN_ROOT -@@ -91,7 +92,7 @@ ADDITIONAL_SHAREDLIBC=-L$(ICP_BUILD_OUTPUT) -l$(DRIVER)_s -lpthread -lrt - - ifeq ($(ZLIB_MEMORY_DRIVER),usdm_drv) - TEST_LDFLAGS+= $(CMN_ROOT)/libusdm_drv.a --ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(CMN_ROOT) -L$(CMN_ROOT) -lusdm_drv_s -+#ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(CMN_ROOT) -L$(CMN_ROOT) -lusdm_drv_s - endif - - STATICLIB=libz.a -diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile -index 47829ac..bfcf86d 100644 ---- a/contrib/qat/qat_zlib_test/Makefile -+++ b/contrib/qat/qat_zlib_test/Makefile -@@ -85,9 +85,6 @@ COVERAGE_OBJS = - EXE= - LIBQAT= - UDEV= --ifdef ICP_BUILD_OUTPUT -- LIBQAT+= -Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) --endif - - ifdef UPSTREAM_DRIVER_CMN_ROOT - DRIVER=qat --- -1.9.1 - diff --git a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-add-a-install-target-to-makefile.patch b/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-add-a-install-target-to-makefile.patch deleted file mode 100644 index 3a202e9..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-add-a-install-target-to-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 943dd3c2b9d68385c9e71b1cc215cf03e2dd74fd Mon Sep 17 00:00:00 2001 -From: "Tan, Raymond" <[email protected]> -Date: Wed, 29 Aug 2018 13:35:44 +0800 -Subject: [PATCH 1/3] zlib-qat: add a install target to makefile - -Upstream-Status: Inappropriate [Configuration]$ - -This adds an install target to qat_zlib_test makefiles -to facilitate the installation of test binaries to {D}. - -Signed-off-by: Tan, Raymond <[email protected]> ---- - contrib/qat/qat_zlib_test/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile -index 7b86028..47829ac 100644 ---- a/contrib/qat/qat_zlib_test/Makefile -+++ b/contrib/qat/qat_zlib_test/Makefile -@@ -132,5 +132,7 @@ comptestappsh$(EXE): $(OBJS) Makefile - $(CC) -o comptestappsh $(OBJS) $(COVERAGE) \ - $(SHAREDLIBQAT) - -+install: -+ cp comptestapp $(DESTDIR)$(bindir) - clean: - rm -f $(OBJS) $(COVERAGE_OBJS) comptestapp comptestappsh --- -1.9.1 - diff --git a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-correct-the-order-for-static-linking-libude.patch b/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-correct-the-order-for-static-linking-libude.patch deleted file mode 100644 index 5352cb9..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.10-001-zlib-qat-correct-the-order-for-static-linking-libude.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7d74f6aa82042c2bb03e46fafe580bf4d117a24a Mon Sep 17 00:00:00 2001 -From: "Tan, Raymond" <[email protected]> -Date: Thu, 16 Aug 2018 14:29:05 +0800 -Subject: [PATCH 3/3] zlib-qat: correct the order for static linking libudev - -Upstream-Status: Inappropriate [Configuration] - -This changes the order of linking command to link libudev after libadf -to avoid undefined reference on udev. - -Signed-off-by: Tan, Raymond <[email protected]> ---- - contrib/qat/qat_zlib_test/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile -index bfcf86d..0498da8 100644 ---- a/contrib/qat/qat_zlib_test/Makefile -+++ b/contrib/qat/qat_zlib_test/Makefile -@@ -101,7 +101,7 @@ ifdef WITH_CPA_MUX - endif - - SHAREDLIBQAT= -Wl,-rpath,$(ZLIB_ROOT) -L$(ZLIB_ROOT) -lz -ldl -lrt -lpthread --STATICLIBQAT= $(ZLIB_ROOT)/libz.a $(LIBQAT) $(UDEV) -l$(DRIVER) -l$(ADFPROXY) -losal -lcrypto -ldl -lrt -lpthread -+STATICLIBQAT= $(ZLIB_ROOT)/libz.a $(LIBQAT) -l$(DRIVER) -l$(ADFPROXY) -losal -lcrypto -ldl -lrt -lpthread $(UDEV) - - ifeq ($(ZLIB_MEMORY_DRIVER),usdm_drv) - STATICLIBQAT+= $(CMN_ROOT)/libusdm_drv.a --- -1.9.1 - 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 deleted file mode 100644 index 1ac520c..0000000 --- a/recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb +++ /dev/null @@ -1,43 +0,0 @@ -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/ -} -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8024): https://lists.yoctoproject.org/g/meta-intel/message/8024 Mute This Topic: https://lists.yoctoproject.org/mt/99921944/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
