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 diff --git a/CHANGELOG b/CHANGELOG index a99cbb1..2ed8af0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -64,7 +64,7 @@ without having to use hardware. The virtio drivers are added via KERNEL_FEATURES_INTEL_COMMON. This prevents them from being added to custom kernels by default. They can be removed by adding the following to a conf or kernel bbappend file: - KERNEL_FEATURES_INTEL_COMMON_remove = “cfg/virtio.scc” + KERNEL_FEATURES_INTEL_COMMON:remove = “cfg/virtio.scc” OVMF firmware is also built and can be used in order to emulate a UEFI environment. A full runqemu command line for intel-corei7-64 could look like this: @@ -84,4 +84,4 @@ setting, it will not work in as the primary MACHINE tune as the bootloader needs to be built as a 64bit binary. The setup for this would be as follows: require conf/multilib.conf MULTILIBS = "multilib:libx32 - DEFAULTTUNE_virtclass-multilib-libx32 = "corei7-64-x32" + DEFAULTTUNE:virtclass-multilib-libx32 = "corei7-64-x32" diff --git a/README b/README index f377c67..58d6a50 100644 --- a/README +++ b/README @@ -206,12 +206,12 @@ based installer image instead of default wic image. To build it, you need to add below configuration to local.conf : WKS_FILE = "image-installer.wks.in" - IMAGE_FSTYPES_append = " ext4" + IMAGE_FSTYPES:append = " ext4" IMAGE_TYPEDEP_wic = "ext4" INITRD_IMAGE_LIVE="core-image-minimal-initramfs" do_image_wic[depends] += "${INITRD_IMAGE_LIVE}:do_image_complete" do_rootfs[depends] += "virtual/kernel:do_deploy" - IMAGE_BOOT_FILES_append = "\ + IMAGE_BOOT_FILES:append = "\ ${KERNEL_IMAGETYPE} \ microcode.cpio \ ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext4;rootfs.img \ diff --git a/classes/uefi-comboapp.bbclass b/classes/uefi-comboapp.bbclass index 4ecc553..a05e0ca 100644 --- a/classes/uefi-comboapp.bbclass +++ b/classes/uefi-comboapp.bbclass @@ -4,8 +4,8 @@ # it with the efi stub obtained from systemd-boot. # Don't add syslinux or build an ISO -PCBIOS_forcevariable = "0" -NOISO_forcevariable = "1" +PCBIOS:forcevariable = "0" +NOISO:forcevariable = "1" # image-live.bbclass will default INITRD_LIVE to the image INITRD_IMAGE creates. # We want behavior to be consistent whether or not "live" is in IMAGE_FSTYPES, so @@ -138,7 +138,7 @@ build_efi_cfg() { : } -populate_kernel_append() { +populate_kernel:append() { # The kernel and initrd are built into the app, so we don't need these if [ -f $dest/initrd ]; then rm $dest/initrd diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index e23892f..d23a0e9 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc @@ -1,54 +1,54 @@ # This file contains a list of recipe maintainers for meta-intel -RECIPE_MAINTAINER_pn-backport-iwlwifi = "Naveen Saini " -RECIPE_MAINTAINER_pn-core-image-rt = "Anuj Mittal " -RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-core-image-tiny = "Naveen Saini " -RECIPE_MAINTAINER_pn-core-image-minimal-initramfs = "Anuj Mittal " -RECIPE_MAINTAINER_pn-embree = "Naveen Saini " -RECIPE_MAINTAINER_pn-gmmlib = "Lim Siew Hoon " -RECIPE_MAINTAINER_pn-hdcp = "Naveen Saini " -RECIPE_MAINTAINER_pn-intel-graphics-compiler = "Naveen Saini " -RECIPE_MAINTAINER_pn-intel-compute-runtime = "Naveen Saini " -RECIPE_MAINTAINER_pn-intel-media-driver = "Lim Siew Hoon " -RECIPE_MAINTAINER_pn-intel-mediasdk = "Lim Siew Hoon " -RECIPE_MAINTAINER_pn-intel-microcode = "Anuj Mittal " -RECIPE_MAINTAINER_pn-intel-vaapi-driver = "Lim Siew Hoon " -RECIPE_MAINTAINER_pn-ipmctl = "Anuj Mittal " -RECIPE_MAINTAINER_pn-isa-l = "Naveen Saini " -RECIPE_MAINTAINER_pn-ispc = "Naveen Saini " -RECIPE_MAINTAINER_pn-itt = "Naveen Saini " -RECIPE_MAINTAINER_pn-ixgbe = "Naveen Saini " -RECIPE_MAINTAINER_pn-ixgbevf = "Naveen Saini " -RECIPE_MAINTAINER_pn-iucode-tool = "Anuj Mittal " -RECIPE_MAINTAINER_pn-jhi = "Naveen Saini " -RECIPE_MAINTAINER_pn-level-zero = "Naveen Saini " -RECIPE_MAINTAINER_pn-libipt = "Naveen Saini " -RECIPE_MAINTAINER_pn-libyami = "Anuj Mittal " -RECIPE_MAINTAINER_pn-libyami-utils = "Anuj Mittal " -RECIPE_MAINTAINER_pn-libxcam = "Naveen Saini " -RECIPE_MAINTAINER_pn-linux-intel = "Anuj Mittal " -RECIPE_MAINTAINER_pn-linux-intel-rt = "Anuj Mittal " -RECIPE_MAINTAINER_pn-linux-intel-dev = "Naveen Saini " -RECIPE_MAINTAINER_pn-lms = "Anuj Mittal " -RECIPE_MAINTAINER_pn-metee = "Naveen Saini " -RECIPE_MAINTAINER_pn-metrics-discovery = "Naveen Saini " -RECIPE_MAINTAINER_pn-oidn = "Naveen Saini " -RECIPE_MAINTAINER_pn-onednn = "Naveen Saini " -RECIPE_MAINTAINER_pn-onedpl = "Naveen Saini " -RECIPE_MAINTAINER_pn-onevpl = "Naveen Saini " -RECIPE_MAINTAINER_pn-onevpl-intel-gpu = "Yew Chang Ching " -RECIPE_MAINTAINER_pn-open-model-zoo = "Anuj Mittal " -RECIPE_MAINTAINER_pn-opencl-clang = "Naveen Saini " -RECIPE_MAINTAINER_pn-openvino-inference-engine = "Anuj Mittal " -RECIPE_MAINTAINER_pn-openvino-model-optimizer = "Anuj Mittal " -RECIPE_MAINTAINER_pn-openvkl = "Naveen Saini " -RECIPE_MAINTAINER_pn-ospray = "Naveen Saini " -RECIPE_MAINTAINER_pn-ovmf-shell-image-enrollkeys = "Naveen Saini " -RECIPE_MAINTAINER_pn-rkcommon = "Naveen Saini " -RECIPE_MAINTAINER_pn-sbsigntool-native = "Anuj Mittal " -RECIPE_MAINTAINER_pn-secureboot-selftest-image-signed = "Anuj Mittal " -RECIPE_MAINTAINER_pn-secureboot-selftest-image-unsigned = "Anuj Mittal " -RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal " -RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal " -RECIPE_MAINTAINER_pn-zlib-intel = "Naveen Saini " +RECIPE_MAINTAINER:pn-backport-iwlwifi = "Naveen Saini " +RECIPE_MAINTAINER:pn-core-image-rt = "Anuj Mittal " +RECIPE_MAINTAINER:pn-core-image-rt-sdk = "Anuj Mittal " +RECIPE_MAINTAINER:pn-core-image-tiny = "Naveen Saini " +RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal " +RECIPE_MAINTAINER:pn-embree = "Naveen Saini " +RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon " +RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini " +RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini " +RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini " +RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon " +RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon " +RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal " +RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon " +RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal " +RECIPE_MAINTAINER:pn-isa-l = "Naveen Saini " +RECIPE_MAINTAINER:pn-ispc = "Naveen Saini " +RECIPE_MAINTAINER:pn-itt = "Naveen Saini " +RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini " +RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini " +RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal " +RECIPE_MAINTAINER:pn-jhi = "Naveen Saini " +RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini " +RECIPE_MAINTAINER:pn-libipt = "Naveen Saini " +RECIPE_MAINTAINER:pn-libyami = "Anuj Mittal " +RECIPE_MAINTAINER:pn-libyami-utils = "Anuj Mittal " +RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini " +RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal " +RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal " +RECIPE_MAINTAINER:pn-linux-intel-dev = "Naveen Saini " +RECIPE_MAINTAINER:pn-lms = "Anuj Mittal " +RECIPE_MAINTAINER:pn-metee = "Naveen Saini " +RECIPE_MAINTAINER:pn-metrics-discovery = "Naveen Saini " +RECIPE_MAINTAINER:pn-oidn = "Naveen Saini " +RECIPE_MAINTAINER:pn-onednn = "Naveen Saini " +RECIPE_MAINTAINER:pn-onedpl = "Naveen Saini " +RECIPE_MAINTAINER:pn-onevpl = "Naveen Saini " +RECIPE_MAINTAINER:pn-onevpl-intel-gpu = "Yew Chang Ching " +RECIPE_MAINTAINER:pn-open-model-zoo = "Anuj Mittal " +RECIPE_MAINTAINER:pn-opencl-clang = "Naveen Saini " +RECIPE_MAINTAINER:pn-openvino-inference-engine = "Anuj Mittal " +RECIPE_MAINTAINER:pn-openvino-model-optimizer = "Anuj Mittal " +RECIPE_MAINTAINER:pn-openvkl = "Naveen Saini " +RECIPE_MAINTAINER:pn-ospray = "Naveen Saini " +RECIPE_MAINTAINER:pn-ovmf-shell-image-enrollkeys = "Naveen Saini " +RECIPE_MAINTAINER:pn-rkcommon = "Naveen Saini " +RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal " +RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal " +RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal " +RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal " +RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal " +RECIPE_MAINTAINER:pn-zlib-intel = "Naveen Saini " diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc index d0f208b..e50d9cb 100644 --- a/conf/machine/include/intel-common-pkgarch.inc +++ b/conf/machine/include/intel-common-pkgarch.inc @@ -1,15 +1,15 @@ INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common" -PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_ARCH:pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}" +PACKAGE_EXTRA_ARCHS:append += "${INTEL_COMMON_PACKAGE_ARCH}" MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:" diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 19f7857..db7c9c8 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -14,8 +14,8 @@ PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib" PREFERRED_VERSION_linux-intel ?= "5.10%" PREFERRED_VERSION_linux-intel-rt ?= "5.10%" -PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" -PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" +PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.4%" +PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.4%" # Need to point to latest version of libva needed for media components PREFERRED_PROVIDER_libva = "libva-intel" @@ -35,20 +35,20 @@ XSERVER_X86_ASPEED_AST = "xf86-video-ast \ " # include the user space intel microcode loading support in the generated images. -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" # recommended extra packages common to all intel machines -MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kernel-module-i915 linux-firmware-i915" +MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915" # for the early boot time kernel microcode loading support, # merge the microcode data in the final initrd image. -INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" +INITRD_LIVE:prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" EFI_PROVIDER ?= "systemd-boot" -EFI_PROVIDER_x86-x32 = "grub-efi" +EFI_PROVIDER:x86-x32 = "grub-efi" # Add general MACHINEOVERRIDE for meta-intel MACHINEOVERRIDES =. "intel-x86-common:" diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc index 4882600..2974012 100644 --- a/conf/machine/include/tune-skylake.inc +++ b/conf/machine/include/tune-skylake.inc @@ -17,15 +17,15 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylak # Extra tune selections AVAILTUNES += "skylake-64" -TUNE_FEATURES_tune-skylake-64 = "${TUNE_FEATURES_tune-x86-64} skylake" -BASE_LIB_tune-skylake-64 = "lib64" -TUNE_PKGARCH_tune-skylake-64 = "skylake-64" -PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} skylake-64" +TUNE_FEATURES:tune-skylake-64 = "${TUNE_FEATURES:tune-x86-64} skylake" +BASE_LIB:tune-skylake-64 = "lib64" +TUNE_PKGARCH:tune-skylake-64 = "skylake-64" +PACKAGE_EXTRA_ARCHS:tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} skylake-64" QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client" # Disable QEMU usermode by default (get avx2) -MACHINE_FEATURES_remove = "qemu-usermode" +MACHINE_FEATURES:remove = "qemu-usermode" # If qemu-usermode is enabled, we have to disable avx2 ISA extensions, but we can keep mtune as skylake vs generic SKYLAKE_TUNE .= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', ' -mtune=skylake ${QEMU_UNAVAILABLE_ISA}', '-mtune=generic -mavx2', d)}" diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 36cd9fa..5b134dc 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -29,4 +29,4 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" -WKS_FILE_DEPENDS_append = " intel-microcode" +WKS_FILE_DEPENDS:append = " intel-microcode" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 7b94344..719661a 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES += "intel-ucode" MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi" # Enable optional dpdk: -COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64" +COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64" XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ @@ -32,4 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" -WKS_FILE_DEPENDS_append = " intel-microcode" +WKS_FILE_DEPENDS:append = " intel-microcode" diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index eccd59b..f1c4f5b 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES += "intel-ucode" MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk gstreamer1.0-vaapi" -COMPATIBLE_MACHINE_pn-dpdk = "intel-skylake-64" +COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64" XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ @@ -32,4 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" -WKS_FILE_DEPENDS_append = " intel-microcode" +WKS_FILE_DEPENDS:append = " intel-microcode" 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 ebc33d2..c24c644 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 5355140..de7e847 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 20bdecf..a09343b 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 d0078f3..73a9873 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 582db55..d546dc2 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 4928eb2..c870b90 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 0c5d050..e0b12d1 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 06dc44d..544f7e3 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 3c0cc26..3ac2c8c 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" diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2021.3.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2021.3.bb index 697c857..aef4760 100644 --- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2021.3.bb +++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2021.3.bb @@ -21,7 +21,7 @@ do_install() { cp -r model-optimizer ${D}${datadir}/openvino/ } -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-numpy \ python3-protobuf \ python3-defusedxml \ @@ -30,4 +30,4 @@ RDEPENDS_${PN} += " \ bash \ " -FILES_${PN} += "${datadir}/openvino" +FILES:${PN} += "${datadir}/openvino" diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb index 8650102..8ff8c88 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" inherit cmake systemd features_check @@ -23,24 +23,24 @@ PACKAGECONFIG[networkmanager] = "-DNETWORK_NM=ON, -DNETWORK_NM=OFF, networkmanag REQUIRED_DISTRO_FEATURES= "systemd" -FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" +FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "lms.service" +SYSTEMD_SERVICE:${PN} = "lms.service" SRC_URI = "git://github.com/intel/lms.git \ " SRCREV = "e0ebda9d1e7884b51293b71c1bcda511a7942e1a" -do_install_append() { +do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/udev/rules.d install -m 0644 ${S}/UNS/linux_scripts/70-mei-wdt.rules ${D}${sysconfdir}/udev/rules.d/70-mei-wdt.rules } -RDEPENDS_${PN} += "ace" +RDEPENDS:${PN} += "ace" # This CVE is for Lan Management System software and not this lms. CVE_CHECK_WHITELIST += "CVE-2018-1000535" diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb index efad2fe..906b85a 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb @@ -20,7 +20,7 @@ inherit pkgconfig autotools systemd gtk-doc # gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails # to copy becuase there is no m4 dir yet. -do_configure_prepend () { +do_configure:prepend () { mkdir -p ${S}/m4 } @@ -28,13 +28,13 @@ EXTRA_OECONF = " \ --with-systemdsystemunitdir=${systemd_system_unitdir} \ " -FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" +FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" -SYSTEMD_SERVICE_${PN} = "thermald.service" +SYSTEMD_SERVICE:${PN} = "thermald.service" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -CONFFILES_${PN} = " \ +CONFFILES:${PN} = " \ ${sysconfdir}/thermald/thermal-conf.xml \ ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \ " diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb index 9ab0804..2238746 100644 --- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb @@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+))$" PACKAGES =+ "${PN}-headers ${PN}-samples ${PN}-loader" -do_install_append () { +do_install:append () { install -d ${D}${bindir} ${D}${libdir} install -m 755 ${B}/bin/zello* ${D}${bindir} @@ -22,10 +22,10 @@ do_install_append () { } -FILES_${PN}-headers = "${includedir}" -FILES_${PN}-samples = "${bindir} ${libdir}/libze_null* ${libdir}/libze_validation*" -FILES_${PN}-loader = "${libdir}" +FILES:${PN}-headers = "${includedir}" +FILES:${PN}-samples = "${bindir} ${libdir}/libze_null* ${libdir}/libze_validation*" +FILES:${PN}-loader = "${libdir}" # PN-loader (non -dev/-dbg/nativesdk- package) contains symlink .so -INSANE_SKIP_${PN}-loader = "dev-so" -INSANE_SKIP_${PN}-samples = "dev-so" +INSANE_SKIP:${PN}-loader = "dev-so" +INSANE_SKIP:${PN}-samples = "dev-so" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb index 82c4bbe..b2c5a03 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb @@ -31,6 +31,6 @@ EXTRA_OECMAKE += " \ -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ " PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "\ +FILES:${PN}-examples = "\ ${bindir} \ " diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb index 7b8544b..b2f4f7c 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb @@ -25,6 +25,6 @@ EXTRA_OECMAKE += " \ -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ " PACKAGES =+ "${PN}-apps" -FILES_${PN}-apps = "\ +FILES:${PN}-apps = "\ ${bindir} \ " diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb index e84d105..0e29c44 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb @@ -32,7 +32,7 @@ DEPENDS = "ndctl" EXTRA_OECMAKE = "-DRELEASE=ON" -do_configure_prepend() { +do_configure:prepend() { for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do ln -sf edk2/${dir} ${S} done diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb index 700f78c..1461afe 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb @@ -21,7 +21,7 @@ OECMAKE_SOURCEPATH = "${S}/demos" DEPENDS += "openvino-inference-engine opencv gflags" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-decorator \ python3-defusedxml \ python3-networkx \ @@ -46,7 +46,7 @@ EXTRA_OECMAKE += " \ -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ " -do_configure_prepend(){ +do_configure:prepend(){ mkdir -p ${WORKDIR}/InferenceEngine/share cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ } @@ -63,4 +63,4 @@ do_install(){ cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools } -FILES_${PN} += "${datadir}/openvino" +FILES:${PN} += "${datadir}/openvino" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb index 19da3e1..654cac1 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb @@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -LICENSE_${PN}-vpu-firmware = "ISSL" +LICENSE:${PN}-vpu-firmware = "ISSL" inherit cmake python3native @@ -64,7 +64,7 @@ DEPENDS += "libusb1 \ " COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" #Disable opencl temporarily. intel-compute-runtime depends on #intel-graphics-compiler and vc-intrinsics and these two recipes fail to @@ -76,7 +76,7 @@ PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ @@ -102,13 +102,13 @@ do_install_append() { # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR # instead of RSS -SSTATE_SCAN_FILES_append = " *.cmake" +SSTATE_SCAN_FILES:append = " *.cmake" -FILES_${PN}-dev = "${includedir} \ +FILES:${PN}-dev = "${includedir} \ ${libdir}/cmake \ " -FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ +FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ ${datadir}/openvino \ ${libdir}/custom_kernels \ ${libdir}/plugins.xml \ @@ -118,12 +118,12 @@ FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ # Move inference engine samples into a separate package PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" -FILES_${PN}-samples = "${datadir}/inference_engine \ +FILES:${PN}-samples = "${datadir}/inference_engine \ ${bindir} \ " -FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" +FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" # Package for inference engine python API PACKAGES =+ "${PN}-${PYTHON_PN}" -FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" +FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend index 6dd422a..d21c3be 100644 --- a/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/${PN}:" diff --git a/recipes-core/images/core-image-minimal-initramfs.bbappend b/recipes-core/images/core-image-minimal-initramfs.bbappend index 132f15b..90ac28f 100644 --- a/recipes-core/images/core-image-minimal-initramfs.bbappend +++ b/recipes-core/images/core-image-minimal-initramfs.bbappend @@ -1,2 +1,2 @@ # Add i915 graphics firmware -PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915" +PACKAGE_INSTALL:append:intel-x86-common = " linux-firmware-i915" diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb index fcd14bd..33d7d80 100644 --- a/recipes-core/libxcam/libxcam_1.5.0.bb +++ b/recipes-core/libxcam/libxcam_1.5.0.bb @@ -11,7 +11,7 @@ SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8" SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0; \ " -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" PACKAGECONFIG ??= " gst \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \ @@ -27,12 +27,12 @@ PACKAGECONFIG[gles] = "--enable-gles, --disable-gles, virtual/mesa" PACKAGECONFIG[vulkan] = "--enable-vulkan, --disable-vulkan, vulkan-loader virtual/mesa" PACKAGECONFIG[dnn] = "--enable-dnn, --disable-dnn," -do_install_append () { +do_install:append () { install -d ${D}${bindir}/libxcam cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ } -FILES_${PN} += "${libdir}/gstreamer-*/*.so" -FILES_${PN}-test = "${bindir}/libxcam/*" +FILES:${PN} += "${libdir}/gstreamer-*/*.so" +FILES:${PN}-test = "${bindir}/libxcam/*" PACKAGES =+ "${PN}-test" -RDEPENDS_${PN}-test =+ "bash" +RDEPENDS:${PN}-test =+ "bash" diff --git a/recipes-core/microcode/intel-microcode_20210608.bb b/recipes-core/microcode/intel-microcode_20210608.bb index 8a53421..0487b21 100644 --- a/recipes-core/microcode/intel-microcode_20210608.bb +++ b/recipes-core/microcode/intel-microcode_20210608.bb @@ -63,6 +63,6 @@ addtask deploy before do_build after do_compile PACKAGES = "${PN}" -FILES_${PN} = "${nonarch_base_libdir}" +FILES:${PN} = "${nonarch_base_libdir}" UPSTREAM_CHECK_GITTAGREGEX = "^microcode-(?P(\d+)[a-z]*)$" diff --git a/recipes-core/microcode/iucode-tool_2.3.1.bb b/recipes-core/microcode/iucode-tool_2.3.1.bb index df74a8e..1d45f9a 100644 --- a/recipes-core/microcode/iucode-tool_2.3.1.bb +++ b/recipes-core/microcode/iucode-tool_2.3.1.bb @@ -16,10 +16,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://iucode_tool.c;beginline=1;endline=15;md5=71eeab3190360ff0267101b570874756" -DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS:append:libc-musl = " argp-standalone" SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz" -SRC_URI_append_libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" +SRC_URI:append:libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" SRC_URI[md5sum] = "63b33cc0ea1f8c73b443412abbf39d6f" SRC_URI[sha256sum] = "12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95" diff --git a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb index b20f6e5..ca3cfc1 100644 --- a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb +++ b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb @@ -1,10 +1,10 @@ require recipes-core/ovmf/ovmf-shell-image.bb -WKS_SEARCH_PATH_append = ":${COREBASE}/meta/recipes-core/ovmf" +WKS_SEARCH_PATH:append = ":${COREBASE}/meta/recipes-core/ovmf" QB_DRIVE_TYPE = "/dev/vd" -do_image_append() { +do_image:append() { cat > ${IMAGE_ROOTFS}/startup.nsh << EOF EnrollDefaultKeys reset diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend index bbf5fa3..34a9dd1 100644 --- a/recipes-core/ovmf/ovmf_%.bbappend +++ b/recipes-core/ovmf/ovmf_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:" -SRC_URI_append_intel-x86-common = " \ +SRC_URI:append:intel-x86-common = " \ file://0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch \ " -PACKAGECONFIG_append_intel-x86-common = " secureboot" +PACKAGECONFIG:append:intel-x86-common = " secureboot" diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb index 65303bf..617369f 100644 --- a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb +++ b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb @@ -1,18 +1,18 @@ require recipes-core/zlib/zlib_1.2.11.bb -FILESEXTRAPATHS_append = ":${COREBASE}/meta/recipes-core/zlib/zlib" +FILESEXTRAPATHS:append = ":${COREBASE}/meta/recipes-core/zlib/zlib" SUMMARY = "Zlib Compression Library (Intel-tuned)" PROVIDES = "zlib" -SRC_URI_remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI_prepend = "git://github.com/jtkukunas/zlib.git;protocol=git " +SRC_URI:remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI:prepend = "git://github.com/jtkukunas/zlib.git;protocol=git " SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010" S = "${WORKDIR}/git" -RPROVIDES_${PN} += "zlib" -RPROVIDES_${PN}-ptest += "zlib-ptest" +RPROVIDES:${PN} += "zlib" +RPROVIDES:${PN}-ptest += "zlib-ptest" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+)_jtkv(\d+(\.\d+)+))$" diff --git a/recipes-graphics/gmmlib/gmmlib_21.2.1.bb b/recipes-graphics/gmmlib/gmmlib_21.2.1.bb index 90700bc..f36e297 100644 --- a/recipes-graphics/gmmlib/gmmlib_21.2.1.bb +++ b/recipes-graphics/gmmlib/gmmlib_21.2.1.bb @@ -14,7 +14,7 @@ SRCREV = "9253eb8b949515d2a5030f99163a35567fe81838" S = "${WORKDIR}/git" -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" UPSTREAM_CHECK_GITTAGREGEX = "^intel-gmmlib-(?P(\d+(\.\d+)+))$" diff --git a/recipes-graphics/hdcp/hdcp_21.1.0.bb b/recipes-graphics/hdcp/hdcp_21.1.0.bb index 016e8e0..b336c7a 100644 --- a/recipes-graphics/hdcp/hdcp_21.1.0.bb +++ b/recipes-graphics/hdcp/hdcp_21.1.0.bb @@ -20,7 +20,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" DEPENDS = "libdrm virtual/mesa systemd" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false --gid nogroup media" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --gid nogroup media" -SYSTEMD_SERVICE_${PN} = "hdcpd.service" +SYSTEMD_SERVICE:${PN} = "hdcpd.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/recipes-graphics/libva/libva-intel-utils_2.12.0.bb b/recipes-graphics/libva/libva-intel-utils_2.12.0.bb index f083703..5eb604d 100644 --- a/recipes-graphics/libva/libva-intel-utils_2.12.0.bb +++ b/recipes-graphics/libva/libva-intel-utils_2.12.0.bb @@ -32,4 +32,4 @@ PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland" PROVIDES = "libva-utils" -RPROVIDES_${PN} += "libva-utils" +RPROVIDES:${PN} += "libva-utils" diff --git a/recipes-graphics/libva/libva-intel_2.12.0.bb b/recipes-graphics/libva/libva-intel_2.12.0.bb index 15a9391..4e48496 100644 --- a/recipes-graphics/libva/libva-intel_2.12.0.bb +++ b/recipes-graphics/libva/libva-intel_2.12.0.bb @@ -40,15 +40,15 @@ PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wa PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland" -RDEPENDS_${PN}-x11 =+ "${PN}" -RDEPENDS_${PN}-glx =+ "${PN}-x11" +RDEPENDS:${PN}-x11 =+ "${PN}" +RDEPENDS:${PN}-glx =+ "${PN}-x11" -FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" -FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" -FILES_${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}" +FILES:${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" +FILES:${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" +FILES:${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}" PROVIDES += "libva" -RPROVIDES_${PN} += "libva" -RPROVIDES_${PN}-x11 += "libva-x11" -RPROVIDES_${PN}-glx += "libva-glx" -RPROVIDES_${PN}-wayland += "libva-wayland" +RPROVIDES:${PN} += "libva" +RPROVIDES:${PN}-x11 += "libva-x11" +RPROVIDES:${PN}-glx += "libva-glx" +RPROVIDES:${PN}-wayland += "libva-wayland" diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.11.3.bb b/recipes-kernel/intel-ethernet/ixgbe_5.11.3.bb index 8c7fb09..2845abe 100644 --- a/recipes-kernel/intel-ethernet/ixgbe_5.11.3.bb +++ b/recipes-kernel/intel-ethernet/ixgbe_5.11.3.bb @@ -21,12 +21,12 @@ S = "${WORKDIR}/${BP}/src" EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' -KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbe" -KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe" +KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbe" +KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbe" inherit module -do_install_append () { +do_install:append () { # Install scripts/set_irq_affinity install -d ${D}${sysconfdir}/network install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network @@ -36,7 +36,7 @@ do_install_append () { PACKAGES += "${PN}-script" -FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" +FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" EXCLUDE_FROM_WORLD = "1" diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.11.1.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.11.1.bb index 2867269..2fa23a6 100644 --- a/recipes-kernel/intel-ethernet/ixgbevf_4.11.1.bb +++ b/recipes-kernel/intel-ethernet/ixgbevf_4.11.1.bb @@ -24,12 +24,12 @@ S = "${WORKDIR}/${BP}/src" EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' -KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf" -KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf" +KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbevf" +KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbevf" inherit module -do_install_append () { +do_install:append () { # Install scripts/set_irq_affinity install -d ${D}${sysconfdir}/network install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network @@ -39,7 +39,7 @@ do_install_append () { PACKAGES += "${PN}-script" -FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" +FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" # This was fixed in kernel v4.4 CVE_CHECK_WHITELIST += "CVE-2015-1142857" diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb index 9eb0a45..a06a8e2 100644 --- a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb +++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb @@ -36,16 +36,16 @@ do_configure() { MODULES_INSTALL_TARGET="install" -do_install_append() { +do_install:append() { ## install configs and service scripts install -d ${D}${sysconfdir}/modprobe.d install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d } -RDEPENDS_${PN} = "linux-firmware-iwlwifi" +RDEPENDS:${PN} = "linux-firmware-iwlwifi" -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi" KERNEL_MODULE_PACKAGE_PREFIX = "backport-iwlwifi" diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb index 9cabe7b..41f327b 100644 --- a/recipes-kernel/linux/linux-intel-dev.bb +++ b/recipes-kernel/linux/linux-intel-dev.bb @@ -1,14 +1,14 @@ require recipes-kernel/linux/linux-yocto.inc require recipes-kernel/linux/meta-intel-compat-kernel.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:" SRC_URI = " \ git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " -SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" +SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" @@ -29,6 +29,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}" COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" # Functionality flags -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" diff --git a/recipes-kernel/linux/linux-intel-rt_5.10.bb b/recipes-kernel/linux/linux-intel-rt_5.10.bb index 361b5df..b073abd 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.10.bb +++ b/recipes-kernel/linux/linux-intel-rt_5.10.bb @@ -10,7 +10,7 @@ python () { } LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ +SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " KBRANCH = "5.10/preempt-rt" diff --git a/recipes-kernel/linux/linux-intel-rt_5.4.bb b/recipes-kernel/linux/linux-intel-rt_5.4.bb index 4319954..2669ac7 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.4.bb +++ b/recipes-kernel/linux/linux-intel-rt_5.4.bb @@ -10,7 +10,7 @@ python () { } LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ +SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " KBRANCH = "5.4/preempt-rt" diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index c616397..70a7e7d 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -1,7 +1,7 @@ require recipes-kernel/linux/linux-yocto.inc require recipes-kernel/linux/meta-intel-compat-kernel.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:" KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}" @@ -10,8 +10,8 @@ SRC_URI = " \ ${KERNEL_CONFIG_URI} \ " -SRC_URI_append = " file://enable_lynxpoint_gpio.cfg" -SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" +SRC_URI:append = " file://enable_lynxpoint_gpio.cfg" +SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg" LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" @@ -22,5 +22,5 @@ KCONF_BSP_AUDIT_LEVEL = "2" COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/recipes-kernel/linux/linux-intel_5.10.bb b/recipes-kernel/linux/linux-intel_5.10.bb index dae4118..8ddac04 100644 --- a/recipes-kernel/linux/linux-intel_5.10.bb +++ b/recipes-kernel/linux/linux-intel_5.10.bb @@ -5,7 +5,7 @@ KMETA_BRANCH = "yocto-5.10" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ +SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " DEPENDS += "elfutils-native openssl-native util-linux-native" @@ -15,8 +15,8 @@ SRCREV_machine ?= "916ac934a98bc8206c1b5e1500c891dbcb43aac7" SRCREV_meta ?= "cd049697e9b2d3e9118110d476075ff8f87202cc" # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" @@ -29,4 +29,4 @@ KCONF_BSP_AUDIT_LEVEL = "0" # Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which # causes config warning too. -KCONF_AUDIT_LEVEL_core2-32-intel-common = "0" +KCONF_AUDIT_LEVEL:core2-32-intel-common = "0" diff --git a/recipes-kernel/linux/linux-intel_5.4.bb b/recipes-kernel/linux/linux-intel_5.4.bb index 5886d8b..30d969a 100644 --- a/recipes-kernel/linux/linux-intel_5.4.bb +++ b/recipes-kernel/linux/linux-intel_5.4.bb @@ -5,7 +5,7 @@ KMETA_BRANCH = "yocto-5.4" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" +SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" DEPENDS += "elfutils-native openssl-native util-linux-native" @@ -14,8 +14,8 @@ SRCREV_machine ?= "7a821854911e315d3ed3fe2fc626e12906c9ab24" SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825" # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 6173148..deb1994 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -KMACHINE_core2-32-intel-common = "intel-core2-32" -KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" +COMPATIBLE_MACHINE:core2-32-intel-common = "${MACHINE}" +KMACHINE:core2-32-intel-common = "intel-core2-32" +KERNEL_FEATURES:append:core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" -COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -KMACHINE_corei7-64-intel-common = "intel-corei7-64" -KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" +COMPATIBLE_MACHINE:corei7-64-intel-common = "${MACHINE}" +KMACHINE:corei7-64-intel-common = "intel-corei7-64" +KERNEL_FEATURES:append:corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV # and setting them here breaks the default mechanism to use AUTOREV if the # default SRCREV is set and linux-yocto-dev is the preferred provider. # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio" # For FRI2, NUC -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 7c29be1..7657b02 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,4 +1,4 @@ # The kernel build is 64-bit regardless, so include both common overrides. # Without this, the kernel will be missing vars that make it buildable for the # intel-corei7-64 machine. -MACHINEOVERRIDES_prepend_corei7-64-x32-intel-common = "corei7-64-intel-common:" +MACHINEOVERRIDES:prepend:corei7-64-x32-intel-common = "corei7-64-intel-common:" diff --git a/recipes-multimedia/itt/itt_3.18.13.bb b/recipes-multimedia/itt/itt_3.18.13.bb index d134c01..352d116 100644 --- a/recipes-multimedia/itt/itt_3.18.13.bb +++ b/recipes-multimedia/itt/itt_3.18.13.bb @@ -34,4 +34,4 @@ do_install() { } -RDEPENDS_${PN}-dev_remove = "${PN} (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev:remove = "${PN} (= ${EXTENDPKGV})" diff --git a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb b/recipes-multimedia/libva/intel-media-driver_21.2.3.bb index e955f15..fed5212 100644 --- a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb +++ b/recipes-multimedia/libva/intel-media-driver_21.2.3.bb @@ -26,14 +26,14 @@ SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" S = "${WORKDIR}/git" -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P(?!600\..*)\d+(\.\d+)+)$" inherit cmake pkgconfig -MEDIA_DRIVER_ARCH_x86 = "32" -MEDIA_DRIVER_ARCH_x86-64 = "64" +MEDIA_DRIVER_ARCH:x86 = "32" +MEDIA_DRIVER_ARCH:x86-64 = "64" EXTRA_OECMAKE += " \ -DMEDIA_RUN_TEST_SUITE=OFF \ @@ -41,12 +41,12 @@ EXTRA_OECMAKE += " \ -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ " -CXXFLAGS_append_x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -do_configure_prepend_toolchain-clang() { +do_configure:prepend:toolchain-clang() { sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/dri/ \ " diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb index ccb9fec..5038d8d 100644 --- a/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb +++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb @@ -29,6 +29,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no" PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl" -FILES_${PN} += "${libdir}/dri/*.so" -FILES_${PN}-dev += "${libdir}/dri/*.la" -FILES_${PN}-dbg += "${libdir}/dri/.debug" +FILES:${PN} += "${libdir}/dri/*.so" +FILES:${PN}-dev += "${libdir}/dri/*.la" +FILES:${PN}-dbg += "${libdir}/dri/.debug" diff --git a/recipes-multimedia/libyami/libyami_1.3.2.bb b/recipes-multimedia/libyami/libyami_1.3.2.bb index c862814..1eff8c9 100644 --- a/recipes-multimedia/libyami/libyami_1.3.2.bb +++ b/recipes-multimedia/libyami/libyami_1.3.2.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/intel/libyami.git;branch=apache \ SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715" S = "${WORKDIR}/git" -CXXFLAGS_append = " -Wno-error" +CXXFLAGS:append = " -Wno-error" PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb index 75faad3..acdc83e 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb @@ -12,7 +12,7 @@ CVE_DETAILS = "intel:media_sdk" # Only for 64 bit until media-driver issues aren't fixed COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" @@ -44,17 +44,17 @@ inherit cmake pkgconfig EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include" -do_install_append() { +do_install:append() { mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples } PACKAGE_BEFORE_PN = " ${PN}-samples" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/mfx \ ${datadir}/mfx/plugins.cfg \ " -FILES_${PN}-samples = "${libdir}/mfx/samples" +FILES:${PN}-samples = "${libdir}/mfx/samples" -INSANE_SKIP_${PN}-samples += "staticdev" +INSANE_SKIP:${PN}-samples += "staticdev" diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb index 2129358..cf63f84 100644 --- a/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb +++ b/recipes-multimedia/onevpl/onevpl-intel-gpu_21.3.0.bb @@ -12,7 +12,7 @@ PE = "1" # Only for 64 bit COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" DEPENDS += "libdrm libva intel-media-driver onevpl" diff --git a/recipes-multimedia/onevpl/onevpl_2021.4.0.bb b/recipes-multimedia/onevpl/onevpl_2021.4.0.bb index cefa38b..cdd22a3 100644 --- a/recipes-multimedia/onevpl/onevpl_2021.4.0.bb +++ b/recipes-multimedia/onevpl/onevpl_2021.4.0.bb @@ -24,12 +24,12 @@ COMPATIBLE_HOST = '(x86_64).*-linux' PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${datadir}/oneVPL/examples \ +FILES:${PN}-examples = "${datadir}/oneVPL/examples \ " FILES_SOLIBSDEV = "" -FILES_${PN}-dev += "${libdir}/libvpl.so" +FILES:${PN}-dev += "${libdir}/libvpl.so" -FILES_${PN} += "${datadir} \ +FILES:${PN} += "${datadir} \ ${libdir}/libvpl_wayland.so \ " diff --git a/recipes-selftest/images/secureboot-selftest-image-unsigned.bb b/recipes-selftest/images/secureboot-selftest-image-unsigned.bb index e03e7b4..d0fa640 100644 --- a/recipes-selftest/images/secureboot-selftest-image-unsigned.bb +++ b/recipes-selftest/images/secureboot-selftest-image-unsigned.bb @@ -1,12 +1,12 @@ require recipes-core/images/core-image-minimal.bb -DEPENDS_remove = "grub-efi" +DEPENDS:remove = "grub-efi" inherit uefi-comboapp WKS_FILE = "generic-bootdisk.wks.in" -do_uefiapp_deploy_append() { +do_uefiapp_deploy:append() { for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi; do target=`basename $i` target=`echo $target | sed -e 's/${IMAGE_LINK_NAME}.//'` diff --git a/recipes-support/jhi/jhi_1.41.bb b/recipes-support/jhi/jhi_1.41.bb index badb928..d8b807c 100644 --- a/recipes-support/jhi/jhi_1.41.bb +++ b/recipes-support/jhi/jhi_1.41.bb @@ -14,20 +14,20 @@ S = "${WORKDIR}/git" DEPENDS += "util-linux libxml2" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false -g mei jhi" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false -g mei jhi" -GROUPADD_PARAM_${PN} = "-g 880 mei" +GROUPADD_PARAM:${PN} = "-g 880 mei" -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' -SYSTEMD_SERVICE_${PN} = "jhi.service" +SYSTEMD_SERVICE:${PN} = "jhi.service" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "${PN}" -INITSCRIPT_PARAMS_${PN} = "defaults" +INITSCRIPT_NAME:${PN} = "${PN}" +INITSCRIPT_PARAMS:${PN} = "defaults" # systemd is the default so they are installed when sysvinit is not selected as INIT_SYSTEM EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \ @@ -36,7 +36,7 @@ EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \ -DAPP_REPO_DIR=${localstatedir}/cache/dal/applet_repository \ " -do_install_append () { +do_install:append () { install -d ${D}${localstatedir}/cache/dal/applet_repository chown -R jhi ${D}${localstatedir}/cache/dal/applet_repository @@ -52,9 +52,9 @@ do_install_append () { PACKAGES += "${PN}-test" -FILES_${PN}-dev = "" +FILES:${PN}-dev = "" -FILES_${PN} = "\ +FILES:${PN} = "\ ${sbindir} \ ${sysconfdir} \ ${libdir}/lib*${SOLIBSDEV} \ @@ -64,7 +64,7 @@ FILES_${PN} = "\ ${localstatedir}/cache/dal/applet_repository \ " -FILES_${PN}-test = "\ +FILES:${PN}-test = "\ ${bindir} \ ${libdir}/dal/applets \ " diff --git a/recipes-support/libipt/libipt_2.0.4.bb b/recipes-support/libipt/libipt_2.0.4.bb index a0554f4..6d59654 100644 --- a/recipes-support/libipt/libipt_2.0.4.bb +++ b/recipes-support/libipt/libipt_2.0.4.bb @@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \ -DCMAKE_SKIP_RPATH=ON \ " -do_install_append() { +do_install:append() { install -d ${D}${bindir}/libipt install -d ${D}${bindir}/libipt/tests @@ -29,5 +29,5 @@ do_install_append() { cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests } -FILES_${PN}-test = "${bindir}" +FILES:${PN}-test = "${bindir}" PACKAGES =+ "${PN}-test" diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb index f6094a5..1db7756 100644 --- a/recipes-support/sbsigntool/sbsigntool-native_git.bb +++ b/recipes-support/sbsigntool/sbsigntool-native_git.bb @@ -37,7 +37,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig inherit native -do_configure_prepend() { +do_configure:prepend() { cd ${S} sed -i s#RECIPE_SYSROOT#${RECIPE_SYSROOT_NATIVE}#g configure.ac -- cgit v0.10.2-6-g49f6