convert to use ":" as the override instead of "_". And update LAYERSERIES_COMPAT to "honister".
Signed-off-by: Liwei Song <[email protected]> --- conf/include/maintainers.inc | 4 ++-- conf/layer.conf | 2 +- recipes-extended/qat/qat17_4.14.0-00031.bb | 14 +++++++------- recipes-extended/zlib-qat/zlib-qat.inc | 10 +++++----- recipes-extended/zlib-qat/zlib-qat_0.4.10-003.bb | 2 +- recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index 8343f5f74799..a7c444dbc407 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc @@ -1,4 +1,4 @@ # This file contains a list of recipe maintainers for meta-intel -RECIPE_MAINTAINER_pn-qat16 = "TBD DPDK Flex Team" -RECIPE_MAINTAINER_pn-zlib-qat = "TBD DPDK Flex Team" +RECIPE_MAINTAINER:pn-qat16 = "TBD DPDK Flex Team" +RECIPE_MAINTAINER:pn-zlib-qat = "TBD DPDK Flex Team" diff --git a/conf/layer.conf b/conf/layer.conf index b737cd2f351b..c04af75d9ca3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,7 +14,7 @@ LAYERDEPENDS_intel-qat = "core" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_intel-qat = "1" -LAYERSERIES_COMPAT_intel-qat = "hardknott" +LAYERSERIES_COMPAT_intel-qat = "honister" require ${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 d27d9333f41c..6a80932511b7 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" SRC_URI[sha256sum] = "a68dfaea4308e0bb5f350b7528f1a076a0c6ba3ec577d60d99dc42c49307b76e" COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST_x86-x32 = 'null' -COMPATIBLE_HOST_libc-musl_class-target = 'null' +COMPATIBLE_HOST:x86-x32 = 'null' +COMPATIBLE_HOST:libc-musl:class-target = 'null' S = "${WORKDIR}/qat17" ICP_TOOLS = "accelcomp" @@ -65,7 +65,7 @@ INITSCRIPT_NAME = "qat_service" PARALLEL_MAKE = "" -EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'" +EXTRA_OEMAKE:append = " CFLAGS+='-fgnu89-inline -fPIC'" EXTRA_OEMAKE = "-e MAKEFLAGS=" do_compile () { @@ -149,11 +149,11 @@ do_install() { PACKAGES += "${PN}-app" -FILES_${PN}-dev = "${includedir}/ \ +FILES:${PN}-dev = "${includedir}/ \ ${nonarch_base_libdir}/*.a \ " -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/ \ ${nonarch_base_libdir}/firmware \ ${sysconfdir}/ \ @@ -162,9 +162,9 @@ FILES_${PN} += "\ ${prefix}/src/qat \ " -FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ +FILES:${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ " -FILES_${PN}-app += "${bindir}/* \ +FILES:${PN}-app += "${bindir}/* \ ${prefix}/qat \ " diff --git a/recipes-extended/zlib-qat/zlib-qat.inc b/recipes-extended/zlib-qat/zlib-qat.inc index 915c5ed54dfd..34d61765c3d8 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" SRC_URI = "http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz;name=zlib \ " -SRC_URI_append_libc-musl = " file://0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch" +SRC_URI:append:libc-musl = " file://0001-qat_zlib.h-Add-pthread.h-for-MUSL.patch" SRC_URI[zlib.md5sum] = "44d667c142d7cda120332623eab69f40" SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" @@ -72,16 +72,16 @@ do_install() { PACKAGE_BEFORE_PN = "${PN}-app" -FILES_${PN} += " \ +FILES:${PN} += " \ ${sysconfdir}/zlib_conf/ \ " -FILES_${PN}-app += " \ +FILES:${PN}-app += " \ ${bindir}/* \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${bindir}/.debug \ " -EXCLUDE_FROM_WORLD_core2-32-intel-common = "1" +EXCLUDE_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 c3e623c7e8fb..1ac520ce4ef8 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() { mv ${S}/.pc ${S}/.pc-zlibqat } -do_install_append() { +do_install:append() { install -m 660 ${MEM_PATH}/config/c3xxx/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ install -m 660 ${MEM_PATH}/config/c6xx/multi_thread_optimized/* ${D}${sysconfdir}/zlib_conf/ } 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 c2de063602fb..678d88c4dd06 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() { } # module.bbclass will reset FILES variable -FILES_${PN} += " \ +FILES:${PN} += " \ ${sysconfdir}/zlib_conf/ \ " -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7201): https://lists.yoctoproject.org/g/meta-intel/message/7201 Mute This Topic: https://lists.yoctoproject.org/mt/84942990/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
