summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiweiSong <liwei.song@windriver.com>2021-08-17 15:27:59 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2021-08-17 15:35:00 +0800
commite17ab0bde7805764be136b1d5279fe971ea99a86 (patch)
treeec0053a9a4bf10f819f065e1ca77da08e25664ae
parentda3bacb39c0bc8d0970502237c6c5a60533a997f (diff)
downloadmeta-intel-qat-e17ab0bde7805764be136b1d5279fe971ea99a86.tar.gz
meta-intel-qat: convert to use new override syntaxHEADmaster
convert to use ":" as the override instead of "_". And update LAYERSERIES_COMPAT to "honister". Signed-off-by: Liwei Song <liwei.song@windriver.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--conf/include/maintainers.inc4
-rw-r--r--conf/layer.conf2
-rw-r--r--recipes-extended/qat/qat17_4.14.0-00031.bb14
-rw-r--r--recipes-extended/zlib-qat/zlib-qat.inc10
-rw-r--r--recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb2
-rw-r--r--recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb2
6 files changed, 17 insertions, 17 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index 8343f5f..a7c444d 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -1,4 +1,4 @@
1# This file contains a list of recipe maintainers for meta-intel 1# This file contains a list of recipe maintainers for meta-intel
2 2
3RECIPE_MAINTAINER_pn-qat16 = "TBD DPDK Flex Team" 3RECIPE_MAINTAINER:pn-qat16 = "TBD DPDK Flex Team"
4RECIPE_MAINTAINER_pn-zlib-qat = "TBD DPDK Flex Team" 4RECIPE_MAINTAINER:pn-zlib-qat = "TBD DPDK Flex Team"
diff --git a/conf/layer.conf b/conf/layer.conf
index b737cd2..c04af75 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,7 +14,7 @@ LAYERDEPENDS_intel-qat = "core"
14# This should only be incremented on significant changes that will 14# This should only be incremented on significant changes that will
15# cause compatibility issues with other layers 15# cause compatibility issues with other layers
16LAYERVERSION_intel-qat = "1" 16LAYERVERSION_intel-qat = "1"
17LAYERSERIES_COMPAT_intel-qat = "hardknott" 17LAYERSERIES_COMPAT_intel-qat = "honister"
18 18
19 19
20require ${LAYERDIR}/conf/include/maintainers.inc 20require ${LAYERDIR}/conf/include/maintainers.inc
diff --git a/recipes-extended/qat/qat17_4.14.0-00031.bb b/recipes-extended/qat/qat17_4.14.0-00031.bb
index d27d933..6a80932 100644
--- a/recipes-extended/qat/qat17_4.14.0-00031.bb
+++ b/recipes-extended/qat/qat17_4.14.0-00031.bb
@@ -31,8 +31,8 @@ SRC_URI[md5sum] = "a6ff665184159583542dac89b9226f09"
31SRC_URI[sha256sum] = "a68dfaea4308e0bb5f350b7528f1a076a0c6ba3ec577d60d99dc42c49307b76e" 31SRC_URI[sha256sum] = "a68dfaea4308e0bb5f350b7528f1a076a0c6ba3ec577d60d99dc42c49307b76e"
32 32
33COMPATIBLE_MACHINE = "null" 33COMPATIBLE_MACHINE = "null"
34COMPATIBLE_HOST_x86-x32 = 'null' 34COMPATIBLE_HOST:x86-x32 = 'null'
35COMPATIBLE_HOST_libc-musl_class-target = 'null' 35COMPATIBLE_HOST:libc-musl:class-target = 'null'
36 36
37S = "${WORKDIR}/qat17" 37S = "${WORKDIR}/qat17"
38ICP_TOOLS = "accelcomp" 38ICP_TOOLS = "accelcomp"
@@ -65,7 +65,7 @@ INITSCRIPT_NAME = "qat_service"
65 65
66PARALLEL_MAKE = "" 66PARALLEL_MAKE = ""
67 67
68EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'" 68EXTRA_OEMAKE:append = " CFLAGS+='-fgnu89-inline -fPIC'"
69EXTRA_OEMAKE = "-e MAKEFLAGS=" 69EXTRA_OEMAKE = "-e MAKEFLAGS="
70 70
71do_compile () { 71do_compile () {
@@ -149,11 +149,11 @@ do_install() {
149 149
150PACKAGES += "${PN}-app" 150PACKAGES += "${PN}-app"
151 151
152FILES_${PN}-dev = "${includedir}/ \ 152FILES:${PN}-dev = "${includedir}/ \
153 ${nonarch_base_libdir}/*.a \ 153 ${nonarch_base_libdir}/*.a \
154 " 154 "
155 155
156FILES_${PN} += "\ 156FILES:${PN} += "\
157 ${libdir}/ \ 157 ${libdir}/ \
158 ${nonarch_base_libdir}/firmware \ 158 ${nonarch_base_libdir}/firmware \
159 ${sysconfdir}/ \ 159 ${sysconfdir}/ \
@@ -162,9 +162,9 @@ FILES_${PN} += "\
162 ${prefix}/src/qat \ 162 ${prefix}/src/qat \
163 " 163 "
164 164
165FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ 165FILES:${PN}-dbg += "${sysconfdir}/init.d/.debug/ \
166 " 166 "
167 167
168FILES_${PN}-app += "${bindir}/* \ 168FILES:${PN}-app += "${bindir}/* \
169 ${prefix}/qat \ 169 ${prefix}/qat \
170 " 170 "
diff --git a/recipes-extended/zlib-qat/zlib-qat.inc b/recipes-extended/zlib-qat/zlib-qat.inc
index 915c5ed..34d6176 100644
--- a/recipes-extended/zlib-qat/zlib-qat.inc
+++ b/recipes-extended/zlib-qat/zlib-qat.inc
@@ -17,7 +17,7 @@ DEPENDS += "cryptodev-linux pkgconfig udev"
17 17
18SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ 18SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \
19 " 19 "
20SRC_URI_append_libc-musl = " file://0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch" 20SRC_URI:append:libc-musl = " file://0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch"
21 21
22SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" 22SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40"
23SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" 23SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"
@@ -72,16 +72,16 @@ do_install() {
72 72
73PACKAGE_BEFORE_PN = "${PN}-app" 73PACKAGE_BEFORE_PN = "${PN}-app"
74 74
75FILES_${PN} += " \ 75FILES:${PN} += " \
76 ${sysconfdir}/zlib_conf/ \ 76 ${sysconfdir}/zlib_conf/ \
77 " 77 "
78 78
79FILES_${PN}-app += " \ 79FILES:${PN}-app += " \
80 ${bindir}/* \ 80 ${bindir}/* \
81 " 81 "
82 82
83FILES_${PN}-dbg += " \ 83FILES:${PN}-dbg += " \
84 ${bindir}/.debug \ 84 ${bindir}/.debug \
85 " 85 "
86 86
87EXCLUDE_FROM_WORLD_core2-32-intel-common = "1" 87EXCLUDE_FROM_WORLD:core2-32-intel-common = "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
index c3e623c..1ac520c 100644
--- a/recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb
+++ b/recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb
@@ -37,7 +37,7 @@ zlibqat_do_patch() {
37 mv ${S}/.pc ${S}/.pc-zlibqat 37 mv ${S}/.pc ${S}/.pc-zlibqat
38} 38}
39 39
40do_install_append() { 40do_install:append() {
41 install -m 660 ${MEM_PATH}/config/c3xxx/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ 41 install -m 660 ${MEM_PATH}/config/c3xxx/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/
42 install -m 660 ${MEM_PATH}/config/c6xx/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ 42 install -m 660 ${MEM_PATH}/config/c6xx/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/
43} 43}
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
index c2de063..678d88c 100644
--- a/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
+++ b/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
@@ -75,6 +75,6 @@ do_install() {
75} 75}
76 76
77# module.bbclass will reset FILES variable 77# module.bbclass will reset FILES variable
78FILES_${PN} += " \ 78FILES:${PN} += " \
79 ${sysconfdir}/zlib_conf/ \ 79 ${sysconfdir}/zlib_conf/ \
80 " 80 "