From 0584f638797a816b29b909d4611d5a099df7bbc1 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Sat, 31 Jul 2021 17:47:03 +0800 Subject: Convert to new override syntax Use the convert-overrides.py to convert to new syntax and manually fix some additional changes. Signed-off-by: Anuj Mittal --- .../clang-layer/recipes-core/dnn/onednn_2.2.3.bb | 6 +++--- .../clang-layer/recipes-core/ispc/ispc_1.16.0.bb | 2 +- .../recipes-devtools/clang/llvm-project-source.bbappend | 8 ++++---- .../compute-runtime/intel-compute-runtime_21.04.18912.bb | 16 ++++++++-------- .../igc/intel-graphics-compiler_1.0.6646.bb | 8 ++++---- .../recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb | 8 ++++---- .../recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb | 8 ++++---- .../recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb | 6 +++--- .../recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) (limited to 'dynamic-layers/clang-layer') diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb index ebc33d20..c24c6440 100644 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb @@ -25,7 +25,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+))$" CVE_PRODUCT = "intel:math_kernel_library" COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' EXTRA_OECMAKE += " \ -DDNNL_LIBRARY_TYPE=SHARED \ @@ -39,7 +39,7 @@ EXTRA_OECMAKE += " \ PACKAGECONFIG ??= "" PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime" -do_install_append () { +do_install:append () { install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs install -m 0755 ${B}/tests/benchdnn/benchdnn ${D}${bindir}/mkl-dnn/tests/benchdnn cp -r ${B}/tests/benchdnn/inputs/* ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs @@ -53,4 +53,4 @@ do_install_ptest () { PACKAGES =+ "${PN}-test" -FILES_${PN}-test = "${bindir}/mkl-dnn/*" +FILES:${PN}-test = "${bindir}/mkl-dnn/*" diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.16.0.bb b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.16.0.bb index 5355140b..de7e8472 100644 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.16.0.bb +++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.16.0.bb @@ -21,7 +21,7 @@ SRCREV = "bdd411085d3e398cf7927cb3b94b00af676737ba" COMPATIBLE_HOST = '(x86_64).*-linux' DEPENDS += " clang-native bison-native " -RDEPENDS_${PN} += " clang-libllvm clang" +RDEPENDS:${PN} += " clang-libllvm clang" EXTRA_OECMAKE += " \ -DISPC_INCLUDE_TESTS=OFF \ diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend index 20bdecfe..a09343b3 100644 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:" SPIRV10_SRCREV = "576abae62cecd171992017a4a786e3831221ab8d" SPIRV11_SRCREV = "2a8c1e6c9778deaa720a23e08c293006dc5d56fd" @@ -34,8 +34,8 @@ SPIRV_LLVM11_SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git; -SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '10.0.1', ' ${SPIRV_LLVM10_SRC_URI} ${SRC_URI_LLVM10_PATCHES} ', '', d)}" -SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '11.1.0', ' ${SPIRV_LLVM11_SRC_URI} ${SRC_URI_LLVM11_PATCHES} ', '', d)}" -SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}" +SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '10.0.1', ' ${SPIRV_LLVM10_SRC_URI} ${SRC_URI_LLVM10_PATCHES} ', '', d)}" +SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '11.1.0', ' ${SPIRV_LLVM11_SRC_URI} ${SRC_URI_LLVM11_PATCHES} ', '', d)}" +SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}" SRCREV_spirv = "${@bb.utils.contains_any('LLVMVERSION', [ '13.0.0', '12.0.0' ], '', '${SPIRV_SRCREV}', d)}" diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_21.04.18912.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_21.04.18912.bb index d0078f3a..73a98732 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_21.04.18912.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_21.04.18912.bb @@ -10,21 +10,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae27f47fd6755510247c19e547e4c804 \ SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \ " -SRC_URI_append_class-target = " file://allow-to-find-cpp-generation-tool.patch" +SRC_URI:append:class-target = " file://allow-to-find-cpp-generation-tool.patch" SRCREV = "5a05d7643c4d8cc14e281b686c78101a7a01e8e1" S = "${WORKDIR}/git" DEPENDS += " intel-graphics-compiler gmmlib" -DEPENDS_append_class-target = " intel-compute-runtime-native libva" +DEPENDS:append:class-target = " intel-compute-runtime-native libva" -RDEPENDS_${PN} += " intel-graphics-compiler gmmlib" +RDEPENDS:${PN} += " intel-graphics-compiler gmmlib" inherit cmake pkgconfig COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" EXTRA_OECMAKE = " \ -DIGC_DIR=${STAGING_INCDIR}/igc \ @@ -32,24 +32,24 @@ EXTRA_OECMAKE = " \ -DSKIP_UNIT_TESTS=1 \ -DCCACHE_ALLOWED=FALSE \ " -EXTRA_OECMAKE_append_class-target = " \ +EXTRA_OECMAKE:append:class-target = " \ -Dcloc_cmd_prefix=ocloc \ " PACKAGECONFIG ??= "" PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install ${B}/bin/cpp_generate_tool ${D}${bindir}/ } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/intel-opencl/libigdrcl.so \ ${libdir}/libocloc.so \ " -FILES_${PN}-dev = "${includedir}" +FILES:${PN}-dev = "${includedir}" BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.6646.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.6646.bb index 582db553..d546dc22 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.6646.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.6646.bb @@ -27,12 +27,12 @@ S = "${WORKDIR}/git" inherit cmake COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" DEPENDS += " flex-native bison-native clang opencl-clang vc-intrinsics" -DEPENDS_append_class-target = " clang-cross-x86_64" +DEPENDS:append:class-target = " clang-cross-x86_64" -RDEPENDS_${PN} += "opencl-clang" +RDEPENDS:${PN} += "opencl-clang" EXTRA_OECMAKE = "-DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 -DIGC_BUILD__VC_ENABLED=OFF -DIGC_BUILD__USE_KHRONOS_SPIRV_TRANSLATOR=ON" @@ -40,6 +40,6 @@ BBCLASSEXTEND = "native nativesdk" UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P(?!19\..*)\d+(\.\d+)+)$" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/igc/NOTICES.txt \ " diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb index 4928eb22..c870b90b 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol= file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ file://0001-Building-in-tree-with-LLVM-10.0-with-the-LLVM_LINK_L.patch \ " -SRC_URI_append_class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" +SRC_URI:append:class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" SRCREV = "c8cd72e32b6abc18ce6da71c357ea45ba78b52f0" @@ -17,17 +17,17 @@ S = "${WORKDIR}/git" inherit cmake DEPENDS += "clang" -DEPENDS_append_class-target = " opencl-clang-native" +DEPENDS:append:class-target = " opencl-clang-native" COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" EXTRA_OECMAKE += "\ -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ -DCMAKE_SKIP_RPATH=TRUE \ " -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ } diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb index 0c5d0508..e0b12d1f 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-110;protocol=https \ file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ " -SRC_URI_append_class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" +SRC_URI:append:class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" SRCREV = "c67648d41df00ea8ee9d701d17299b86f86f0321" @@ -16,10 +16,10 @@ S = "${WORKDIR}/git" inherit cmake DEPENDS += "clang" -DEPENDS_append_class-target = " opencl-clang-native" +DEPENDS:append:class-target = " opencl-clang-native" COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" EXTRA_OECMAKE += "\ -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ @@ -27,7 +27,7 @@ EXTRA_OECMAKE += "\ -DPREFERRED_LLVM_VERSION="11.1.0" \ " -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ } diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb index 06dc44da..544f7e33 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb @@ -13,17 +13,17 @@ S = "${WORKDIR}/git" inherit cmake DEPENDS += " clang spirv-llvm-translator" -DEPENDS_append_class-target = " opencl-clang-native" +DEPENDS:append:class-target = " opencl-clang-native" COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" EXTRA_OECMAKE += "\ -DCMAKE_SKIP_RPATH=TRUE \ -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ " -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ } diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb index 3c0cc26c..3ac2c8c0 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_1.0.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" inherit cmake COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" DEPENDS += " clang" -- cgit v1.2.3-54-g00ecf