From: Chee Yang Lee <[email protected]> drop zlib-qat v0.4.7-002 recipe as it depend on qat16 which no longer maintained in this layer.
Signed-off-by: Chee Yang Lee <[email protected]> --- ...-qat_mem-ko-against-yocto-kernel-src.patch | 51 ------------ ...002-zlib-Remove-rpaths-from-makefile.patch | 52 ------------ ...qat-add-a-install-target-to-makefile.patch | 46 ----------- .../zlib-qat/zlib-qat_0.4.7-002.bb | 80 ------------------- 4 files changed, 229 deletions(-) delete mode 100644 recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch delete mode 100644 recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb diff --git a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch b/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch deleted file mode 100644 index 9e774db..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aa65d69632142d24ec44ed4c2d66371e1a1be7b4 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Thu, 18 Jun 2015 11:56:08 +0800 -Subject: [PATCH] qat_mem: build qat_mem ko against yocto kernel src - -Upstream-Status: Inappropriate [Configuration] - -This tweaks the kernel source and build path in the makefile -to make sure the module is built against the right source. - -Signed-off-by: Anuj Mittal <[email protected]> ---- - contrib/qat/qat_mem/Makefile | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/contrib/qat/qat_mem/Makefile b/contrib/qat/qat_mem/Makefile -index ddf5b59..ad6d4a4 100644 ---- a/contrib/qat/qat_mem/Makefile -+++ b/contrib/qat/qat_mem/Makefile -@@ -61,16 +61,10 @@ - ######################################################################### - - MODULENAME := qat_mem --KDIR := /lib/modules/$(shell uname -r)/build -+KDIR := $(KERNEL_SOURCE_ROOT) - PWD := $(shell pwd) - --ifeq ($(shell uname -r|grep -c grsec-WR), 1) --AUTO_CONF=/lib/modules/$(shell uname -r)/build/include/generated/autoconf.h --else --AUTO_CONF=/usr/src/kernels/$(shell uname -r)/include/linux/autoconf.h --endif -- --CC := gcc -Wall -imacros $(AUTO_CONF) -+CC := ${CC} -Wall -imacros $(KERNEL_BUILDDIR)/include/generated/autoconf.h - - ifeq ($(KERNELRELEASE),) - all: $(MODULENAME)_test -@@ -80,6 +74,9 @@ else - obj-m := $(MODULENAME).o - endif - -+modules_install: -+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install -+ - $(MODULENAME)_test: $(MODULENAME)_test.c - $(CC) -g -o $(MODULENAME)_test $(MODULENAME)_test.c - --- -1.7.9.5 - diff --git a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch b/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch deleted file mode 100644 index c360511..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ -From aad2675c7bb635d8b7be47fa89a3ee87ba19d2e8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Thu, 18 Jun 2015 11:46:17 +0800 -Subject: [PATCH] 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: Anuj Mittal <[email protected]> ---- - Makefile.in | 4 ++-- - contrib/qat/qat_zlib_test/Makefile | 3 --- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 94d8a80..cba5291 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -59,12 +59,12 @@ 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 -+#ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz - SHARED_APP_FLAGS=-Wl,-rpath,$(ZLIB_ROOT) -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 ZLIB_DH895XCC -diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile -index 8a29a92..ca31dd2 100644 ---- a/contrib/qat/qat_zlib_test/Makefile -+++ b/contrib/qat/qat_zlib_test/Makefile -@@ -84,9 +84,6 @@ OBJS = $(SRCS:%.c=%.o) - COVERAGE_OBJS = - EXE= - LIBQAT= --ifdef ICP_BUILD_OUTPUT -- LIBQAT+= -Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) --endif - - DRIVER=icp_qa_al - ifdef WITH_CPA_MUX --- -1.7.9.5 - diff --git a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch b/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch deleted file mode 100644 index c7aec55..0000000 --- a/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d78121d790c4a248bc47d1c662791fe57ac4af38 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -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 <[email protected]> ---- - 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/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb deleted file mode 100644 index 678d88c..0000000 --- a/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb +++ /dev/null @@ -1,80 +0,0 @@ -require zlib-qat.inc - -DEPENDS += "qat16" - -SRC_URI += "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 \ - file://zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch \ - " - -SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000" -SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46" - -ZLIB_QAT_VERSION = "0.4.7-002" -QAT_PATCH_VERSION = "l.0.4.7_002" - -export ZLIB_DH895XCC = "1" -export ZLIB_MEMORY_DRIVER = "qat_mem" - -# qat_mem OOT kernel module, thus inherit module.bbclass -inherit module - -zlibqat_do_patch() { - cd ${WORKDIR} - unzip -q -o zlib_quickassist_patch_${QAT_PATCH_VERSION}_stable.zip - cd zlib_quickassist_patch_${QAT_PATCH_VERSION}_devbranch - tar -xvzf zlib-${ZLIB_VERSION}-qat.L.${ZLIB_QAT_VERSION}.tar.gz - cp -f zlib-${ZLIB_VERSION}-qat.patch ${WORKDIR} - 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_compile will override the module_do_compile from inherited module.bbclass -# which causes issues for components other than qat_mem.ko -do_compile() { - unset CFLAGS CXXFLAGS - oe_runmake - - cd ${S}/contrib/qat/qat_zlib_test - oe_runmake - - cd ${S}/contrib/qat/qat_mem - oe_runmake -} - -# do_install will override the module_do_install inherited from module.bbclass -# which causes issues for components other than qat_mem.ko -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 - - cd ${MEM_PATH}/qat_mem - oe_runmake INSTALL_MOD_PATH=${D} INSTALL_MOD_DIR="kernel/drivers" install - - install -m 660 ${MEM_PATH}/config/dh895xcc/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ -} - -# module.bbclass will reset FILES variable -FILES:${PN} += " \ - ${sysconfdir}/zlib_conf/ \ - " -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7749): https://lists.yoctoproject.org/g/meta-intel/message/7749 Mute This Topic: https://lists.yoctoproject.org/mt/95037863/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
