diff options
Diffstat (limited to 'meta-crystalforest/recipes-extended/zlib-qat')
4 files changed, 0 insertions, 262 deletions
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch b/meta-crystalforest/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 9e774db2..00000000 --- a/meta-crystalforest/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 @@ | |||
1 | From aa65d69632142d24ec44ed4c2d66371e1a1be7b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anujx.mittal@intel.com> | ||
3 | Date: Thu, 18 Jun 2015 11:56:08 +0800 | ||
4 | Subject: [PATCH] qat_mem: build qat_mem ko against yocto kernel src | ||
5 | |||
6 | Upstream-Status: Inappropriate [Configuration] | ||
7 | |||
8 | This tweaks the kernel source and build path in the makefile | ||
9 | to make sure the module is built against the right source. | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | ||
12 | --- | ||
13 | contrib/qat/qat_mem/Makefile | 13 +++++-------- | ||
14 | 1 file changed, 5 insertions(+), 8 deletions(-) | ||
15 | |||
16 | diff --git a/contrib/qat/qat_mem/Makefile b/contrib/qat/qat_mem/Makefile | ||
17 | index ddf5b59..ad6d4a4 100644 | ||
18 | --- a/contrib/qat/qat_mem/Makefile | ||
19 | +++ b/contrib/qat/qat_mem/Makefile | ||
20 | @@ -61,16 +61,10 @@ | ||
21 | ######################################################################### | ||
22 | |||
23 | MODULENAME := qat_mem | ||
24 | -KDIR := /lib/modules/$(shell uname -r)/build | ||
25 | +KDIR := $(KERNEL_SOURCE_ROOT) | ||
26 | PWD := $(shell pwd) | ||
27 | |||
28 | -ifeq ($(shell uname -r|grep -c grsec-WR), 1) | ||
29 | -AUTO_CONF=/lib/modules/$(shell uname -r)/build/include/generated/autoconf.h | ||
30 | -else | ||
31 | -AUTO_CONF=/usr/src/kernels/$(shell uname -r)/include/linux/autoconf.h | ||
32 | -endif | ||
33 | - | ||
34 | -CC := gcc -Wall -imacros $(AUTO_CONF) | ||
35 | +CC := ${CC} -Wall -imacros $(KERNEL_BUILDDIR)/include/generated/autoconf.h | ||
36 | |||
37 | ifeq ($(KERNELRELEASE),) | ||
38 | all: $(MODULENAME)_test | ||
39 | @@ -80,6 +74,9 @@ else | ||
40 | obj-m := $(MODULENAME).o | ||
41 | endif | ||
42 | |||
43 | +modules_install: | ||
44 | + $(MAKE) -C $(KDIR) M=$(PWD) modules_install | ||
45 | + | ||
46 | $(MODULENAME)_test: $(MODULENAME)_test.c | ||
47 | $(CC) -g -o $(MODULENAME)_test $(MODULENAME)_test.c | ||
48 | |||
49 | -- | ||
50 | 1.7.9.5 | ||
51 | |||
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch deleted file mode 100644 index c3605112..00000000 --- a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From aad2675c7bb635d8b7be47fa89a3ee87ba19d2e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anujx.mittal@intel.com> | ||
3 | Date: Thu, 18 Jun 2015 11:46:17 +0800 | ||
4 | Subject: [PATCH] zlib: Remove rpaths from makefile | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | This removes references to RPATHS that are no longer | ||
9 | necesary when building using bitbake. | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | ||
12 | --- | ||
13 | Makefile.in | 4 ++-- | ||
14 | contrib/qat/qat_zlib_test/Makefile | 3 --- | ||
15 | 2 files changed, 2 insertions(+), 5 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.in b/Makefile.in | ||
18 | index 94d8a80..cba5291 100644 | ||
19 | --- a/Makefile.in | ||
20 | +++ b/Makefile.in | ||
21 | @@ -59,12 +59,12 @@ ICP_LAC_API_DIR=$(ICP_API_DIR)/lac/ | ||
22 | ICP_DC_API_DIR=$(ICP_API_DIR)/dc/ | ||
23 | CFLAGS+=-D_GNU_SOURCE -I$(ICP_API_DIR) -I$(ICP_DC_API_DIR) -I$(ICP_LAC_API_DIR) -I$(ICP_SAL_API_DIR) | ||
24 | SFLAGS+=-D_GNU_SOURCE -I$(ICP_API_DIR) -I$(ICP_DC_API_DIR) -I$(ICP_LAC_API_DIR) -I$(ICP_SAL_API_DIR) | ||
25 | -ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz | ||
26 | +#ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ZLIB_ROOT) -lz | ||
27 | SHARED_APP_FLAGS=-Wl,-rpath,$(ZLIB_ROOT) -L$(ZLIB_ROOT) -lz | ||
28 | |||
29 | ifdef ICP_BUILD_OUTPUT | ||
30 | TEST_LDFLAGS+=-L$(ICP_BUILD_OUTPUT) | ||
31 | - ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) | ||
32 | +# ADDITIONAL_LDFLAGS+=-Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) | ||
33 | endif | ||
34 | |||
35 | ifdef ZLIB_DH895XCC | ||
36 | diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile | ||
37 | index 8a29a92..ca31dd2 100644 | ||
38 | --- a/contrib/qat/qat_zlib_test/Makefile | ||
39 | +++ b/contrib/qat/qat_zlib_test/Makefile | ||
40 | @@ -84,9 +84,6 @@ OBJS = $(SRCS:%.c=%.o) | ||
41 | COVERAGE_OBJS = | ||
42 | EXE= | ||
43 | LIBQAT= | ||
44 | -ifdef ICP_BUILD_OUTPUT | ||
45 | - LIBQAT+= -Wl,-rpath,$(ICP_BUILD_OUTPUT) -L$(ICP_BUILD_OUTPUT) | ||
46 | -endif | ||
47 | |||
48 | DRIVER=icp_qa_al | ||
49 | ifdef WITH_CPA_MUX | ||
50 | -- | ||
51 | 1.7.9.5 | ||
52 | |||
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch b/meta-crystalforest/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 c7aec55a..00000000 --- a/meta-crystalforest/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 @@ | |||
1 | From d78121d790c4a248bc47d1c662791fe57ac4af38 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anujx.mittal@intel.com> | ||
3 | Date: Thu, 18 Jun 2015 11:53:23 +0800 | ||
4 | Subject: [PATCH] zlib-qat: add a install target to makefile | ||
5 | |||
6 | Upstream-Status: Inappropriate [Configuration] | ||
7 | |||
8 | This adds an install target to qat_zlib_test and qat_mem makefiles | ||
9 | to facilitate the installation of test binaries to {D}. | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | ||
12 | --- | ||
13 | contrib/qat/qat_mem/Makefile | 3 +++ | ||
14 | contrib/qat/qat_zlib_test/Makefile | 3 +++ | ||
15 | 2 files changed, 6 insertions(+) | ||
16 | |||
17 | diff --git a/contrib/qat/qat_mem/Makefile b/contrib/qat/qat_mem/Makefile | ||
18 | index ad6d4a4..e4d77b6 100644 | ||
19 | --- a/contrib/qat/qat_mem/Makefile | ||
20 | +++ b/contrib/qat/qat_mem/Makefile | ||
21 | @@ -74,6 +74,9 @@ else | ||
22 | obj-m := $(MODULENAME).o | ||
23 | endif | ||
24 | |||
25 | +install: modules_install | ||
26 | + cp qat_mem_test $(INSTALL_MOD_PATH)$(bindir) | ||
27 | + | ||
28 | modules_install: | ||
29 | $(MAKE) -C $(KDIR) M=$(PWD) modules_install | ||
30 | |||
31 | diff --git a/contrib/qat/qat_zlib_test/Makefile b/contrib/qat/qat_zlib_test/Makefile | ||
32 | index ca31dd2..7da5ddd 100644 | ||
33 | --- a/contrib/qat/qat_zlib_test/Makefile | ||
34 | +++ b/contrib/qat/qat_zlib_test/Makefile | ||
35 | @@ -112,5 +112,8 @@ comptestappsh$(EXE): $(OBJS) Makefile | ||
36 | $(CC) -o comptestappsh $(OBJS) $(COVERAGE) \ | ||
37 | $(SHAREDLIBQAT) | ||
38 | |||
39 | +install: | ||
40 | + cp comptestapp $(DESTDIR)$(bindir) | ||
41 | + | ||
42 | clean: | ||
43 | rm -f $(OBJS) $(COVERAGE_OBJS) comptestapp comptestappsh | ||
44 | -- | ||
45 | 1.7.9.5 | ||
46 | |||
diff --git a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb deleted file mode 100644 index b3dc19cb..00000000 --- a/meta-crystalforest/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | SUMMARY = "Zlib QAT_MEM Memory Management Module for Intel Quick Assist \ | ||
2 | Technology" | ||
3 | |||
4 | DESCRIPTION = "This software acelerates the data compression algorithm \ | ||
5 | in the zlib software library via the Intel QuickAssist Technology \ | ||
6 | implemented on Intel Communications Chipset 89xx and 895x Series based platforms." | ||
7 | |||
8 | HOMEPAGE = "http://zlib.net/" | ||
9 | SECTION = "libs" | ||
10 | LICENSE = "Zlib & GPLv2 & BSD" | ||
11 | LIC_FILES_CHKSUM = "file://${WORKDIR}/zlib-${ZLIB_VERSION}/zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd \ | ||
12 | file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ | ||
13 | file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb" | ||
14 | |||
15 | # For target side versions of openssl enable support for OCF Linux driver | ||
16 | # if they are available. | ||
17 | DEPENDS += "cryptodev-linux pkgconfig virtual/qat" | ||
18 | |||
19 | SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ | ||
20 | https://01.org/sites/default/files/page/zlib_shim_0.4.7-002_withdocumentation.zip;name=zlibqat \ | ||
21 | file://zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch \ | ||
22 | file://zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch \ | ||
23 | file://zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" | ||
27 | SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" | ||
28 | |||
29 | SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000" | ||
30 | SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46" | ||
31 | |||
32 | COMPATIBLE_MACHINE = "crystalforest" | ||
33 | |||
34 | ZLIB_VERSION = "1.2.8" | ||
35 | ZLIB_QAT_VERSION = "0.4.7-002" | ||
36 | |||
37 | S = "${WORKDIR}/zlib-${ZLIB_VERSION}" | ||
38 | |||
39 | export ICP_ROOT = "${S}" | ||
40 | export ZLIB_ROOT = "${S}" | ||
41 | export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" | ||
42 | export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" | ||
43 | export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" | ||
44 | export ICP_DC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/dc" | ||
45 | export ZLIB_DH895XCC = "1" | ||
46 | export ZLIB_MEMORY_DRIVER = "qat_mem" | ||
47 | export ICP_BUILD_OUTPUT = "${STAGING_DIR_TARGET}" | ||
48 | |||
49 | inherit module | ||
50 | MEM_PATH = "${S}/contrib/qat" | ||
51 | |||
52 | do_unpack2(){ | ||
53 | cd ${WORKDIR}/ | ||
54 | unzip zlib_quickassist_patch_l.0.4.7_002_stable.zip | ||
55 | cd zlib_quickassist_patch_l.0.4.7_002_devbranch | ||
56 | tar -xvzf zlib-1.2.8-qat.L.0.4.7-002.tar.gz | ||
57 | cp zlib-1.2.8-qat.patch ${WORKDIR} | ||
58 | } | ||
59 | |||
60 | addtask unpack2 after do_unpack before do_patch | ||
61 | |||
62 | do_patch() { | ||
63 | cd ${S} | ||
64 | patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch | ||
65 | patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch | ||
66 | patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch | ||
67 | patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch | ||
68 | } | ||
69 | |||
70 | do_configure() { | ||
71 | ./configure --prefix=${prefix} --shared --libdir=${libdir} | ||
72 | } | ||
73 | |||
74 | do_compile() { | ||
75 | unset CFLAGS CXXFLAGS | ||
76 | oe_runmake | ||
77 | |||
78 | cd ${S}/contrib/qat/qat_mem | ||
79 | oe_runmake | ||
80 | |||
81 | cd ${S}/contrib/qat/qat_zlib_test | ||
82 | oe_runmake | ||
83 | } | ||
84 | |||
85 | do_install() { | ||
86 | install -m 0755 -d ${D}${bindir}/ | ||
87 | install -m 0755 -d ${D}${sysconfdir}/zlib_conf/ | ||
88 | |||
89 | install -m 0755 zpipe ${D}${bindir} | ||
90 | install -m 0755 minigzip ${D}${bindir} | ||
91 | |||
92 | cd ${MEM_PATH}/qat_mem | ||
93 | oe_runmake INSTALL_MOD_PATH=${D} INSTALL_MOD_DIR="kernel/drivers" install | ||
94 | |||
95 | cd ${S}/contrib/qat/qat_zlib_test | ||
96 | oe_runmake DESTDIR=${D} install | ||
97 | |||
98 | install -m 660 ${MEM_PATH}/config/dh895xcc/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ | ||
99 | } | ||
100 | |||
101 | PACKAGES += "${PN}-app" | ||
102 | |||
103 | FILES_${PN} += " \ | ||
104 | ${sysconfdir}/zlib_conf/ \ | ||
105 | " | ||
106 | |||
107 | FILES_${PN}-app += " \ | ||
108 | ${bindir}/* \ | ||
109 | " | ||
110 | |||
111 | FILES_${PN}-dbg += " \ | ||
112 | ${bindir}/.debug \ | ||
113 | " | ||