diff options
Diffstat (limited to 'meta-isg/common/recipes-extended/zlib-qat/zlib-qat')
3 files changed, 149 insertions, 0 deletions
diff --git a/meta-isg/common/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-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch new file mode 100644 index 00000000..9e774db2 --- /dev/null +++ b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch | |||
@@ -0,0 +1,51 @@ | |||
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-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch new file mode 100644 index 00000000..c3605112 --- /dev/null +++ b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-Remove-rpaths-from-makefile.patch | |||
@@ -0,0 +1,52 @@ | |||
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-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch new file mode 100644 index 00000000..c7aec55a --- /dev/null +++ b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch | |||
@@ -0,0 +1,46 @@ | |||
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 | |||