diff options
author | Anuj Mittal <anujx.mittal@intel.com> | 2015-07-10 18:57:43 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2015-07-10 13:52:27 -0700 |
commit | 1ad4a81ddeec0f700f3f7d93f6c7549a714ce985 (patch) | |
tree | b722d02520315b001aabc0e842f0ed2e09f14b2b /meta-crystalforest/recipes-extended | |
parent | 2e3ce506aa26a73335b10e3e34085a978875ef15 (diff) | |
download | meta-intel-1ad4a81ddeec0f700f3f7d93f6c7549a714ce985.tar.gz |
meta-crystalforest: zlib-qat: simplify do_install
Use the install targets from makefiles.
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-crystalforest/recipes-extended')
2 files changed, 58 insertions, 6 deletions
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 new file mode 100644 index 00000000..c7aec55a --- /dev/null +++ b/meta-crystalforest/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 | |||
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 index 514a15dc..30e6700c 100644 --- 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 | |||
@@ -19,6 +19,7 @@ DEPENDS += "cryptodev-linux pkgconfig qat16" | |||
19 | SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ | 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 \ | 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 \ | 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 \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" | 25 | SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" |
@@ -66,6 +67,7 @@ do_patch() { | |||
66 | cd ${S} | 67 | cd ${S} |
67 | patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch | 68 | patch -p1 < ${WORKDIR}/zlib-1.2.8-qat.patch |
68 | patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch | 69 | patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-qat_mem-build-qat_mem-ko-against-yocto-kernel-src.patch |
70 | patch -p1 < ${WORKDIR}/zlib-qat-0.4.7-002-zlib-qat-add-a-install-target-to-makefile.patch | ||
69 | } | 71 | } |
70 | 72 | ||
71 | do_configure() { | 73 | do_configure() { |
@@ -85,15 +87,19 @@ do_compile() { | |||
85 | 87 | ||
86 | do_install() { | 88 | do_install() { |
87 | chrpath -d ${MEM_PATH}/qat_zlib_test/comptestapp | 89 | chrpath -d ${MEM_PATH}/qat_zlib_test/comptestapp |
88 | install -m 0755 -d ${MODULE_DIR}/ | ||
89 | install -m 0755 -d ${D}${bindir}/ | 90 | install -m 0755 -d ${D}${bindir}/ |
90 | install -m 0755 -d ${D}${sysconfdir}/zlib_conf/ | 91 | install -m 0755 -d ${D}${sysconfdir}/zlib_conf/ |
91 | install -m 640 ${MEM_PATH}/qat_mem/qat_mem.ko ${MODULE_DIR}/ | 92 | |
92 | install -m 0755 ${WORKDIR}/zlib-${ZLIB_VERSION}/zpipe ${D}${bindir}/ | 93 | install -m 0755 zpipe ${D}${bindir} |
93 | install -m 0755 ${WORKDIR}/zlib-${ZLIB_VERSION}/minigzip ${D}${bindir}/ | 94 | install -m 0755 minigzip ${D}${bindir} |
94 | install -m 0755 ${MEM_PATH}/qat_zlib_test/comptestapp ${D}${bindir}/ | 95 | |
96 | cd ${MEM_PATH}/qat_mem | ||
97 | oe_runmake INSTALL_MOD_PATH=${D} INSTALL_MOD_DIR="kernel/drivers" install | ||
98 | |||
99 | cd ${S}/contrib/qat/qat_zlib_test | ||
100 | oe_runmake DESTDIR=${D} install | ||
101 | |||
95 | install -m 660 ${MEM_PATH}/config/dh895xcc/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ | 102 | install -m 660 ${MEM_PATH}/config/dh895xcc/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ |
96 | install -m 660 ${MEM_PATH}/config/dh89xxcc/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ | ||
97 | } | 103 | } |
98 | 104 | ||
99 | PACKAGES += "${PN}-app" | 105 | PACKAGES += "${PN}-app" |