recipes: Update to match S/UNPACKDIR changes

Update to match the recent changes in OE-Core where the unpack layout changed. [https://patchwork.yoctoproject.org/project/oe-core/patch/20250616095000.2918921-1-alex.kanavin@gmail.com/] Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
layer.conf: Add the new release layer series
2025-07-05 05:04:45 +02:00 · 2025-07-04 17:49:37 +08:00 · 2025-06-24 13:00:05 +08:00 · 2025-05-28 17:50:58 +08:00 · 2025-05-28 13:05:16 +08:00 · 2025-05-26 10:29:19 +08:00
191 changed files with 2526 additions and 5999 deletions
--- a/87
+++ b/87
@ -1,87 +0,0 @@
-This file will only list major changes that occur within a release.
-For a full list of changes, view the git log of the repository.
-
-Rocko Release 11/2017
-=====================
-
-Moved qat support to separate layer
-----------------------------------
-Quick Assist Technology (QAT) is more middleware and should not be part of the
-core BSP. The new layer can be found here:
-https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-qat/
-
-Moved dpdk support to separate layer
------------------------------------
-We had some requests to make DPDK standalone so that it could be included
-without bringing in anything else from meta-intel, as it is not specific to
-Intel(R) hardware. The new layer is located here:
-https://git.yoctoproject.org/cgit/cgit.cgi/meta-dpdk/
-
-Added support for out-of-tree iwlwifi drivers
---------------------------------------------
-Backport-iwlwifi out-of-tree wifi modules are now available via meta-intel.
-Backport-iwlwifi brings the latest iwlwifi drivers to almost any kernel
-Note that mac80211 and cfg80211 backports are also necessary, which will most
-likely cause incompatibility with other in-tree wifi drivers.
-See https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi for more info.
-
-Added support for out-of-tree ixgbe drivers
-------------------------------------------
-The out-of-tree ixgbe drivers bring ixgbe support to nearly any kernel. See
-here: http://www.intel.com/network/connectivity/products/server_adapters.htm
-
-Added an implementation of Secure Boot
--------------------------------------
-meta-intel now supports a simple Secure Boot implementation. This implementation
-consists of a single binary consisting of an EFI stub, the kernel, an
-initrd, and a kernel command line. The binary is then signed via keys defined by
-the variables SECUREBOOT_SIGNING_KEY and SECUREBOOT_SIGNING_CERT. These keys
-should match the keys embedded in your hardware's firmware.
-See documentation/secureboot/README for more information on this feature.
-
-Improved Yocto Project Compatibility status
-------------------------------------------
-The common layer should now be considered Yocto Project compatible - it should
-no longer modify OE-core values when adding the layer to your bblayers.conf.
-The meta-tlk layer is still not Yocto Project compatible, however.
-
-Pyro Release 5/2017
-===================
-
-Changed default kernel provider from linux-yocto to linux-intel.
----------------------------------------------------------------
-Linux-intel is an Intel(R)-maintained kernel based on the latest stable
-branch, along with backports from upstream to better support Intel(R)
-hardware. The intel-linux kernel also has a branch with the preempt-rt
-patches applied, providing a preempt-rt kernel with no additional work.
-
-Added QEMU support.
-------------------
-We now build several virtio drivers into the kernel by default, and
-have qemuboot.conf files for intel-corei7-64 and intel-core2-32
-targets. This allows one to do basic testing on meta-intel images
-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”
-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:
-  runqemu core-image-minimal intel-corei7-64 wic ovmf
-
-Musl support
------------
-Meta-intel is now compatible with the musl C library. You can specify musl
-As your C library by adding the following to your local.conf:
-  TCLIBC = “musl”
-Note: there is a known failure with DPDK.
-
-X32 support
-----------
-The meta-intel layer can now build with the x32 tune settings in a multi-lib
-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"
--- a/32
+++ b/32
@ -1,32 +0,0 @@
-This file contains a list of BSP maintainers for the BSPs contained in
-the meta-intel repository.
-
-The purpose of this file is to provide contact information for
-specific BSPs and other code contained within meta-intel.  You should
-address questions and patches for a particular BSP or other code to
-the appropriate maintainer listed in this file, cc'ing the meta-intel
-mailing list.  This ensures that your question or patch will be
-addressed by the appropriate person, and that it will be seen by other
-users who may be facing similar problems or questions.
-
-Please see the top-level README file for guidelines relating to the
-details of submitting patches, reporting problems, or asking questions
-about any of the BSPs or other recipes contained within meta-intel.
-
-Descriptions of section entries:
-
-	M: Mail patches to: FullName <address@domain>
-	F: Files and directories with wildcard patterns.
-	   A trailing slash includes all files and subdirectory files.
-	   F:	common/	 all files in and below common
-	   F:	common/* all files in common, but not below
-	   One pattern per line.  Multiple F: lines acceptable.
-
-Please keep this list in alphabetical order.
-
-Maintainers List (try to look for most precise areas first)
-
-		-----------------------------------
-
-M:	Anuj Mittal <anuj.mittal@intel.com>
-F:	*
--- a/459
+++ b/459
@ -1,459 +0,0 @@
-meta-intel
-==========
-
-This README file contains information on building and booting
-meta-intel BSP layers.  Please see the corresponding sections below
-for details.
-
-
-Yocto Project Compatible
-========================
-
-The BSPs contained in this layer are compatible with the Yocto Project
-as per the requirements listed here:
-
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-
-
-Dependencies
-============
-
-This layer depends on:
-
-  URI: git://git.openembedded.org/bitbake
-
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-
-
-Table of Contents
-=================
-
-  I. Overview
-  II. Building and booting meta-intel BSP layers
-     a. Building the intel-common BSP layers
-     b. Booting the intel-common BSP images
-     c. Building the installer image
-  III. Technical Miscellany
-     Benefits of using meta-intel
-     The intel-common kernel package architecture
-     Intel-specific machine features
-  IV. Tested Hardware
-  V.  Guidelines for submitting patches
-
-
-I. Overview
-===========
-
-This is the location for Intel-maintained BSPs.
-
-For details on the intel-common, see the information below.
-
-For all others, please see the README files contained in the
-individual BSP layers for BSP-specific information.
-
-If you have problems with or questions about a particular BSP, please
-contact the maintainer listed in the MAINTAINERS file directly (cc:ing
-the Yocto mailing list puts it in the archive and helps other people
-who might have the same questions in the future), but please try to do
-the following first:
-
-  - look in the Yocto Project Bugzilla
-    (http://bugzilla.yoctoproject.org/) to see if a problem has
-    already been reported
-
-  - look through recent entries of the meta-intel
-    (https://lists.yoctoproject.org/pipermail/meta-intel/) and Yocto
-    (https://lists.yoctoproject.org/pipermail/yocto/) mailing list
-    archives to see if other people have run into similar problems or
-    had similar questions answered.
-
-If you believe you have encountered a bug, you can open a new bug and
-enter the details in the Yocto Project Bugzilla
-(http://bugzilla.yoctoproject.org/).  If you're relatively certain
-that it's a bug against the BSP itself, please use the 'Yocto Project
-Components: BSPs | meta-intel' category for the bug; otherwise, please
-submit the bug against the most likely category for the problem - if
-you're wrong, it's not a big deal and the bug will be recategorized
-upon triage.
-
-
-II. Building and booting meta-intel BSP layers
-==============================================
-
-The following sections contain information on building and booting the
-BSPs contained in the meta-intel layer.
-
-Note that these instructions specifically cover the intel-common, which
-may or may not be applicable to other BSPs contained in this layer - if
-a given BSP contains its own README, that version should be used instead,
-and these instructions can be ignored.
-
-a. Building the intel-common BSP layers
-------------------------------------------------
-
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website (or
-equivalently, check out the appropriate branch from the meta-intel git
-repository, see below).  For the intel-common BSPs, those tarballs would
-correspond to the following choices in the BSP downloads section:
-
- - Intel-core2-32 Intel® Common Core BSP (Intel-core2-32)
- - Intel-corei7-64 Intel® Common Core BSP (Intel-corei7-64)
-
-The intel-* BSPs, also known as the intel-common BSPs, provide a few
-carefully selected tune options and generic hardware support to cover
-the majority of current Intel CPUs and devices. The naming follows the
-convention of intel-<TUNE>-<BITS>, where TUNE is the gcc cpu-type
-(used with mtune and march typically) and BITS is either 32 bit or 64
-bit.
-
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a BSP image
-by adding the location of the meta-intel layer to bblayers.conf e.g.:
-
-  yocto/meta-intel \
-
-To enable a particular machine, you need to add a MACHINE line naming
-the BSP to the local.conf file:
-
-  MACHINE ?= "xxx"
-
-where 'xxx' is replaced by one of the following BSP names:
-
- - intel-core2-32
-
-   This BSP is optimized for the Core2 family of CPUs as well as all
-   Atom CPUs prior to the Silvermont core.
-
- - intel-corei7-64
-
-   This BSP is optimized for Nehalem and later Core and Xeon CPUs as
-   well as Silvermont and later Atom CPUs, such as the Baytrail SoCs.
-
-You should then be able to build an image as such:
-
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-
-At the end of a successful build, you should have an image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the intel-common BSP images').
-
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting
-a BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-
-b. Booting the intel-common BSP images
--------------------------------------
-
-If you've built your own image, either from the downloaded BSP layer
-or from the meta-intel git repository, you'll find the bootable
-image in the build/tmp/deploy/images/xxx directory, where again
-'xxx' refers to the machine name used in the build.
-
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the image to it.  Before the image
-can be burned onto a USB drive, it should be un-mounted. Some Linux distros
-may automatically mount a USB drive when it is plugged in. Using USB device
-/dev/sdf as an example, find all mounted partitions:
-
-    $ mount | grep sdf
-
-and un-mount those that are mounted, for example:
-
-    $ umount /dev/sdf1
-    $ umount /dev/sdf2
-
-Now burn the image onto the USB drive:
-
-    $ sudo dd if=core-image-sato-intel-corei7-64.wic of=/dev/sdf status=progress
-    $ sync
-    $ eject /dev/sdf
-
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
-
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-
-    $ dd if=/dev/zero of=/dev/sdf bs=1M count=512
-
-c. Building the installer image
-----------------------------------------------
-
-If you plan to install your image to your target machine, you can build a wic
-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_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 = "\
-      ${KERNEL_IMAGETYPE} \
-      microcode.cpio \
-      ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext4;rootfs.img \
-      ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', 'grub-efi-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \
-      ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', '${IMAGE_ROOTFS}/boot/EFI/BOOT/grub.cfg;EFI/BOOT/grub.cfg', '', d)} \
-      ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', 'systemd-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \
-      ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/loader.conf;loader/loader.conf ', '', d)} \
-      ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/entries/boot.conf;loader/entries/boot.conf', '', d)} "
-
-Burn the wic image onto USB flash device, insert the device to target machine
-and power on. This should start the installation process.
-
-III. Technical Miscellany
-=========================
-
-Benefits of using meta-intel
----------------------------
-
-Using meta-intel has the following benefits over a generic BSP:
-
-tune flags
-++++++++++
-intel-* MACHINEs each have different compilation flags appropriate for their
-targeted hardware sets. intel-corei7-64 has tune flags appropriate for modern
-64-bit Intel Core i microarchitecture, and includes instruction sets up to
-SSE4.2. intel-core2-32 has tune flags appropriate for legacy 32-bit Intel Core2
-microarchitecture, and includes instruction sets up to SSE3.
-
-linux-intel kernel
-++++++++++++++++++
-The linux-intel kernel is an initiative to bring better Intel(R) hardware
-support to the current LTS linux kernel. It contains a base LTS kernel with
-additional backports from upstream Intel drivers. In addition, a default kernel
-config containing most features found on Intel boards is supplied via the
-yocto-kernel-cache.
-
-graphics stack
-++++++++++++++
-Meta-intel provides the latest Intel Graphics Linux Stack drivers to support
-Intel hardware as defined by the https://01.org/linuxgraphics.
-
-Other software
-++++++++++++++
-  * intel ucode - provides the latest microcode updates for Intel processors
-
-  * thermald - which proactively controls thermal, using P-states, T-states, and
-the Intel power clamp driver.
-(https://01.org/linux-thermal-daemon/documentation/introduction-thermal-daemon)
-
-The intel-common kernel package architecture
--------------------------------------------
-
-These BSPs use what we call the intel-common Linux kernel package
-architecture. This includes core2-32-intel-common and
-corei7-64-intel-common. These kernel packages can also be used by any
-of the BSPs in meta-intel that choose to include the
-intel-common-pkgarch.inc file.
-
-To minimize the proliferation of vendor trees, reduce the sources we
-must support, and consolidate QA efforts, all BSP maintainers are
-encouraged to make use of the intel-common Linux kernel package
-architecture.
-
-Intel-specific machine features
-------------------------------
-
-The meta-intel layer makes some additional machine features available
-to BSPs.  These machine features can be used in a BSP layer in the
-same way that machine features are used in other layers based on
-oe-core, via the MACHINE_FEATURES variable.
-
-Requirements
-++++++++++++
-
-The meta-intel-specific machine features are only available to a BSP
-when the meta-intel layer is included in the build configuration, and
-the meta-intel.inc file is included in the machine configuration of
-that BSP.
-
-To make these features available for your machine, you will need to:
-
-  1. include a configuration line such as the below in bblayers.conf
-       BBLAYERS += "<local path>/meta-intel"
-  2. include the following line in the machine configuration file
-       require conf/machine/include/meta-intel.inc
-
-Once the above requirements are met, the machine features provided by
-the meta-intel layer will be available for the BSP to use.
-
-Available machine features
-++++++++++++++++++++++++++
-
-Currently, the meta-intel layer makes the following set of
-Intel-specific machine features available:
-
-  * intel-ucode
-
-These machine features can be included by listing them in the
-MACHINE_FEATURES variable in the machine configuration file.  For
-example:
-
-    MACHINE_FEATURES += "intel-ucode"
-
-Machine feature details
-+++++++++++++++++++++++
-
- * intel-ucode
-
-    This feature provides support for microcode updates to Intel
-    processors.  The intel-ucode feature runs at early boot and uses
-    the microcode data file added by the feature into the BSP's
-    initrd.  It also puts the userland microcode-updating tool,
-    iucode_tool, into the target images along with the microcode data
-    file.
-
-    Q. Why might a user want to enable the intel-ucode feature?
-
-    A. Intel releases microcode updates to correct processor behavior
-       as documented in the respective processor specification
-       updates.  While the normal approach to getting such microcode
-       updates is via a BIOS upgrade, this can be an administrative
-       hassle and not always possible in the field.  The intel-ucode
-       feature enables the microcode update capability present in the
-       Linux kernel.  It provides an easy path for upgrading processor
-       microcode without the need to change the BIOS.  If the feature
-       is enabled, it is also possible to update the existing target
-       images with a newer microcode update in the future.
-
-    Q. How would a user bundle only target-specific microcode in the
-       target image?
-
-    A. The Intel microcode data file released by Intel contains
-       microcode updates for multiple processors.  If the BSP image is
-       meant to run on only a certain subset of processor types, a
-       processor-specific subset of microcode can be bundled into the
-       target image via the UCODE_FILTER_PARAMETERS variable.  This
-       works by listing a sequence of iucode-tool parameters in the
-       UCODE_FILTER_PARAMETERS variable, which in this case will
-       select only the specific microcode relevant to the BSP.  For
-       more information on the underlying parameters refer to the
-       iucode-tool manual page at http://manned.org/iucode-tool
-
-       To define a set of parameters for microcode-filtering via the
-       UCODE_FILTER_PARAMETERS variable, one needs to identify the
-       cpuid signatures of all the processors the BSP is meant to run
-       on.  One way to determine the cpuid signature for a specific
-       processor is to build and run an intel-ucode-feature-enabled
-       image on the target hardware, without first assigning any value
-       to the UCODE_FILTER_PARAMETERS variable, and then once the
-       image is booted, run the "ucode_tool -S" command to have the
-       ucode tool scan the system for processor signatures.  These
-       signatures can then be used in the UCODE_FILTER_PARAMETERS
-       variable in conjunction with -s parameter.  For example, for
-       the fri2 BSP, the cpuid can be determined as such:
-
-         [root@fri2 ~]# iucode_tool -S
-         iucode_tool: system has processor(s) with signature 0x00020661
-
-       Given that output, a suitable UCODE_FILTER_PARAMETERS variable
-       definition could be specified in the machine configuration as
-       such:
-
-         UCODE_FILTER_PARAMETERS = "-s 0x00020661"
-
-    Q. Are there any reasons a user might want to disable the
-       intel-ucode feature?
-
-    A. The microcode data file and associated tools occupy a small
-       amount of space (a few KB) on the target image.  BSPs which are
-       highly sensitive to target image size and which are not
-       experiencing microcode-related issues might consider not
-       enabling this feature.
-
-
-IV. Tested Hardware
-===================
-
-The following undergo regular basic testing with their respective MACHINE types.
-Note that both 64-bit and 32-bit firmware is available for the MinnowBoard
-Turbot, so it is tested against both intel-corei7-64 and intel-core2-32.
-
-intel-corei7-64:
-    NUC6i5SYH
-    NUC7i7BNH
-    Coffee Lake-H
-
-intel-core2-32:
-    MinnowBoard Turbot
-
-
-V. Guidelines for submitting patches
-====================================
-
-Please submit any patches against meta-intel BSPs to the meta-intel
-mailing list (meta-intel@lists.yoctoproject.org).  Also, if your patches are
-available via a public git repository, please also include a URL to
-the repo and branch containing your patches as that makes it easier
-for maintainers to grab and test your patches.
-
-There are patch submission scripts available that will, among other
-things, automatically include the repo URL and branch as mentioned.
-Please see the Yocto Project Development Manual sections entitled
-'Using Scripts to Push a Change Upstream and Request a Pull' and
-'Using Email to Submit a Patch' for details.
-
-Regardless of how you submit a patch or patchset, the patches should
-at minimum follow the suggestions outlined in the 'Submitting a Change
-to the Yocto Project' section in the Yocto Project Development Manual.
-Specifically, they should:
-
-  - Include a 'Signed-off-by:' line.  A commit can't legally be pulled
-    in without this.
-
-  - Provide a single-line, short summary of the change.  This short
-    description should be prefixed by the BSP or recipe name, as
-    appropriate, followed by a colon.  Capitalize the first character
-    of the summary (following the colon).
-
-  - For the body of the commit message, provide detailed information
-    that describes what you changed, why you made the change, and the
-    approach you used.
-
-  - If the change addresses a specific bug or issue that is associated
-    with a bug-tracking ID, include a reference to that ID in your
-    detailed description in the following format: [YOCTO #<bug-id>].
-
-  - Pay attention to line length - please don't allow any particular
-    line in the commit message to stretch past 72 characters.
-
-  - For any non-trivial patch, provide information about how you
-    tested the patch, and for any non-trivial or non-obvious testing
-    setup, provide details of that setup.
-
-Doing a quick 'git log' in meta-intel will provide you with many
-examples of good example commits if you have questions about any
-aspect of the preferred format.
-
-The meta-intel maintainers will do their best to review and/or pull in
-a patch or patchset within 24 hours of the time it was posted.  For
-larger and/or more involved patches and patchsets, the review process
-may take longer.
-
-Please see the meta-intel/MAINTAINERS file for the list of maintainers
-and their specific areas; it's also a good idea to cc: the specific
-maintainer, if applicable.
--- a/README.md
+++ b/README.md
@ -0,0 +1,36 @@
+# meta-intel
+
+OpenEmbedded/Yocto BSP layer for Intel platforms.
+
+## Dependencies
+
+This layer primarily depends on OpenEmbedded-Core (OE-Core). However, certain
+recipes may require additional layers to support optional features or
+programming languages not supported by OE-Core. Such recipes are located within
+the `dynamic-layers` directory.
+
+Base dependencies:
+- [Bitbake](https://git.openembedded.org/bitbake)
+- [OE-Core](https://git.openembedded.org/openembedded-core)
+
+Dynamic additional dependencies:
+
+- [meta-openembedded](https://git.openembedded.org/meta-openembedded/tree/meta-oe)
+- [meta-python](https://git.openembedded.org/meta-openembedded/tree/meta-python)
+- [meta-clang](https://github.com/kraj/meta-clang.git)
+
+
+## Contents
+
+- [Building and booting meta-intel BSP layers](documentation/building_and_booting.md)
+- [Intel oneAPI DPC++/C++ Compiler](documentation/dpcpp-compiler.md)
+- [Build Image with OpenVINO™ toolkit](documentation/openvino.md)
+- [Tested Hardware](documentation/tested_hardware.md)
+- [Guidelines for submitting patches](documentation/submitting_patches.md)
+- [Reporting bugs](documentation/reporting_bugs.md)
+- [Reporting security bugs](SECURITY.md)
+
+## Maintainers
+
+- Anuj Mittal <anuj.mittal@intel.com>
+
--- a/README.sources
+++ b/README.sources
@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-
-http://downloads.yoctoproject.org/mirror/sources/
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-
-http://downloads.yoctoproject.org/releases/yocto/yocto-2.7/poky-warrior-21.0.0.tar.bz2
-
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,6 @@
+# Security Policy
+Intel is committed to rapidly addressing security vulnerabilities affecting our customers and providing clear guidance on the solution, impact, severity and mitigation.
+
+## Reporting a Vulnerability
+Please report any security vulnerabilities in this project [utilizing the guidelines here](https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html).
+
--- a/classes/uefi-comboapp.bbclass
+++ b/classes/uefi-comboapp.bbclass
@ -1,151 +0,0 @@
-# This class brings a more generic version of the UEFI combo app from refkit to meta-intel.
-# It uses a combo file, containing kernel, initramfs and
-# command line, presented to the BIOS as UEFI application, by prepending
-# it with the efi stub obtained from systemd-boot.
-
-# Don't add syslinux or build an ISO
-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
-# we default INITRD_LIVE to the INITRD_IMAGE as well.
-INITRD_IMAGE ?= "core-image-minimal-initramfs"
-INITRD_LIVE ?= " ${@ ('${DEPLOY_DIR_IMAGE}/' + d.getVar('INITRD_IMAGE', expand=True) + '-${MACHINE}.cpio.gz') if d.getVar('INITRD_IMAGE', True) else ''}"
-
-do_uefiapp[depends] += " \
-                         intel-microcode:do_deploy \
-                         systemd-boot:do_deploy \
-                         virtual/kernel:do_deploy \
-                       "
-
-# INITRD_IMAGE is added to INITRD_LIVE, which we use to create our initrd, so depend on it if it is set
-do_uefiapp[depends] += "${@ '${INITRD_IMAGE}:do_image_complete' if d.getVar('INITRD_IMAGE') else ''}"
-
-# The image does without traditional bootloader.
-# In its place, instead, it uses a single UEFI executable binary, which is
-# composed by:
-#   - an UEFI stub
-#     The linux kernel can generate a UEFI stub, however the one from systemd-boot can fetch
-#     the command line from a separate section of the EFI application, avoiding the need to
-#     rebuild the kernel.
-#   - the kernel
-#   - an initramfs (optional)
-
-def create_uefiapp(d, uuid=None, app_suffix=''):
-    import glob, re
-    from subprocess import check_call
-
-    build_dir = d.getVar('B')
-    deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE')
-    image_link_name = d.getVar('IMAGE_LINK_NAME')
-
-    cmdline = '%s/cmdline.txt' % build_dir
-    linux = '%s/%s' % (deploy_dir_image, d.getVar('KERNEL_IMAGETYPE'))
-    initrd = '%s/initrd' % build_dir
-
-    stub_path = '%s/linux*.efi.stub' % deploy_dir_image
-    stub = glob.glob(stub_path)[0]
-    m = re.match(r"\S*(ia32|x64)(.efi)\S*", os.path.basename(stub))
-    app = "boot%s%s%s" % (m.group(1), app_suffix, m.group(2))
-    executable = '%s/%s.%s' % (deploy_dir_image, image_link_name, app)
-
-    if d.getVar('INITRD_LIVE'):
-        with open(initrd, 'wb') as dst:
-            for cpio in d.getVar('INITRD_LIVE').split():
-                with open(cpio, 'rb') as src:
-                    dst.write(src.read())
-        initrd_cmd = "--add-section .initrd=%s --change-section-vma .initrd=0x3000000 " % initrd
-    else:
-        initrd_cmd = ""
-
-    root = 'root=PARTUUID=%s' % uuid if uuid else ''
-
-    with open(cmdline, 'w') as f:
-        f.write('%s %s' % (d.getVar('APPEND'), root))
-
-    objcopy_cmd = ("objcopy "
-        "--add-section .cmdline=%s --change-section-vma .cmdline=0x30000 "
-        "--add-section .linux=%s --change-section-vma .linux=0x40000 "
-        "%s %s %s") % \
-        (cmdline, linux, initrd_cmd, stub, executable)
-
-    check_call(objcopy_cmd, shell=True)
-
-python create_uefiapps () {
-    # We must clean up anything that matches the expected output pattern, to ensure that
-    # the next steps do not accidentally use old files.
-    import glob
-    pattern = d.expand('${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi')
-    for old_efi in glob.glob(pattern):
-        os.unlink(old_efi)
-    uuid = d.getVar('DISK_SIGNATURE_UUID')
-    create_uefiapp(d, uuid=uuid)
-}
-
-# This is intentionally split into different parts. This way, derived
-# classes or images can extend the individual parts. We can also use
-# whatever language (shell script or Python) is more suitable.
-python do_uefiapp() {
-    bb.build.exec_func('create_uefiapps', d)
-}
-
-do_uefiapp[vardeps] += "APPEND DISK_SIGNATURE_UUID INITRD_LIVE KERNEL_IMAGETYPE IMAGE_LINK_NAME"
-
-uefiapp_deploy_at() {
-    dest=$1
-    for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi; do
-        target=`basename $i`
-        target=`echo $target | sed -e 's/${IMAGE_LINK_NAME}.//'`
-        cp  --preserve=timestamps -r $i $dest/$target
-    done
-}
-
-fakeroot do_uefiapp_deploy() {
-    rm -rf ${IMAGE_ROOTFS}/boot/*
-    dest=${IMAGE_ROOTFS}/boot/EFI/BOOT
-    mkdir -p $dest
-    uefiapp_deploy_at $dest
-}
-
-do_uefiapp_deploy[depends] += "${PN}:do_uefiapp virtual/fakeroot-native:do_populate_sysroot"
-
-
-# This decides when/how we add our tasks to the image
-python () {
-    image_fstypes = d.getVar('IMAGE_FSTYPES', True)
-    initramfs_fstypes = d.getVar('INITRAMFS_FSTYPES', True)
-
-    # Don't add any of these tasks to initramfs images
-    if initramfs_fstypes not in image_fstypes:
-        bb.build.addtask('uefiapp', 'do_image', 'do_rootfs', d)
-        bb.build.addtask('uefiapp_deploy', 'do_image', 'do_rootfs', d)
-}
-
-SIGN_AFTER ?= "do_uefiapp"
-SIGN_BEFORE ?= "do_uefiapp_deploy"
-SIGNING_DIR ?= "${DEPLOY_DIR_IMAGE}"
-SIGNING_BINARIES ?= "${IMAGE_LINK_NAME}.boot*.efi"
-inherit uefi-sign
-
-# Legacy hddimg support below this line
-efi_hddimg_populate() {
-    uefiapp_deploy_at "$1"
-}
-
-build_efi_cfg() {
-    # The command line is built into the combo app, so this is a null op
-    :
-}
-
-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
-    fi
-    if [ -f $dest/vmlinuz ]; then
-        rm $dest/vmlinuz
-    fi
-}
-
-IMAGE_FEATURES[validitems] += "secureboot"
--- a/classes/uefi-sign.bbclass
+++ b/classes/uefi-sign.bbclass
@ -1,50 +0,0 @@
-# By default, sign all .efi binaries in ${B} after compiling and before deploying
-SIGNING_DIR ?= "${B}"
-SIGNING_BINARIES ?= "*.efi"
-SIGN_AFTER ?= "do_compile"
-SIGN_BEFORE ?= "do_deploy"
-
-python () {
-    import os
-    import hashlib
-
-    # Ensure that if the signing key or cert change, we rerun the uefiapp process
-    if bb.utils.contains('IMAGE_FEATURES', 'secureboot', True, False, d):
-        for varname in ('SECURE_BOOT_SIGNING_CERT', 'SECURE_BOOT_SIGNING_KEY'):
-            filename = d.getVar(varname)
-            if filename is None:
-                bb.fatal('%s is not set.' % varname)
-            if not os.path.isfile(filename):
-                bb.fatal('%s=%s is not a file.' % (varname, filename))
-            with open(filename, 'rb') as f:
-                data = f.read()
-            hash = hashlib.sha256(data).hexdigest()
-            d.setVar('%s_HASH' % varname, hash)
-
-            # Must reparse and thus rehash on file changes.
-            bb.parse.mark_dependency(d, filename)
-
-        bb.build.addtask('uefi_sign', d.getVar('SIGN_BEFORE'), d.getVar('SIGN_AFTER'), d)
-
-        # Original binary needs to be regenerated if the hash changes since we overwrite it
-        # SIGN_AFTER isn't necessarily when it gets generated, but its our best guess
-        d.appendVarFlag(d.getVar('SIGN_AFTER'), 'vardeps', 'SECURE_BOOT_SIGNING_CERT_HASH SECURE_BOOT_SIGNING_KEY_HASH')
-}
-
-do_uefi_sign() {
-    if [ -f ${SECURE_BOOT_SIGNING_KEY} ] && [ -f ${SECURE_BOOT_SIGNING_CERT} ]; then
-        for i in `find ${SIGNING_DIR}/ -name '${SIGNING_BINARIES}'`; do
-            sbsign --key ${SECURE_BOOT_SIGNING_KEY} --cert ${SECURE_BOOT_SIGNING_CERT} $i
-            sbverify --cert ${SECURE_BOOT_SIGNING_CERT} $i.signed
-            mv $i.signed $i
-        done
-    fi
-}
-
-do_uefi_sign[depends] += "sbsigntool-native:do_populate_sysroot"
-
-do_uefi_sign[vardeps] += "SECURE_BOOT_SIGNING_CERT_HASH \
-                          SECURE_BOOT_SIGNING_KEY_HASH  \
-                          SIGNING_BINARIES SIGNING_DIR  \
-                          SIGN_BEFORE SIGN_AFTER        \
-                         "
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@ -8,11 +8,11 @@ RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal <anuj.mittal@in
 RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
 RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>"
+RECIPE_MAINTAINER:pn-intel-cmt-cat = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
 RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
 RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal <anuj.mittal@intel.com>"
@ -22,17 +22,15 @@ RECIPE_MAINTAINER:pn-itt = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-jhi = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-libva-intel = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-libva-intel-utils = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.com>"
+RECIPE_MAINTAINER:pn-linux-npu-driver = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-lms = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>"
@ -41,16 +39,9 @@ RECIPE_MAINTAINER:pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-onedpl = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-onevpl = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-onevpl-intel-gpu = "Yew Chang Ching <chang.ching.yew@intel.com>"
-RECIPE_MAINTAINER:pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER:pn-openvino-inference-engine = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-openvino-model-optimizer = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-openvkl = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-ospray = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER:pn-ovmf-shell-image-enrollkeys = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-rkcommon = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -19,7 +19,7 @@ LAYERRECOMMENDS_intel = "dpdk"
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_intel = "5"
-LAYERSERIES_COMPAT_intel = "kirkstone"
+LAYERSERIES_COMPAT_intel = "scarthgap whinlatter"

 BBFILES_DYNAMIC += " \
    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \
@ -41,3 +41,5 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva"
 PREFERRED_PROVIDER_libva-utils ?= "libva-utils"
 PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native"
 PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils"
+
+addpylib ${LAYERDIR}/lib oeqa
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@ -7,10 +7,10 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
 PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel"

-PREFERRED_VERSION_linux-intel ?= "5.15%"
-PREFERRED_VERSION_linux-intel-rt ?= "5.15%"
-PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.10%"
-PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.10%"
+PREFERRED_VERSION_linux-intel ?= "6.12%"
+PREFERRED_VERSION_linux-intel-rt ?= "6.12%"
+PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.12%"
+PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "6.12%"

 # Need to point to latest version of libva needed for media components
 PREFERRED_PROVIDER_libva = "libva-intel"
@ -21,9 +21,6 @@ PREFERRED_PROVIDER_libva-utils = "libva-intel-utils"
 PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native"
 PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils"

-PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '14.0.0', d)}"
-PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '14.0.0', d)}"
-
 XSERVER_X86_ASPEED_AST = "xf86-video-ast \
           "

@ -32,7 +29,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURE

 # 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_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915 kernel-module-igc kernel-module-r8152"

 # for the early boot time kernel microcode loading support,
 # merge the microcode data in the final initrd image.
--- a/conf/machine/include/qemuboot-intel.inc
+++ b/conf/machine/include/qemuboot-intel.inc
@ -15,5 +15,4 @@ QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client"
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-device AC97"
 QB_KERNEL_CMDLINE_APPEND = " oprofile.timer=1"
-# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
-QB_OPT_APPEND = " -usb -usbdevice tablet -device virtio-rng-pci"
+QB_OPT_APPEND = " -usb -usbdevice tablet "
--- a/conf/machine/include/tune-skylake.inc
+++ b/conf/machine/include/tune-skylake.inc
@ -1,48 +0,0 @@
-# Settings for the GCC(1) cpu-type "skylake":
-#
-#     Intel Skylake CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1,
-#     SSE4.2, AVX, AVX2 and POPCNT instruction set support.
-#
-# This tune is recommended for Intel Skylake CPU (and beyond).
-#
-DEFAULTTUNE ?= "skylake-64"
-
-# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
-require conf/machine/include/x86/tune-corei7.inc
-
-# Extra tune features
-TUNEVALID[skylake] = "Enable skylake specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake ${SKYLAKE_TUNE} -mfpmath=sse', '', d)}"
-
-# 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"
-QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client"
-
-
-# Disable QEMU usermode by default (get avx2)
-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)}"
-
-QEMU_UNAVAILABLE_ISA = " \
-mno-avx \
-mno-avx2 \
-mno-avx512f \
-mno-avx512er \
-mno-avx512cd \
-mno-avx512pf \
-mno-avx512dq \
-mno-avx512bw \
-mno-avx512vl \
-mno-avx512ifma \
-mno-avx512vbmi \
-mno-avx512vbmi2 \
-mno-avx512vnni \
-mno-avx512bitalg \
-"
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@ -11,7 +11,7 @@ MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"

-MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver vpl-gpu-rt', d)} gstreamer1.0-vaapi"

 # Enable optional dpdk:
 COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
--- a/conf/machine/intel-skylake-64.conf
+++ b/conf/machine/intel-skylake-64.conf
@ -5,14 +5,14 @@

 require conf/machine/include/meta-intel.inc
 require conf/machine/include/x86/x86-base.inc
-require conf/machine/include/tune-skylake.inc
+require conf/machine/include/x86/tune-x86-64-v3.inc
 require conf/machine/include/intel-common-pkgarch.inc

 MACHINE_FEATURES += "efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"

-MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-media-driver vpl-gpu-rt gstreamer1.0-vaapi"

 COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64"
 COMPATIBLE_MACHINE:pn-dpdk-module = "intel-skylake-64"
--- a/documentation/building_and_booting.md
+++ b/documentation/building_and_booting.md
@ -0,0 +1,134 @@
+### Building the Intel BSP layers
+
+The intel-common BSP provide a few carefully selected tune options and
+generic hardware support to cover the majority of current Intel CPUs and
+devices. The naming follows the convention of intel-<TUNE>-<BITS>, where
+TUNE is the gcc cpu-type (used with mtune and march typically) and BITS
+is either 32 bit or 64 bit.
+
+In order to build an image with BSP support for a given release, you
+need to clone the meta-intel layer from git repository:
+```
+git clone https://git.yoctoproject.org/meta-intel
+```
+
+Check out the appropriate branch or release tags. The branch name and tags
+would align with Yocto Project
+[Release Codenames](https://wiki.yoctoproject.org/wiki/Releases).
+Assuming meta-intel repository is cloned at the top-level of
+OE-Core build tree, you can build a BSP image by adding the location of
+the meta-intel layer to bblayers.conf:
+```
+BBLAYERS = " \
+  /openembedded-core/meta \
+  /openembedded-core/meta-intel "
+```
+
+To enable a particular machine, add a MACHINE line naming the BSP
+to the local.conf file:
+```
+MACHINE ?= "intel-corei7-64"
+```
+
+where this can be replaced by other MACHINE types available:
+
+ - intel-core2-32
+
+   This BSP is optimized for the Core2 family of CPUs as well as all
+   Atom CPUs prior to the Silvermont core.
+
+ - intel-corei7-64
+
+   This BSP is optimized for Nehalem and later Core and Xeon CPUs as
+   well as Silvermont and later Atom CPUs, such as the Baytrail SoCs.
+
+ - intel-skylake-64
+
+   This BSP uses [x86-64-v3 tuning](https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html).
+
+You should then be able to build an image as such:
+```
+$ source oe-init-build-env
+$ bitbake core-image-sato
+```
+
+At the end of a successful build, you should have an image that
+you can boot from a USB flash drive.
+
+
+## Booting the intel-common BSP images
+
+If you've built your own image, you'll find the bootable
+image in the build/tmp/deploy/images/{MACHINE} directory, where
+'MACHINE' refers to the machine name used in the build.
+
+Under Linux, insert a USB flash drive.  Assuming the USB flash drive
+takes device /dev/sdf, use dd to copy the image to it.  Before the image
+can be burned onto a USB drive, it should be un-mounted. Some Linux distros
+may automatically mount a USB drive when it is plugged in. Using USB device
+/dev/sdf as an example, find all mounted partitions:
+```
+$ mount | grep sdf
+```
+
+and un-mount those that are mounted, for example:
+```
+$ umount /dev/sdf1
+$ umount /dev/sdf2
+```
+
+Now burn the image onto the USB drive:
+```
+$ sudo dd if=core-image-sato-intel-corei7-64.wic of=/dev/sdf status=progress
+$ sync
+$ eject /dev/sdf
+```
+
+This should give you a bootable USB flash device. Insert the device
+into a bootable USB socket on the target, and power on.  This should
+result in a system booted to the Sato graphical desktop.
+
+If you want a terminal, use the arrows at the top of the UI to move to
+different pages of available applications, one of which is named
+'Terminal'.  Clicking that should give you a root terminal.
+
+If you want to ssh into the system, you can use the root terminal to
+ifconfig the IP address and use that to ssh in.  The root password is
+empty, so to log in type 'root' for the user name and hit 'Enter' at
+the Password prompt: and you should be in.
+
+If you find you're getting corrupt images on the USB (it doesn't show
+the syslinux boot: prompt, or the boot: prompt contains strange
+characters), try doing this first:
+```
+$ dd if=/dev/zero of=/dev/sdf bs=1M count=512
+```
+
+## Building the installer image
+
+If you plan to install your image to your target machine, you can build a wic
+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_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 = "\
+    ${KERNEL_IMAGETYPE} \
+     microcode.cpio \
+    ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.rootfs.ext4;rootfs.img \
+    ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', 'grub-efi-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \
+    ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', '${IMAGE_ROOTFS}/boot/EFI/BOOT/grub.cfg;EFI/BOOT/grub.cfg', '', d)} \
+    ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', 'systemd-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \
+    ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/loader.conf;loader/loader.conf ', '', d)} \
+    ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/entries/boot.conf;loader/entries/boot.conf', '', d)} "
+```
+
+Burn the wic image onto USB flash device, insert the device to target machine
+and power on. This should start the installation process.
+
+
--- a/documentation/dpcpp-compiler.md
+++ b/documentation/dpcpp-compiler.md
@ -0,0 +1,107 @@
+Intel(R) oneAPI DPC++/C++ Compiler (ICX) toolchain
+==========================================================================
+
+Get Started with the Intel oneAPI DPC++/C++ Compiler:
+
+https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html#
+
+
+Getting Started
+===============
+
+Clone the required layers and include them in bblayers.conf:
+
+```
+git clone https://git.openembedded.org/openembedded-core
+git clone https://git.openembedded.org/bitbake
+git clone https://git.openembedded.org/meta-openembedded
+git clone https://github.com/kraj/meta-clang.git
+git clone https://git.yoctoproject.org/meta-intel
+
+$ source openembedded-core/oe-init-build-env
+
+$ bitbake-layers add-layer ../meta-openembedded/meta-oe/
+$ bitbake-layers add-layer ../meta-intel
+$ bitbake-layers add-layer ../meta-clang
+```
+
+Distro
+======
+
+Note that oneAPI DPC++/C++ compiler currently only works when the vendor string is "oe".
+
+```
+DISTRO ?= "nodistro"
+```
+
+MACHINE configuration
+=====================
+
+```
+MACHINE ?= "intel-skylake-64"
+```
+
+Package installation
+====================
+
+```
+# To include OpenCL driver that might be needed when compiling SYCL programs, include:
+IMAGE_INSTALL:append = " intel-compute-runtime intel-graphics-compiler"
+
+# To install only runtime libraries, include:
+IMAGE_INSTALL:append = " intel-oneapi-dpcpp-cpp-runtime intel-oneapi-dpcpp-cpp-runtime-dev"
+
+# To install the toolchain, include:
+IMAGE_INSTALL:append = " intel-oneapi-dpcpp-cpp intel-oneapi-dpcpp-cpp-dev"
+```
+in local.conf.
+
+Build an image
+==============
+
+```
+$ bitbake core-image-minimal
+```
+
+Including oneAPI C++/DPC++ compiler in generated SDK toolchain
+==============================================================
+
+The compiler is not included in the generated SDK by default. If it is expected to be part of SDK, add ICXSDK = "1" in local.conf:
+
+```
+ICXSDK = "1"
+```
+
+Generate SDK:
+```
+bitbake core-image-minimal -c populate_sdk
+```
+
+
+To setup PATH variables on target
+=================================
+
+Once image is booted successfully, some variables would need to be exported to make sure compiler can be used:
+
+```
+$ source /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh
+
+$ mkdir -p /lib64
+
+$ ln -sf /lib/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
+```
+
+Build application and run
+=========================
+
+To compile a sycl application, for example:
+
+```
+$ icpx --target=x86_64-oe-linux -fsycl simple-sycl-app.c -o simple-sycl-app
+```
+
+To run:
+
+```
+$ ./simple-sycl-app
+```
--- a/documentation/openvino.md
+++ b/documentation/openvino.md
@ -0,0 +1,92 @@
+Build a Yocto Image with OpenVINO™ toolkit
+==========================================
+
+Follow the [Yocto Project official documentation](https://docs.yoctoproject.org/brief-yoctoprojectqs/index.html#compatible-linux-distribution) to set up and configure your host machine to be compatible with BitBake.
+
+## Step 1: Set Up Environment
+
+1. Clone the repositories.
+
+```
+      git clone https://git.yoctoproject.org/git/poky
+      git clone https://github.com/openembedded/meta-openembedded
+      git clone https://git.yoctoproject.org/git/meta-intel
+      git clone https://github.com/intel/meta-openvino
+```
+
+
+2. Set up the OpenEmbedded build environment.
+
+```
+      source poky/oe-init-build-env
+
+```
+
+
+
+3. Add BitBake layers.
+
+
+```
+      bitbake-layers add-layer ../meta-openembedded/meta-oe
+      bitbake-layers add-layer ../meta-openembedded/meta-python
+      bitbake-layers add-layer ../meta-intel
+      bitbake-layers add-layer ../meta-openvino
+
+```
+
+
+4. Set up BitBake configurations.
+   Include extra configuration in the `conf/local.conf` file in your build directory as required.
+
+
+```
+      MACHINE = "intel-skylake-64"
+
+      # Enable building OpenVINO Python API.
+      # This requires meta-python layer to be included in bblayers.conf.
+      PACKAGECONFIG:append:pn-openvino-inference-engine = " python3"
+
+      # This adds OpenVINO related libraries in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine"
+
+      # This adds OpenVINO samples in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-samples"
+
+      # Include OpenVINO Python API package in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-python3"
+
+```
+
+## Step 2: Build a Yocto Image with OpenVINO Packages
+
+Run BitBake to build your image with OpenVINO packages. For example, to build the minimal image, run the following command:
+
+
+```
+   bitbake core-image-minimal
+
+```
+
+## Step 3: Verify the Yocto Image
+
+Verify that OpenVINO packages were built successfully. Run the following command:
+
+```
+   oe-pkgdata-util list-pkgs | grep openvino
+
+```
+
+
+If the image build is successful, it will return the list of packages as below:
+
+```
+   openvino-inference-engine
+   openvino-inference-engine-dbg
+   openvino-inference-engine-dev
+   openvino-inference-engine-python3
+   openvino-inference-engine-samples
+   openvino-inference-engine-src
+   openvino-inference-engine-doc
+
+```
--- a/documentation/reporting_bugs.md
+++ b/documentation/reporting_bugs.md
@ -0,0 +1,22 @@
+## Reporting bugs
+
+If you have problems with or questions about a particular BSP, please
+contact the maintainer listed in the [Maintainer](../README.md#maintainers) section directly (cc:ing
+the Yocto mailing list puts it in the archive and helps other people
+who might have the same questions in the future), but please try to do
+the following first:
+
+- look in the [Yocto Project Bugzilla](http://bugzilla.yoctoproject.org/) to see if a
+  problem has already been reported
+
+- look through recent entries of the [meta-intel](https://lists.yoctoproject.org/g/meta-intel/messages)
+  and [Yocto Archives](https://lists.yoctoproject.org/g/yocto/messages) mailing list archives to see
+  if other people have run into similar problems or had similar questions answered.
+
+If you believe you have encountered a bug, you can open a new bug and
+enter the details in the [Yocto Project Bugzilla](https://bugzilla.yoctoproject.org/).
+If you're relatively certain that it's a bug against the BSP itself, please use the
+'BSPs | bsps-meta-intel' category for the bug; otherwise, please submit the bug against
+the most likely category for the problem. if you're wrong, it's not a big deal and
+the bug will be recategorized upon triage.
+
--- a/documentation/secureboot/README
+++ b/documentation/secureboot/README
@ -1,38 +0,0 @@
-Currently, only one implementation of Secure Boot is available out of the box,
-which is using a single signed EFI application to directly boot the kernel with
-an optional initramfs.
-
-This can be added to your build either through local.conf, or via your own
-custom image recipe.
-
-If you are adding it via local.conf, set the following variables:
-
-IMAGE_FEATURES += "secureboot"
-WKS_FILE = "generic-bootdisk.wks.in"
-SECURE_BOOT_SIGNING_KEY = "/path/to/your/signing/key"
-SECURE_BOOT_SIGNING_CERT = "/path/to/your/signing/cert"
-IMAGE_CLASSES += "uefi-comboapp"
-
-If working with an image recipe, you can inherit uefi-comboapp directly instead
-of using the IMAGE_CLASSES variable.
-
-The signing keys and certs can be created via openssl commands. Here's an
-example:
-openssl req -new -x509 -newkey rsa:2048 -subj "/CN=your-subject/" -keyout \
-your-key.key -out your-key.crt -days 365 -nodes -sha256
-openssl x509 -in your-key.crt -out your-key.cer -outform DER
-
-The .crt file is your SECURE_BOOT_SIGNING_CERT, and the .key file is your
-SECURE_BOOT_SIGNING_KEY.
-
-You should enroll the .crt key in your firmware under the PK, KEK, and DB
-options (methods are different depending on your firmware). If a key should ever
-become invalid, enroll it under DBX to blacklist it.
-
-The comboapp can be further manipulated in a number of ways. You can modify the
-kernel command line via the APPEND variable, you can change the default UUID via
-the DISK_SIGNATURE_UUID variable, and you can modify the contents of the
-initramfs via the INITRD_IMAGE or INITRD_LIVE variables.
-
-A simple Secure Boot enabled image used for testing can be viewed at:
-common/recipes-selftest/images/secureboot-selftest-image-signed.bb
--- a/documentation/submitting_patches.md
+++ b/documentation/submitting_patches.md
@ -0,0 +1,26 @@
+## Guidelines for submitting patches
+
+Please submit any patches against meta-intel BSPs to the
+[meta-intel mailing list](https://lists.yoctoproject.org/g/meta-intel)
+(email: meta-intel@lists.yoctoproject.org). Also, if your patches are
+available via a public git repository, please also include a URL to
+the repo and branch containing your patches as that makes it easier
+for maintainers to grab and test your patches.
+
+The patches should follow the suggestions outlined in the
+[Yocto Project and OpenEmbedded Contributor Guide](https://docs.yoctoproject.org/dev/contributor-guide/index.html).
+In addition, for any non-trivial patch, provide information about how you
+tested the patch, and for any non-trivial or non-obvious testing
+setup, provide details of that setup.
+
+Doing a quick 'git log' in meta-intel will provide you with many
+examples of good example commits if you have questions about any
+aspect of the preferred format.
+
+The meta-intel maintainers will do their best to review and/or pull in
+a patch or patch sets within 24 hours of the time it was posted.  For
+larger and/or more involved patches and patch sets, the review process
+may take longer.
+
+Please see the [maintainers](../README.md#maintainers) section for the list of maintainers. It's also
+a good idea to cc: the maintainer, if applicable.
--- a/documentation/tested_hardware.md
+++ b/documentation/tested_hardware.md
@ -0,0 +1,21 @@
+## Tested Hardware
+
+The following undergo regular testing with their respective MACHINE types:
+
+- intel-corei7-64:
+    * Alder Lake-P/S/PS
+    * Amston Lake
+    * Elkhart Lake
+    * Metor Lake-P
+    * Raptor Lake-P/S
+    * Tiger Lake
+
+- intel-skylake-64:
+    * Alder Lake-P/S/PS
+    * Amston Lake
+    * Metor Lake-P
+    * Raptor Lake-P/S
+    * Tiger Lake
+
+- intel-core2-32:
+    * MinnowBoard Turbot
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb
@ -3,7 +3,7 @@ SUMMARY  = "Deep Neural Network Library"
 DESCRIPTION = "This software is a user mode library that accelerates\
 deep-learning applications and frameworks on Intel architecture."
 LICENSE  = "Apache-2.0 & BSD-3-Clause & BSL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
                    file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
                    file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
                    file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
@ -12,9 +12,10 @@ SECTION = "lib"

 inherit pkgconfig cmake ptest

-S = "${WORKDIR}/git"
-SRCREV = "a402b6905b82477999982470308ccaaa39966adb"
-SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.5;protocol=https \
+DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
+
+SRCREV = "66f0cb9eb66affd2da3bf5f8d897376f04aae6af"
+SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
           file://run-ptest \
           "

@ -32,10 +33,11 @@ EXTRA_OECMAKE += " \
                   -DDNNL_CPU_RUNTIME=OMP \
                   -DDNNL_ARCH_OPT_FLAGS="" \
                   -DCMAKE_SKIP_RPATH=ON \
+                   -DONEDNN_BUILD_GRAPH=OFF \
                   "

-PACKAGECONFIG ??= ""
-PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime"
+PACKAGECONFIG ??= "gpu"
+PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers virtual/opencl-icd, intel-compute-runtime"

 do_install:append () {
    install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch
@ -1,28 +0,0 @@
-From b9bc0df996d1e65fd70d5eb2d40866693f23bb67 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Thu, 24 Jun 2021 17:53:27 +0800
-Subject: [PATCH] CMakeLists.txt: link with libclang-cpp library instead
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef88317e..7507d6a5 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -281,7 +281,7 @@ if (WASM_ENABLED)
-     list(APPEND ISPC_TARGETS wasm-i32x4)
- endif()
- 
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
-+set(CLANG_LIBRARY_LIST clang-cpp)
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
- 
- if (X86_ENABLED)
-- 
-2.17.1
-
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Enable-LLVM-15.0-support.patch
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Enable-LLVM-15.0-support.patch
@ -1,52 +0,0 @@
-From 9b722217a2818bc4335bf2c7d3293d30aa5977b1 Mon Sep 17 00:00:00 2001
-From: Dmitry Babokin <dmitry.y.babokin@intel.com>
-Date: Fri, 4 Feb 2022 16:45:34 -0800
-Subject: [PATCH 01/24] Enable LLVM 15.0 support
-
-Upstream-Status: Backport [https://github.com/ispc/ispc/commit/9b722217a2818bc4335bf2c7d3293d30aa5977b1]
-
-Signed-off-by: Dmitry Babokin <dmitry.y.babokin@intel.com>
---
- src/ispc.h         | 4 ++--
- src/ispc_version.h | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/ispc.h b/src/ispc.h
-index 362c2b93..581d5de6 100644
--- a/src/ispc.h
-+++ b/src/ispc.h
-@@ -1,5 +1,5 @@
- /*
-  Copyright (c) 2010-2021, Intel Corporation
-+  Copyright (c) 2010-2022, Intel Corporation
-   All rights reserved.
- 
-   Redistribution and use in source and binary forms, with or without
-@@ -42,7 +42,7 @@
- #include "target_registry.h"
- 
- #if ISPC_LLVM_VERSION < OLDEST_SUPPORTED_LLVM || ISPC_LLVM_VERSION > LATEST_SUPPORTED_LLVM
-#error "Only LLVM 11.0 - 13.0 and 14.0 development branch are supported"
-+#error "Only LLVM 11.0 - 14.0 and 15.0 development branch are supported"
- #endif
- 
- #if defined(_WIN32) || defined(_WIN64)
-diff --git a/src/ispc_version.h b/src/ispc_version.h
-index e8487e5b..04a3cf64 100644
--- a/src/ispc_version.h
-+++ b/src/ispc_version.h
-@@ -50,9 +50,10 @@
- #define ISPC_LLVM_12_0 120000
- #define ISPC_LLVM_13_0 130000
- #define ISPC_LLVM_14_0 140000
-+#define ISPC_LLVM_15_0 150000
- 
- #define OLDEST_SUPPORTED_LLVM ISPC_LLVM_10_0
-#define LATEST_SUPPORTED_LLVM ISPC_LLVM_14_0
-+#define LATEST_SUPPORTED_LLVM ISPC_LLVM_15_0
- 
- #ifdef __ispc__xstr
- #undef __ispc__xstr
-- 
-2.17.1
-
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb
@ -1,36 +0,0 @@
-SUMMARY  = "Intel(R) Implicit SPMD Program Compiler"
-DESCRIPTION = "ispc is a compiler for a variant of the C programming language, \
-with extensions for single program, multiple data programming."
-HOMEPAGE = "https://github.com/ispc/ispc"
-
-LICENSE  = "BSD-3-Clause & Apache-2.0-with-LLVM-exception"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \
-                    file://third-party-programs.txt;md5=3cd6f8a7c3bd9d2bb898fcb27c75221a"
-
-inherit cmake python3native
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
-           file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
-           file://0002-cmake-don-t-build-for-32-bit-targets.patch \
-           file://0001-Enable-LLVM-15.0-support.patch \
-           "
-SRCREV = "7ad8429369a4d5ced6b524fdfffe623939d8fe9a"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-
-DEPENDS += " clang-native bison-native "
-RDEPENDS:${PN} += " clang-libllvm clang"
-
-EXTRA_OECMAKE += " \
-                  -DISPC_INCLUDE_TESTS=OFF  \
-                  -DISPC_INCLUDE_EXAMPLES=OFF  \
-                  -DISPC_NO_DUMPS=ON  \
-                  -DARM_ENABLED=OFF  \
-                  -DISPC_CROSS=ON  \
-                  -DSYSROOT_DIR=${STAGING_DIR_NATIVE}  \
-                  "
-
-TOOLCHAIN = "clang"
-BBCLASSEXTEND = "native nativesdk"
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch
@ -1,51 +0,0 @@
-From 3632f727dfd786a8eca50bd01219669bbe7b0df9 Mon Sep 17 00:00:00 2001
-From: haonanya <haonan.yang@intel.com>
-Date: Tue, 11 May 2021 11:13:02 +0800
-Subject: [PATCH 1/3] Remove __IMAGE_SUPPORT__ macro for SPIR since SPIR
- doesn't require image support
-
-Upstream-Status: Backport [Taken from opencl-clang patches, https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch]
-
-Signed-off-by: haonanya <haonan.yang@intel.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- clang/lib/Frontend/InitPreprocessor.cpp     | 3 ---
- clang/test/Preprocessor/predefined-macros.c | 2 --
- 2 files changed, 5 deletions(-)
-
-diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
-index c64a912ce919..c60972c96e5d 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
-+++ b/clang/lib/Frontend/InitPreprocessor.cpp
-@@ -1121,9 +1121,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
-   // OpenCL definitions.
-   if (LangOpts.OpenCL) {
-     TI.getOpenCLFeatureDefines(LangOpts, Builder);
-
-    if (TI.getTriple().isSPIR())
-      Builder.defineMacro("__IMAGE_SUPPORT__");
-   }
- 
-   if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) {
-diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c
-index e406b9a70570..88606518c7de 100644
--- a/clang/test/Preprocessor/predefined-macros.c
-+++ b/clang/test/Preprocessor/predefined-macros.c
-@@ -188,14 +188,12 @@
- 
- // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \
- // RUN:   | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR
-// CHECK-SPIR-DAG: #define __IMAGE_SUPPORT__ 1
- // CHECK-SPIR-DAG: #define __SPIR__ 1
- // CHECK-SPIR-DAG: #define __SPIR32__ 1
- // CHECK-SPIR-NOT: #define __SPIR64__ 1
- 
- // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir64-unknown-unknown \
- // RUN:   | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR64
-// CHECK-SPIR64-DAG: #define __IMAGE_SUPPORT__ 1
- // CHECK-SPIR64-DAG: #define __SPIR__ 1
- // CHECK-SPIR64-DAG: #define __SPIR64__ 1
- // CHECK-SPIR64-NOT: #define __SPIR32__ 1
-- 
-2.17.1
-
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch
@ -1,52 +0,0 @@
-From 06cf750d2ef892eaa4f0ff5d0a9e9e5c49697264 Mon Sep 17 00:00:00 2001
-From: Raphael Isemann <teemperor@gmail.com>
-Date: Thu, 1 Apr 2021 18:41:44 +0200
-Subject: [PATCH 2/3] Avoid calling ParseCommandLineOptions in BackendUtil if
- possible
-
-Calling `ParseCommandLineOptions` should only be called from `main` as the
-CommandLine setup code isn't thread-safe. As BackendUtil is part of the
-generic Clang FrontendAction logic, a process which has several threads executing
-Clang FrontendActions will randomly crash in the unsafe setup code.
-
-This patch avoids calling the function unless either the debug-pass option or
-limit-float-precision option is set. Without these two options set the
-`ParseCommandLineOptions` call doesn't do anything beside parsing
-the command line `clang` which doesn't set any options.
-
-See also D99652 where LLDB received a workaround for this crash.
-
-Reviewed By: JDevlieghere
-
-Differential Revision: https://reviews.llvm.org/D99740
-
-Upstream-Status: Backport [Taken from opencl-clang patches; https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- clang/lib/CodeGen/BackendUtil.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
-index 52bcd971dc8c..f9f891247530 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
-+++ b/clang/lib/CodeGen/BackendUtil.cpp
-@@ -850,7 +850,15 @@ static void setCommandLineOpts(const CodeGenOptions &CodeGenOpts) {
-     BackendArgs.push_back("-limit-float-precision");
-     BackendArgs.push_back(CodeGenOpts.LimitFloatPrecision.c_str());
-   }
-+  // Check for the default "clang" invocation that won't set any cl::opt values.
-+  // Skip trying to parse the command line invocation to avoid the issues
-+  // described below.
-+  if (BackendArgs.size() == 1)
-+    return;
-   BackendArgs.push_back(nullptr);
-+  // FIXME: The command line parser below is not thread-safe and shares a global
-+  // state, so this call might crash or overwrite the options of another Clang
-+  // instance in the same process.
-   llvm::cl::ParseCommandLineOptions(BackendArgs.size() - 1,
-                                     BackendArgs.data());
- }
-- 
-2.17.1
-
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0003-Support-cl_ext_float_atomics.patch
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0003-Support-cl_ext_float_atomics.patch
@ -1,344 +0,0 @@
-From f1a24eeb89342186c6c718e02dd394775620799f Mon Sep 17 00:00:00 2001
-From: haonanya <haonan.yang@intel.com>
-Date: Wed, 28 Jul 2021 14:20:08 +0800
-Subject: [PATCH 3/3] Support cl_ext_float_atomics
-
-Upstream-Status: Backport [Taken from opencl-clang patches; https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0003-OpenCL-Support-cl_ext_float_atomics.patch]
-
-Signed-off-by: haonanya <haonan.yang@intel.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- clang/lib/Headers/opencl-c-base.h     |  19 +++
- clang/lib/Headers/opencl-c.h          | 195 ++++++++++++++++++++++++++
- clang/test/Headers/opencl-c-header.cl |  72 ++++++++++
- 3 files changed, 286 insertions(+)
-
-diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
-index e8dcd70377e5..c8b6d36029ec 100644
--- a/clang/lib/Headers/opencl-c-base.h
-+++ b/clang/lib/Headers/opencl-c-base.h
-@@ -21,6 +21,25 @@
- #define cl_khr_subgroup_shuffle 1
- #define cl_khr_subgroup_shuffle_relative 1
- #define cl_khr_subgroup_clustered_reduce 1
-+#define cl_ext_float_atomics
-+#ifdef cl_khr_fp16
-+#define __opencl_c_ext_fp16_global_atomic_load_store 1
-+#define __opencl_c_ext_fp16_local_atomic_load_store 1
-+#define __opencl_c_ext_fp16_global_atomic_add 1
-+#define __opencl_c_ext_fp16_local_atomic_add 1
-+#define __opencl_c_ext_fp16_global_atomic_min_max 1
-+#define __opencl_c_ext_fp16_local_atomic_min_max 1
-+#endif
-+#ifdef __opencl_c_fp64
-+#define __opencl_c_ext_fp64_global_atomic_add 1
-+#define __opencl_c_ext_fp64_local_atomic_add 1
-+#define __opencl_c_ext_fp64_global_atomic_min_max 1
-+#define __opencl_c_ext_fp64_local_atomic_min_max 1
-+#endif
-+#define __opencl_c_ext_fp32_global_atomic_add 1
-+#define __opencl_c_ext_fp32_local_atomic_add 1
-+#define __opencl_c_ext_fp32_global_atomic_min_max 1
-+#define __opencl_c_ext_fp32_local_atomic_min_max 1
- #endif // defined(__SPIR__)
- #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
-diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
-index ab665628c8e1..6676da858d2a 100644
--- a/clang/lib/Headers/opencl-c.h
-+++ b/clang/lib/Headers/opencl-c.h
-@@ -13531,6 +13531,201 @@ intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uint
- intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder, memory_scope scope);
- #endif
- 
-+#if defined(cl_ext_float_atomics)
-+
-+#if defined(__opencl_c_ext_fp32_global_atomic_min_max)
-+float __ovld atomic_fetch_min(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_max(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_min_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_max_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_min_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_max_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp32_local_atomic_min_max)
-+float __ovld atomic_fetch_min(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_max(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_min_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_max_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_min_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_max_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp32_global_atomic_min_max) ||                      \
-+    defined(__opencl_c_ext_fp32_local_atomic_min_max)
-+float __ovld atomic_fetch_min(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_max(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_min_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_max_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_min_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_max_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_global_atomic_min_max)
-+double __ovld atomic_fetch_min(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_max(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_min_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_max_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_min_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_max_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_local_atomic_min_max)
-+double __ovld atomic_fetch_min(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_max(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_min_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_max_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_min_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_max_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_global_atomic_min_max) ||                      \
-+    defined(__opencl_c_ext_fp64_local_atomic_min_max)
-+double __ovld atomic_fetch_min(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_max(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_min_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_max_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_min_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_max_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif
-+
-+#if defined(__opencl_c_ext_fp32_global_atomic_add)
-+float __ovld atomic_fetch_add(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_sub(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_add_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_sub_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_add_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_sub_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp32_local_atomic_add)
-+float __ovld atomic_fetch_add(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_sub(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_add_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_sub_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_add_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_sub_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp32_global_atomic_add) ||                          \
-+    defined(__opencl_c_ext_fp32_local_atomic_add)
-+float __ovld atomic_fetch_add(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_sub(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_add_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_sub_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_add_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_sub_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif
-+
-+#if defined(__opencl_c_ext_fp64_global_atomic_add)
-+double __ovld atomic_fetch_add(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_sub(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_add_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_sub_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_add_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_sub_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_local_atomic_add)
-+double __ovld atomic_fetch_add(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_sub(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_add_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_sub_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_add_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_sub_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_global_atomic_add) ||                          \
-+    defined(__opencl_c_ext_fp64_local_atomic_add)
-+double __ovld atomic_fetch_add(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_sub(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_add_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_sub_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_add_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_sub_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif
-+
-+#endif // cl_ext_float_atomics
-+
- // atomic_store()
- 
- void __ovld atomic_store(volatile atomic_int *object, int desired);
-diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl
-index 13a3b62481ec..2c02d14f25c3 100644
--- a/clang/test/Headers/opencl-c-header.cl
-+++ b/clang/test/Headers/opencl-c-header.cl
-@@ -124,6 +124,36 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- #if cl_khr_subgroup_clustered_reduce != 1
- #error "Incorrectly defined cl_khr_subgroup_clustered_reduce"
- #endif
-+#if __opencl_c_ext_fp16_global_atomic_load_store != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_load_store"
-+#endif
-+#if __opencl_c_ext_fp16_local_atomic_load_store != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_load_store"
-+#endif
-+#if __opencl_c_ext_fp16_global_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp32_global_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_global_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp16_local_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp32_local_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_local_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp16_global_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp32_global_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_global_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp16_local_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp32_local_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_local_atomic_min_max"
-+#endif
- 
- #else
- 
-@@ -148,6 +178,48 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- #ifdef cl_khr_subgroup_clustered_reduce
- #error "Incorrect cl_khr_subgroup_clustered_reduce define"
- #endif
-+#ifdef __opencl_c_ext_fp16_global_atomic_load_store
-+#error "Incorrectly __opencl_c_ext_fp16_global_atomic_load_store defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_local_atomic_load_store
-+#error "Incorrectly __opencl_c_ext_fp16_local_atomic_load_store defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_global_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp16_global_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_global_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp32_global_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_global_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp64_global_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_local_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp16_local_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_local_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp32_local_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_local_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp64_local_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_global_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp16_global_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_global_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp32_global_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_global_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp64_global_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_local_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp16_local_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_local_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp32_local_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_local_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp64_local_atomic_min_max defined"
-+#endif
- 
- #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
-- 
-2.17.1
-
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
@ -1,67 +0,0 @@
-From 0c4ba4947d1630f2e13fc260399f0892b2c9b323 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Fri, 27 Aug 2021 10:55:13 +0800
-Subject: [PATCH 1/2] This patch is needed for ISPC for Gen only
-
-1. Transformation of add to or is not safe for VC backend.
-2. bswap intrinsics is not supported in VC backend yet.
-
-Upstream-Status: Backport [Taken from ispc, https://github.com/ispc/ispc/blob/v1.16.1/llvm_patches/12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp  | 10 +++++++---
- .../lib/Transforms/InstCombine/InstCombineAndOrXor.cpp |  9 ++++++---
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
-index bacb8689892a..f3d0120db256 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
-+++ b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
-@@ -15,6 +15,7 @@
- #include "llvm/ADT/APInt.h"
- #include "llvm/ADT/STLExtras.h"
- #include "llvm/ADT/SmallVector.h"
-+#include "llvm/ADT/Triple.h"
- #include "llvm/Analysis/InstructionSimplify.h"
- #include "llvm/Analysis/ValueTracking.h"
- #include "llvm/IR/Constant.h"
-@@ -1363,9 +1364,12 @@ Instruction *InstCombinerImpl::visitAdd(BinaryOperator &I) {
-     }
-   }
- 
-  // A+B --> A|B iff A and B have no bits set in common.
-  if (haveNoCommonBitsSet(LHS, RHS, DL, &AC, &I, &DT))
-    return BinaryOperator::CreateOr(LHS, RHS);
-+  // Disable this transformation for ISPC SPIR-V
-+  if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
-+    // A+B --> A|B iff A and B have no bits set in common.
-+    if (haveNoCommonBitsSet(LHS, RHS, DL, &AC, &I, &DT))
-+      return BinaryOperator::CreateOr(LHS, RHS);
-+  }
- 
-   // add (select X 0 (sub n A)) A  -->  select X A n
-   {
-diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
-index 68c4156af2c4..b145b863ca84 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
-+++ b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
-@@ -2584,9 +2584,12 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
-   if (Instruction *FoldedLogic = foldBinOpIntoSelectOrPhi(I))
-     return FoldedLogic;
- 
-  if (Instruction *BSwap = matchBSwapOrBitReverse(I, /*MatchBSwaps*/ true,
-                                                  /*MatchBitReversals*/ false))
-    return BSwap;
-+  // Disable this transformation for ISPC SPIR-V
-+  if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
-+    if (Instruction *BSwap = matchBSwapOrBitReverse(I, /*MatchBSwaps*/ true,
-+                                                    /*MatchBitReversals*/ false))
-+      return BSwap;
-+  }
- 
-   if (Instruction *Funnel = matchFunnelShift(I, *this))
-     return Funnel;
-- 
-2.17.1
-
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0005-ispc-12_0_fix_for_2111.patch
+++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0005-ispc-12_0_fix_for_2111.patch
@ -1,35 +0,0 @@
-From 913e07ea5acf2148e3748b45ddfe3fac3b2d051c Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Fri, 27 Aug 2021 10:56:57 +0800
-Subject: [PATCH 2/2] This patch is a fix for #2111
-
-It ensures that shuffle is lowered for this particular case correctly.
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/9ab99f773fec7da4183495a3fdc655a797d3bea2]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- llvm/lib/Target/X86/X86ISelLowering.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
-index 6b816c710f98..3121b0e818ac 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
-+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
-@@ -43192,9 +43192,10 @@ static SDValue combineHorizOpWithShuffle(SDNode *N, SelectionDAG &DAG,
-           ShuffleVectorSDNode::commuteMask(ShuffleMask1);
-         }
-         if ((Op00 == Op10) && (Op01 == Op11)) {
-          SmallVector<int, 4> ShuffleMask;
-          ShuffleMask.append(ShuffleMask0.begin(), ShuffleMask0.end());
-          ShuffleMask.append(ShuffleMask1.begin(), ShuffleMask1.end());
-+          const int Map[4] = {0, 2, 1, 3};
-+          SmallVector<int, 4> ShuffleMask(
-+            {Map[ShuffleMask0[0]], Map[ShuffleMask1[0]], Map[ShuffleMask0[1]],
-+             Map[ShuffleMask1[1]]});
-           SDLoc DL(N);
-           MVT ShufVT = VT.isFloatingPoint() ? MVT::v4f64 : MVT::v4i64;
-           SDValue Res = DAG.getNode(Opcode, DL, VT, Op00, Op01);
-- 
-2.17.1
-
--- 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,11 +0,0 @@
-FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:"
-
-SRC_URI_LLVM12_PATCHES = " \
-                   file://llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch \
-                   file://llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch \
-                   file://llvm12-0003-Support-cl_ext_float_atomics.patch \
-                   file://llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch \
-                   file://llvm12-0005-ispc-12_0_fix_for_2111.patch \
-                   "
-
-SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}"
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch
@ -1,35 +1,34 @@
-From 40e9344d37d62158e6c9f72919f0595ef5fde61a Mon Sep 17 00:00:00 2001
+From 8c330d0cb5167612296801f0202b0de35e9ca88d Mon Sep 17 00:00:00 2001
 From: Dongwon Kim <dongwon.kim@intel.com>
 Date: Sat, 21 Aug 2021 16:09:39 -0700
-Subject: [PATCH] Build not able to locate cpp_generation_tool.
+Subject: [PATCH 2/5] Build not able to locate cpp_generation_tool.

 Upstream-Status: Inappropriate [oe specific]

 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
-
 ---
- shared/source/built_ins/kernels/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)

-diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
-index 769e2a100..eef25747e 100644
--- a/shared/source/built_ins/kernels/CMakeLists.txt
-+++ b/shared/source/built_ins/kernels/CMakeLists.txt
-@@ -94,9 +94,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo
-       )
+Index: git/shared/source/built_ins/kernels/CMakeLists.txt
+===================================================================
+--- git.orig/shared/source/built_ins/kernels/CMakeLists.txt
+++ git/shared/source/built_ins/kernels/CMakeLists.txt
+@@ -122,9 +122,9 @@ function(compile_builtin core_type platf
+       endif()
       add_custom_command(
                          OUTPUT ${OUTPUT_FILE_CPP}
-                         COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID}
-+                         COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID}
+-                         COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME}
+                         COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME}
                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 -                         DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool>
 +                         DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool
       )
       list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}")
     else()
-@@ -147,9 +147,9 @@ function(generate_cpp_spirv builtin)
-     )
+@@ -176,9 +176,9 @@ function(generate_cpp_spirv builtin)
+     endif()
     add_custom_command(
                        OUTPUT ${OUTPUT_FILE_CPP}
 -                       COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME}
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch
@ -0,0 +1,38 @@
+From 0006db5f55a9f08bd3452558a53704cd3bbb790f Mon Sep 17 00:00:00 2001
+From: Dongwon Kim <dongwon.kim@intel.com>
+Date: Wed, 2 Mar 2022 15:52:45 -0800
+Subject: [PATCH 3/5] external ocloc
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
+---
+ cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+Index: git/cmake/ocloc_cmd_prefix.cmake
+===================================================================
+--- git.orig/cmake/ocloc_cmd_prefix.cmake
+++ git/cmake/ocloc_cmd_prefix.cmake
+@@ -4,13 +4,15 @@
+ # SPDX-License-Identifier: MIT
+ #
+ 
+-if(WIN32)
+-  set(ocloc_cmd_prefix ocloc)
+-else()
+-  if(DEFINED NEO__IGC_LIBRARY_PATH)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
+if(NOT DEFINED ocloc_cmd_prefix)
+  if(WIN32)
+    set(ocloc_cmd_prefix ocloc)
+   else()
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
+    if(DEFINED NEO__IGC_LIBRARY_PATH)
+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+    else()
+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+    endif()
+   endif()
+ endif()
+ 
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
@ -1,40 +0,0 @@
-From 1189028d9f77265edf6258a66f8ecadf3aad556a Mon Sep 17 00:00:00 2001
-From: Dongwon Kim <dongwon.kim@intel.com>
-Date: Wed, 2 Mar 2022 15:52:45 -0800
-Subject: [PATCH] external ocloc
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
- cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake
-index 9b6bd3cd3..0aba48709 100644
--- a/cmake/ocloc_cmd_prefix.cmake
-+++ b/cmake/ocloc_cmd_prefix.cmake
-@@ -4,12 +4,14 @@
- # SPDX-License-Identifier: MIT
- #
- 
-if(WIN32)
-  set(ocloc_cmd_prefix ocloc)
-else()
-  if(DEFINED NEO__IGC_LIBRARY_PATH)
-    set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
-+if(NOT DEFINED ocloc_cmd_prefix)
-+  if(WIN32)
-+    set(ocloc_cmd_prefix ocloc)
-   else()
-    set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
-+    if(DEFINED NEO__IGC_LIBRARY_PATH)
-+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
-+    else()
-+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
-+    endif()
-   endif()
- endif()
-- 
-2.20.1
-
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb
@ -4,27 +4,22 @@ is an open source project to converge Intel's development efforts \
 on OpenCL(TM) compute stacks supporting the GEN graphics hardware \
 architecture."

-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9280143b568466d8fbe385f838078b93 \
-                    file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
+LICENSE = "MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
+                    file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

-SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=master \
-          "
+SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/25.13 \
+           file://0002-Build-not-able-to-locate-cpp_generation_tool.patch \
+           file://0003-external-ocloc.patch \
+           "

-SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
-                               file://external-ocloc.patch \
-                              "
+SRCREV = "a9961bdfaa07250fd52ff930bf8f31fb4e3b7799"

-SRCREV = "c0b7f05897bd5d1185f816c32f98fa2afcf36611"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += " intel-graphics-compiler gmmlib"
-DEPENDS:append:class-target = " intel-compute-runtime-native libva"
+DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native"

 RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"

-inherit cmake pkgconfig
+inherit cmake pkgconfig qemu

 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
@ -37,18 +32,23 @@ EXTRA_OECMAKE = " \
                 -DNEO_DISABLE_LD_LLD=ON \
                 -DNEO_DISABLE_LD_GOLD=ON \
                 "
-EXTRA_OECMAKE:append:class-native = " -DNEO_DISABLE_BUILTINS_COMPILATION=ON"

 EXTRA_OECMAKE:append:class-target = " \
                                     -Docloc_cmd_prefix=ocloc \
-                                    "
+                                     -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                                     "

 PACKAGECONFIG ??= ""
 PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"

-do_install:append:class-native() {
-    install -d ${D}${bindir}
-    install ${B}/bin/cpp_generate_tool ${D}${bindir}/
+do_configure:prepend:class-target () {
+    # Write out a qemu wrapper that will be used by cmake.
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${B}/bin'),d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
 }

 FILES:${PN} += " \
@ -58,6 +58,4 @@ FILES:${PN} += " \

 FILES:${PN}-dev = "${includedir}"

-BBCLASSEXTEND = "native nativesdk"
-
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
@ -1,4 +1,4 @@
-From 6f6997066040c5f33bf05ffde36a9800dcde1fcf Mon Sep 17 00:00:00 2001
+From 1b98a931c3bf8daccc48cd618335ff35e3d382da Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Tue, 12 Oct 2021 23:46:42 +0800
 Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@ -14,22 +14,19 @@ Upstream-Status: Inappropriate

 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-index 5d9a901d7..66e59e399 100644
--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-@@ -88,7 +88,7 @@ function(vc_embed_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
-   add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
-     COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
-     COMMENT "vc_embed_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
-    DEPENDS opt ${BIF_CMCL_BC_PATH})
-+    DEPENDS ${BIF_CMCL_BC_PATH})
-   add_custom_command(
-     OUTPUT ${BIF_CPP_PATH}
-     COMMAND ${PYTHON_EXECUTABLE} ${RESOURCE_EMBEDDER_SCRIPT} ${BIF_OPT_BC_NAME} ${BIF_CPP_NAME}
-- 
-2.32.0
-
+Index: git/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+===================================================================
+--- git.orig/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+++ git/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+@@ -121,7 +121,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_
+     COMMENT "vc_build_bif: Translating CMCL builtins:  ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}"
+     COMMAND CMCLTranslatorTool ${OPT_OPAQUE_ARG} -o ${BIF_CMCL_BC_PATH} ${BIF_CLANG_BC_PATH_FINAL}
+     COMMAND ${LLVM_OPT_EXE} ${OPT_OPAQUE_ARG} --O2 -o ${BIF_OPT_BC_PATH} ${BIF_CMCL_BC_PATH}
+-    DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${OPT_BC_DEPENDS})
+    DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL})
+ 
+   add_custom_target(${TARGET_NAME}
+     DEPENDS ${BIF_OPT_BC_PATH}
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch
@ -0,0 +1,27 @@
+From 048512728eea53b3772a3f80ac9743bfc462487e Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Thu, 2 Jan 2025 15:59:27 +0530
+Subject: [PATCH] Build not able to locate BiFManager-bin
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ IGC/BiFModule/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/IGC/BiFModule/CMakeLists.txt
+===================================================================
+--- git.orig/IGC/BiFModule/CMakeLists.txt
+++ git/IGC/BiFModule/CMakeLists.txt
+@@ -655,8 +655,8 @@ set(IGC_BUILD__PROJ__BiFModuleCache_OCL
+ 
+ add_custom_command(
+     OUTPUT "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc"
+-    COMMAND $<TARGET_FILE:BiFManager-bin> "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h"
+-    DEPENDS "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc"$<TARGET_FILE:BiFManager-bin>
+    COMMAND BiFManager-bin "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h"
+    DEPENDS "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc" BiFManager-bin
+     COMMENT "BiF: ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc: Spliting output .bc."
+     COMMAND_EXPAND_LISTS
+ )
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
@ -0,0 +1,30 @@
+From 251e2854dd206ebf66e5908d3277e4585fe2a63b Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Mon, 9 Jan 2023 11:43:05 +0800
+Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers
+
+We clone the SPIRV headers and tools in a different directory to ensure
+file path substitutions take place.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ external/SPIRV-Tools/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/external/SPIRV-Tools/CMakeLists.txt
+===================================================================
+--- git.orig/external/SPIRV-Tools/CMakeLists.txt
+++ git/external/SPIRV-Tools/CMakeLists.txt
+@@ -45,8 +45,8 @@ else() #By default use build from source
+  message(STATUS "[SPIRV-Tools] : Building from source")
+  message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+- set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory
+- set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Tools")
+ set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Headers") # used in subdirectory
+ set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Tools")
+ 
+  set(SPIRV-Tools_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR}/external/SPIRV-Tools/build")
+  set(IGC_BUILD__SPIRV-Headers_DIR "${SPIRV-Headers_SOURCE_DIR}")
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@ -0,0 +1,23 @@
+From 1641dc87b2ed6b6b87b2cef824e4d66da65b0b30 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Thu, 19 May 2022 22:50:09 +0800
+Subject: [PATCH] fix tblgen
+
+Upstream-Status: Inappropriate [OE specific]
+---
+ IGC/cmake/igc_llvm.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
+index b708cc904..fe4668890 100644
+--- a/IGC/cmake/igc_llvm.cmake
+++ b/IGC/cmake/igc_llvm.cmake
+@@ -53,7 +53,7 @@ else()
+   set(LLVM_OPT_EXE "opt" CACHE STRING "")
+ 
+   set(LLVM_TABLEGEN_EXE "llvm-tblgen")
+-  if(CMAKE_CROSSCOMPILING)
+  if(TRUE)
+     if(DEFINED LLVM_TABLEGEN)
+       set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
+     else()
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch
@ -1,29 +0,0 @@
-From 0088e843be66ed5f11388a9ef57f364a2a236584 Mon Sep 17 00:00:00 2001
-From: Dongwon Kim <dongwon.kim@intel.com>
-Date: Tue, 1 Mar 2022 17:05:01 -0800
-Subject: [PATCH] llvm-link external
-
-Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
- IGC/cmake/igc_llvm.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 80c83d4e0..85f7dda3d 100644
--- a/IGC/cmake/igc_llvm.cmake
-+++ b/IGC/cmake/igc_llvm.cmake
-@@ -29,7 +29,10 @@ if(LLVM_TABLEGEN_EXE-NOTFOUND)
-   message(FATAL_ERROR "[VC] llvm-tblgen is not found")
- endif()
- 
-set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
-+find_program(LLVM_LINK_EXE "llvm-link")
-+if(LLVM_LINK_EXE-NOTFOUND)
-+  message(FATAL_ERROR "[VC] llvm-link is not found")
-+endif()
- 
- include(AddLLVM)
- include(TableGen)
-- 
-2.20.1
-
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch
@ -1,35 +0,0 @@
-From 3d99559779d628704568879a2ee51e968e66d005 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Tue, 5 Oct 2021 00:11:26 +0800
-Subject: [PATCH] llvm_deps.cmake: don't copy header file when building
-
-We build in pre-built mode and this header shouldn't be copied in
-that case.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- external/llvm/llvm_deps.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/external/llvm/llvm_deps.cmake b/external/llvm/llvm_deps.cmake
-index 425d3766f..e43804f77 100644
--- a/external/llvm/llvm_deps.cmake
-+++ b/external/llvm/llvm_deps.cmake
-@@ -46,9 +46,9 @@ if(IGC_OPTION__LLVM_LLD)
-   include(llvm_lld_source_hook)
-   if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
-     # Need to copy one header from unwind package for LLD (only for building from sources)
-    file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
-    file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
-         DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
-+    #file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
-+    #file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
-+    #     DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
-   endif()
- endif()
- 
-- 
-2.32.0
-
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
@ -1,7 +1,7 @@
-From c2b7f30dd56568482b1b7c2f22bafdf68736fc88 Mon Sep 17 00:00:00 2001
+From ca136c04d4ac60e3febc8ea2b9c4d4736365a424 Mon Sep 17 00:00:00 2001
 From: Lee Chee Yang <chee.yang.lee@intel.com>
 Date: Wed, 2 Sep 2020 08:28:35 +0800
-Subject: [PATCH 3/5] Improve Reproducibility for src package
+Subject: [PATCH] Improve Reproducibility for src package

 Improve reproducibility for intel-graphics-compiler-src package.
 needs to pass build path as environment variable to the build.
@ -13,11 +13,11 @@ Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
 visa/CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

-diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index 65dbb4934..8cd607a69 100644
--- a/visa/CMakeLists.txt
-+++ b/visa/CMakeLists.txt
-@@ -123,8 +123,11 @@ endif()
+Index: git/visa/CMakeLists.txt
+===================================================================
+--- git.orig/visa/CMakeLists.txt
+++ git/visa/CMakeLists.txt
+@@ -135,8 +135,11 @@ endif()
 set(bison_output_file ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp)
 set(flex_output_file ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp)
 
@ -31,6 +31,3 @@ index 65dbb4934..8cd607a69 100644
 ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser)
 set(CISAScanner_dependencies)
 
-- 
-2.20.1
-
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch
@ -1,29 +0,0 @@
-From ac19bd37abccb697cc5fc9647be48de14185e9a2 Mon Sep 17 00:00:00 2001
-From: Dongwon Kim <dongwon.kim@intel.com>
-Date: Tue, 1 Mar 2022 15:23:36 -0800
-Subject: [PATCH] find external llvm-tblgen new
-
-Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
- IGC/cmake/igc_llvm.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 038a9ce3e..80c83d4e0 100644
--- a/IGC/cmake/igc_llvm.cmake
-+++ b/IGC/cmake/igc_llvm.cmake
-@@ -24,7 +24,10 @@ set(CMAKE_MODULE_PATH
-   ${CMAKE_MODULE_PATH}
-   )
- 
-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+if(LLVM_TABLEGEN_EXE-NOTFOUND)
-+  message(FATAL_ERROR "[VC] llvm-tblgen is not found")
-+endif()
- 
- set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
- 
-- 
-2.20.1
-
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
@ -1,23 +0,0 @@
-From 4369c970d4e02258b3c53e854faaa34197124a33 Mon Sep 17 00:00:00 2001
-From: Marcin Naczk <marcin.naczk@intel.com>
-Date: Tue, 22 Feb 2022 13:09:54 +0000
-Subject: [PATCH]  Upgrade github Action build IGC
-
- Fix build IGC on Ubuntu 22.04 by adding missing include
-
-Upstream-Status: Backport
-Part of: https://github.com/intel/intel-graphics-compiler/commit/4369c970d4e02258b3c53e854faaa34197124a33
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
-diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
-index 6a2de51ee02..4a6fd8735ce 100644
--- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp
-+++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
-@@ -15,6 +15,7 @@ SPDX-License-Identifier: MIT
- #include "Operand.hpp"
- #include "../ErrorHandler.hpp"
- #include "RegDeps.hpp"
-+#include <limits>
- 
- namespace iga
- {
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
@ -1,25 +0,0 @@
-From 4f510460beb630bac74fad399370b76354fdbd65 Mon Sep 17 00:00:00 2001
-From: Bruno Pagani <bruno.n.pagani@gmail.com>
-Date: Mon, 21 Feb 2022 12:32:25 +0000
-Subject: [PATCH]  Fix missing include
-
-Same as 6c805b2
-
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- visa/LocalScheduler/SWSB_G4IR.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/visa/LocalScheduler/SWSB_G4IR.cpp b/visa/LocalScheduler/SWSB_G4IR.cpp
-index 153d8a7dc58..cea75c7faa7 100644
--- a/visa/LocalScheduler/SWSB_G4IR.cpp
-+++ b/visa/LocalScheduler/SWSB_G4IR.cpp
-@@ -16,6 +16,7 @@ SPDX-License-Identifier: MIT
- #include <algorithm>
- #include <fstream>
- #include <functional>
-+#include <limits>
- #include <sstream>
- #include <queue>
- 
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb
@ -1,70 +0,0 @@
-SUMMARY = "The Intel(R) Graphics Compiler for OpenCL(TM)"
-DESCRIPTION = "The Intel(R) Graphics Compiler for OpenCL(TM) is an \
-llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \
-hardware architecture."
-
-LICENSE = "MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
-                    file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=23;md5=4a985f2545dd5a846e205b1e60a51cd9 \
-                    file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
-
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=master \
-           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \
-           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=master \
-           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
-           file://0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch \
-           file://0003-Improve-Reproducibility-for-src-package.patch \
-           file://0004-find-external-llvm-tblgen.patch \
-           file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
-           file://0001-llvm-link-external.patch \
-           file://fix-header.patch \
-           file://4369c970d4e02258b3c53e854faaa34197124a33.patch \
-           "
-
-SRCREV_igc = "775a850f9b0c2d7249503b47ad6bd39a4eb9b3d7"
-SRCREV_vc = "5066d947985dd0c5107765daec5f24f735f3259a"
-SRCREV_spirv-tools = "eeb973f5020a5f0e92ad6da879bc4df9f5985a1c"
-SRCREV_spirv-headers = "ae217c17809fadb232ec94b29304b4afcd417bb4"
-
-# Used to replace with relative path in reproducibility patch
-export B
-
-S = "${WORKDIR}/git"
-
-inherit cmake pkgconfig
-
-CXXFLAGS:append = " -Wno-error=nonnull"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-DEPENDS += " flex-native bison-native clang opencl-clang"
-DEPENDS:append:class-target = " clang-cross-x86_64 intel-graphics-compiler-native"
-
-RDEPENDS:${PN} += "opencl-clang"
-
-PACKAGECONFIG ??= "vc"
-PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON -DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_VC=ON -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds,-DIGC_BUILD__VC_ENABLED=OFF,"
-
-EXTRA_OECMAKE = " \
-                  -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \
-                  -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-                  -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \
-                  -DIGC_OPTION__LLVM_MODE=Prebuilds \
-                  "
-
-do_install:append:class-native () {
-    install -d ${D}${bindir}
-    install ${B}/IGC/Release/elf_packager ${D}${bindir}/
-    if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then
-        install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/
-    fi
-}
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
-
-FILES:${PN} += " \
-                 ${libdir}/igc/NOTICES.txt \
-                 "
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
@ -0,0 +1,77 @@
+SUMMARY = "The Intel(R) Graphics Compiler for OpenCL(TM)"
+DESCRIPTION = "The Intel(R) Graphics Compiler for OpenCL(TM) is an \
+llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \
+hardware architecture."
+
+LICENSE = "MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
+                    file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
+                    file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880"
+
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/2.10.x \
+           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vc-intrinsics;name=vc;nobranch=1 \
+           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/SPIRV-Tools;name=spirv-tools;branch=main \
+           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/SPIRV-Headers;name=spirv-headers;branch=main \
+           file://0003-Improve-Reproducibility-for-src-package.patch \
+           file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
+           file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \
+           file://0001-Build-not-able-to-locate-BiFManager-bin.patch \
+           "
+
+SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
+
+SRCREV_igc = "83925314d4fc32b017fcbfcd73e0667ba833fb8f"
+SRCREV_vc = "9d255266e1df8f1dc5d11e1fbb03213acfaa4fc7"
+SRCREV_spirv-tools = "f289d047f49fb60488301ec62bafab85573668cc"
+SRCREV_spirv-headers = "0e710677989b4326ac974fd80c5308191ed80965"
+
+SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
+
+# Used to replace with relative path in reproducibility patch
+export B
+
+inherit cmake pkgconfig qemu python3native
+
+CXXFLAGS:append = " -Wno-error=nonnull"
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+
+DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native \
+             python3-pyyaml-native \
+           "
+
+RDEPENDS:${PN} += "opencl-clang"
+
+PACKAGECONFIG ??= "vc"
+PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds,-DIGC_BUILD__VC_ENABLED=OFF,"
+
+EXTRA_OECMAKE = " \
+                  -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \
+                  -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \
+                  -DIGC_OPTION__LLVM_MODE=Prebuilds \
+                  -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \
+                  -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                  "
+
+do_configure:prepend:class-target () {
+    # Write out a qemu wrapper that will be used by cmake.
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
+}
+
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
+
+FILES:${PN} += " \
+                 ${libdir}/igc2/NOTICES.txt \
+                 "
+
+# libigc.so contains buildpaths
+INSANE_SKIP:${PN} += "buildpaths"
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch
@ -0,0 +1,49 @@
+From 5aea653e611b59c70e529a1bd71885a509831557 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Tue, 1 Aug 2023 11:15:31 +0800
+Subject: [PATCH] cl_headers/CMakeLists.txt: use clang from native sysroot
+
+Allow clang to be found in target sysroot for target builds and dont try
+to compile cross binaries, we do that ourselves.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt            | 8 ++++----
+ cl_headers/CMakeLists.txt | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5864009..60ba39e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -35,10 +35,10 @@ set(CMAKE_MODULE_PATH
+ 
+ include(CMakeFunctions)
+ 
+-if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+-  include(CrossCompile)
+-  llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+-endif()
+#if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+#  include(CrossCompile)
+#  llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+#endif()
+ 
+ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+     set(USE_PREBUILT_LLVM ON)
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 16cabb7..4423536 100644
+--- a/cl_headers/CMakeLists.txt
+++ b/cl_headers/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ set(CL_HEADERS_LIB cl_headers)
+ if(USE_PREBUILT_LLVM)
+-    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
+    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR})
+ else()
+     set(CLANG_COMMAND $<TARGET_FILE:clang>)
+ endif()
+-- 
+2.37.3
+
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
@ -1,32 +0,0 @@
-From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 2 Apr 2020 08:59:20 +0800
-Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE
-
-Use the value that has been passed by the user.
-
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6893e97..941b0ae 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM)
- set (COMPILE_OPTIONS_TD  opencl_clang_options.td)
- set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
- 
-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+if(NOT DEFINED LLVM_TABLEGEN_EXE)
-+  set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+endif()
-+
- set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
- if(USE_PREBUILT_LLVM)
-   set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
-- 
-2.25.1
-
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch
@ -0,0 +1,60 @@
+From 43c806ef321b1f677a49d28c89fb7ffecf539c2d Mon Sep 17 00:00:00 2001
+From: Tim Creech <timothy.m.creech@intel.com>
+Date: Wed, 28 Jun 2023 03:45:51 -0400
+Subject: [PATCH 2/2] Request native clang only when cross-compiling (#464)
+
+* Request native clang only when cross-compiling
+
+LLVM_USE_HOST_TOOLS may be set if LLVM is configured with
+LLVM_OPTIMIZED_TABLEGEN, which does not necessarily indicate
+cross-compilation or that clang will only execute on the target.
+
+By checking that CMAKE_CROSSCOMPILING is set, we ensure that we only
+build/use clang again if necessary for host execution.
+
+* fixup: CMAKE_CROSSCOMPILING implies LLVM_USE_HOST_TOOLS
+
+Co-authored-by: Wenju He <wenju.he@intel.com>
+
+* fixup: also use CMAKE_CROSSCOMPILING in top-level CMakeLists.txt
+
+---------
+
+Co-authored-by: Wenju He <wenju.he@intel.com>
+
+Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/53843eee13cfb2357919ee02714a43bef1af0f86]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt            | 2 +-
+ cl_headers/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e772de9..5864009 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(CMAKE_MODULE_PATH
+ 
+ include(CMakeFunctions)
+ 
+-if(LLVM_USE_HOST_TOOLS AND OPENCL_CLANG_BUILD_EXTERNAL)
+if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+   include(CrossCompile)
+   llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+ endif()
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 18296c2..16cabb7 100644
+--- a/cl_headers/CMakeLists.txt
+++ b/cl_headers/CMakeLists.txt
+@@ -4,7 +4,7 @@ if(USE_PREBUILT_LLVM)
+ else()
+     set(CLANG_COMMAND $<TARGET_FILE:clang>)
+ endif()
+-if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+if(CMAKE_CROSSCOMPILING AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+   build_native_tool(clang CLANG_COMMAND)
+ endif()
+ 
+-- 
+2.37.3
+
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
@ -6,8 +6,9 @@ LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c"

 SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \
+           file://0002-Request-native-clang-only-when-cross-compiling-464.patch \
+           file://0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch \
           "
-S = "${WORKDIR}/git"

 inherit cmake
 DEPENDS += "clang"
@ -16,9 +17,17 @@ DEPENDS:append:class-target = " opencl-clang-native"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"

+DEPENDS += " spirv-llvm-translator"
+
+EXTRA_OECMAKE += "\
+                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DCMAKE_SKIP_RPATH=TRUE \
+                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
+                  "
+
 do_install:append:class-native() {
        install -d ${D}${bindir}
-        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
+        install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/
 }

 BBCLASSEXTEND = "native nativesdk"
--- 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
@ -1,12 +0,0 @@
-require opencl-clang.inc
-
-SRCREV = "8fc6b059248dc6c9c40c7cbe5fedcc6ebb951983"
-
-DEPENDS += " spirv-llvm-translator"
-
-BRANCH = "ocl-open-120"
-
-EXTRA_OECMAKE += "\
-                  -DCMAKE_SKIP_RPATH=TRUE \
-                  -DPREFERRED_LLVM_VERSION="12.0.0" \
-                  "
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
@ -1,15 +0,0 @@
-require opencl-clang.inc
-
-SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \
-           "
-SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f"
-
-BRANCH = "ocl-open-140"
-
-DEPENDS += " spirv-llvm-translator"
-
-EXTRA_OECMAKE += "\
-                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-                  -DCMAKE_SKIP_RPATH=TRUE \
-                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
-                  "
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
@ -0,0 +1,5 @@
+require opencl-clang.inc
+
+SRCREV = "60fd799cc58755c16d951f9ebfde6d0f9b8554dd"
+
+BRANCH = "ocl-open-150"
--- 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
@ -1,24 +0,0 @@
-SUMMARY = "VC Intrinsics"
-DESCRIPTION = "VC Intrinsics project contains a set of new intrinsics on \
-top of core LLVM IR instructions that represent SIMD semantics of a program \
-targeting GPU"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc"
-
-SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;;branch=master \
-          "
-SRCREV = "a2f2f10dc61c8161c57cf33ed606c8e3ccf3a921"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-DEPENDS += "  clang"
-
-EXTRA_OECMAKE = "-DLLVM_DIR=${STAGING_LIBDIR}"
-
-BBCLASSEXTEND = "native nativesdk"
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2021.4.2.bb
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2021.4.2.bb
@ -1,36 +0,0 @@
-SUMMARY = "OpenVINO Model Optimzer"
-DESCRIPTION = "Model Optimizer is a cross-platform command-line tool that \
-facilitates the transition between the training and deployment \
-environment, performs static model analysis, and adjusts deep \
-learning models for optimal execution on end-point target devices."
-HOMEPAGE = "https://01.org/openvinotoolkit"
-
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2021/4;lfs=0 \
-           "
-SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-CVE_PRODUCT = "intel:openvino"
-
-S = "${WORKDIR}/git"
-
-do_install() {
-        mkdir -p ${D}${datadir}/openvino/model-optimizer
-        cp -r model-optimizer ${D}${datadir}/openvino/
-}
-
-RDEPENDS:${PN} += " \
-                    python3-numpy \
-                    python3-protobuf \
-                    python3-defusedxml \
-                    python3-networkx \
-                    python3-requests \
-                    python3-urllib3 \
-                    bash \
-                    "
-
-FILES:${PN} += "${datadir}/openvino"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-LMS-fix-build-issue-with-gcc-15.patch
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-LMS-fix-build-issue-with-gcc-15.patch
@ -0,0 +1,32 @@
+From 439af27f7641185933d7810b6c4eb17086438df3 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Mon, 19 May 2025 17:50:40 +0530
+Subject: [PATCH] LMS : fix build issue with gcc 15
+
+include cstdint header to resolve the below error with gcc 15
+
+| In file included from /lms/2406.0.0.0/git/MEIClient/src/MEICommand.cpp:11:
+| /lms/2406.0.0.0/git/MEIClient/Include/MEICommand.h:40:54: error: 'uint8_t' was not declared in this scope
+
+Upstream-Status: Submitted [https://github.com/intel/lms/pull/23]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ MEIClient/Include/MEICommand.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/MEIClient/Include/MEICommand.h b/MEIClient/Include/MEICommand.h
+index 6192d26..5332e44 100644
+--- a/MEIClient/Include/MEICommand.h
+++ b/MEIClient/Include/MEICommand.h
+@@ -12,6 +12,7 @@
+ #define __MEI_COMMAND_H__
+ #include "heci.h"
+ #include "MEIClientException.h"
+#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 
+-- 
+2.43.0
+
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@ -10,30 +10,28 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'

 COMPATIBLE_HOST:libc-musl = "null"

-inherit cmake systemd features_check
+inherit cmake systemd features_check python3native

-DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native"
-
-EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3"
+DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native"

 # Enable either connman or networkmanager or none but not both.
 PACKAGECONFIG ??= "connman"
 PACKAGECONFIG[connman]        = "-DNETWORK_CN=ON, -DNETWORK_CN=OFF, connman"
 PACKAGECONFIG[networkmanager] = "-DNETWORK_NM=ON, -DNETWORK_NM=OFF, networkmanager"

-REQUIRED_DISTRO_FEATURES= "systemd"
+REQUIRED_DISTRO_FEATURES = "systemd"

 FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"

-S = "${WORKDIR}/git"
-
 SYSTEMD_SERVICE:${PN} = "lms.service"

 SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \
+           file://0001-LMS-fix-build-issue-with-gcc-15.patch \
           "
-SRCREV = "cda6a25e0f39b2a18f10415560ee6a2cfc5fbbcb"
+SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47"

 do_install:append() {
+    install -d ${D}${sysconfdir}/lms
    install -d ${D}${systemd_system_unitdir}
    install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir}
    install -d ${D}${sysconfdir}/udev/rules.d
@ -42,5 +40,4 @@ do_install:append() {

 RDEPENDS:${PN} += "ace"

-# This CVE is for Lan Management System software and not this lms.
-CVE_CHECK_IGNORE += "CVE-2018-1000535"
+CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System."
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
@ -7,14 +7,15 @@ compensation using available cooling methods."
 HOMEPAGE = "https://github.com/01org/thermal_daemon"

 DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev"
+DEPENDS += "autoconf-archive-native"
+
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"

 SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
           "

-SRCREV = "f04746138602c623558be0561e4d1a37579710c7"
-S = "${WORKDIR}/git"
+SRCREV = "df3b9ab0ffe780c4fbad7750987eff76f659cfd5"

 inherit pkgconfig autotools systemd gtk-doc

@ -28,7 +29,7 @@ EXTRA_OECONF = " \
                 --with-systemdsystemunitdir=${systemd_system_unitdir} \
                 "

-FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
+FILES:${PN} += "${datadir}/dbus-1"

 SYSTEMD_SERVICE:${PN} = "thermald.service"

--- a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch
@ -0,0 +1,53 @@
+From deccc0c69c2c8759c52885be8bdda54d3cee481c Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Sun, 11 Dec 2022 22:34:15 +0800
+Subject: [PATCH] Add print function to print test run status in ptest format
+
+Upstream-Status: Inappropriate [OE ptest specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ run_tests.py | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/run_tests.py b/run_tests.py
+index 1cd796dd..e3ffd1ab 100755
+--- a/run_tests.py
+++ b/run_tests.py
+@@ -327,6 +327,9 @@ def run_test(testname, host, target):
+     else:
+         ispc_exe_rel = add_prefix(host.ispc_cmd, host, target)
+ 
+    # to reslove the error '.rodata' can not be used when making a PIE object
+    ispc_exe_rel = ispc_exe_rel + " --pic"
+
+     # is this a test to make sure an error is issued?
+     want_error = (filename.find("tests_errors") != -1)
+     if want_error == True:
+@@ -795,6 +798,17 @@ def check_compiler_exists(compiler_exe):
+             return
+     error("missing the required compiler: %s \n" % compiler_exe, 1)
+ 
+def print_test_run_status(results):
+    for fstatus in results:
+       if (fstatus[1]  ==  Status.Success):
+          print( "%s: %s" % ("PASS", fstatus[0]))
+       elif (fstatus[1] ==  Status.Compfail):
+          print( "%s: %s" % ("FAIL", fstatus[0]))
+       elif (fstatus[1] ==  Status.Runfail):
+          print( "%s: %s" % ("FAIL", fstatus[0]))
+       elif (fstatus[1] ==  Status.Skip):
+          print( "%s: %s" % ("SKIP", fstatus[0]))
+
+ def print_result(status, results, s, run_tests_log, csv):
+     title = StatusStr[status]
+     file_list = [fname for fname, fstatus in results if status == fstatus]
+@@ -938,6 +952,8 @@ def run_tests(options1, args, print_version):
+         pass_rate = -1
+     print_debug("PASSRATE (%d/%d) = %d%% \n\n" % (len(run_succeed_files), total_tests_executed, pass_rate), s, run_tests_log)
+ 
+    print_test_run_status(results)
+
+     for status in Status:
+         print_result(status, results, s, run_tests_log, options.csv)
+     fails = [status != Status.Compfail and status != Status.Runfail for _, status in results]
--- a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
@ -0,0 +1,36 @@
+From 7beff95c11071170eb27b6fa7d0cc77588caee8e Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Tue, 26 Jul 2022 15:25:10 +0800
+Subject: [PATCH] Fix QA Issues
+
+Stop ispc from inserting host file path in generated headers which leads to reproducibility problems.
+
+Upstream-Status: Inappropriate [OE build specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ src/module.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/module.cpp b/src/module.cpp
+index e2084d2e..e2626865 100644
+--- a/src/module.cpp
+++ b/src/module.cpp
+@@ -2555,7 +2555,7 @@ bool Module::writeHeader(const char *fn) {
+         perror("fopen");
+         return false;
+     }
+-    fprintf(f, "//\n// %s\n// (Header automatically generated by the ispc compiler.)\n", fn);
+    fprintf(f, "//\n// \n// (Header automatically generated by the ispc compiler.)\n");
+     fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n");
+ 
+     // Create a nice guard string from the filename, turning any
+@@ -2677,7 +2677,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) {
+     FILE *f = DHI->file;
+ 
+     if (DHI->EmitFrontMatter) {
+-        fprintf(f, "//\n// %s\n// (Header automatically generated by the ispc compiler.)\n", DHI->fn);
+        fprintf(f, "//\n// \n// (Header automatically generated by the ispc compiler.)\n");
+         fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n");
+     }
+     // Create a nice guard string from the filename, turning any
--- a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
@ -1,4 +1,4 @@
-From 493e886d6dae2ed7bdc12ed03f717ee0e98dfe09 Mon Sep 17 00:00:00 2001
+From 16a2c22339287122d2c25d8bb33a5a51b4e6ee51 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Thu, 24 Feb 2022 20:01:11 +0530
 Subject: [PATCH] cmake: don't build for 32-bit targets
@ -16,14 +16,14 @@ Upstream-Status: Inappropriate

 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- cmake/GenerateBuiltins.cmake | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ cmake/GenerateBuiltins.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
-index fa228247..7adc7e52 100644
+index f84494ed..d90cb1ec 100644
 --- a/cmake/GenerateBuiltins.cmake
 +++ b/cmake/GenerateBuiltins.cmake
-@@ -272,7 +272,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
+@@ -253,7 +253,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
             #   In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up
             #   by clang by default. So the following line adds such path explicitly. If this path doesn't exist and
             #   the headers can be found in other locations, this should not be a problem.
@ -32,7 +32,7 @@ index fa228247..7adc7e52 100644
         endif()
     endif()
 
-@@ -354,7 +354,7 @@ function (generate_target_builtins resultList)
+@@ -339,7 +339,7 @@ function (generate_target_builtins resultList)
     set(regular_targets ${ARGN})
     list(FILTER regular_targets EXCLUDE REGEX wasm)
     foreach (ispc_target ${regular_targets})
@ -41,24 +41,12 @@ index fa228247..7adc7e52 100644
             foreach (os_name ${TARGET_OS_LIST_FOR_LL})
                 target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit})
                 list(APPEND tmpList ${output${os_name}${bit}})
-@@ -415,7 +415,7 @@ function (generate_common_builtins resultList)
+@@ -405,7 +405,7 @@ function (generate_common_builtins resultList)
     endif()
 
     message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}")
 -    foreach (bit 32 64)
 +    foreach (bit 64)
         foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web")
-             foreach (arch "x86" "arm" "wasm32")
+             foreach (arch "x86" "arm" "wasm")
                 builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
-@@ -428,7 +428,7 @@ function (generate_common_builtins resultList)
-         endforeach()
-     endforeach()
-     if (XE_ENABLED)
-        foreach (bit 32 64)
-+        foreach (bit 64)
-             builtin_xe_to_cpp(${bit} res_xe_${bit})
-             list(APPEND tmpList ${res_xe_${bit}} )
-             if(MSVC)
-- 
-2.17.1
-
--- a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
@ -0,0 +1,2 @@
+#!/bin/sh
+python3 run_tests.py
--- a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.24.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.24.0.bb
@ -0,0 +1,62 @@
+SUMMARY  = "Intel(R) Implicit SPMD Program Compiler"
+DESCRIPTION = "ispc is a compiler for a variant of the C programming language, \
+with extensions for single program, multiple data programming."
+HOMEPAGE = "https://github.com/ispc/ispc"
+
+LICENSE  = "BSD-3-Clause & Apache-2.0-with-LLVM-exception"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \
+                    file://third-party-programs.txt;md5=2061218c7be521556719c8b504bf9ddd"
+
+inherit cmake python3native ptest
+
+SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
+           file://0002-cmake-don-t-build-for-32-bit-targets.patch \
+           file://0001-Fix-QA-Issues.patch \
+           file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \
+           file://run-ptest \
+           "
+
+SRCREV = "d394222aef59e4759b06e39ec160e4aba6ee5f40"
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+
+DEPENDS += " clang-native bison-native flex-native"
+DEPENDS:append:class-target = " clang"
+RDEPENDS:${PN}-ptest += " python3-multiprocessing"
+
+PACKAGECONFIG ??= "tbb"
+PACKAGECONFIG[tbb] = "-DISPCRT_BUILD_TASK_MODEL=TBB, -DISPCRT_BUILD_TASK_MODEL=OpenMP, tbb"
+
+YFLAGS = '-d -t -v -y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}'
+
+do_configure:prepend() {
+        sed -i -e 's#\${BISON_EXECUTABLE}.*#\${BISON_EXECUTABLE} ${YFLAGS} #g' ${S}/CMakeLists.txt
+        sed -i -e 's#\${FLEX_EXECUTABLE}.*#\${FLEX_EXECUTABLE} \-L #g' ${S}/CMakeLists.txt
+}
+
+do_install_ptest() {
+        cp -rf ${S}/run_tests.py ${D}${PTEST_PATH}
+        cp -rf ${S}/common.py ${D}${PTEST_PATH}
+        cp -rf ${S}/tests ${D}${PTEST_PATH}
+        cp -rf ${S}/test_static.isph ${D}${PTEST_PATH}
+        cp -rf ${S}/fail_db.txt ${D}${PTEST_PATH}
+        cp -rf ${S}/test_static.cpp ${D}${PTEST_PATH}
+}
+
+EXTRA_OECMAKE += " \
+                  -DISPC_INCLUDE_TESTS=OFF  \
+                  -DISPC_INCLUDE_EXAMPLES=OFF  \
+                  -DARM_ENABLED=OFF  \
+                  -DISPC_CROSS=ON  \
+                  -DISPC_ANDROID_TARGET=OFF  \
+                  -DISPC_FREEBSD_TARGET=OFF  \
+                  -DISPC_WINDOWS_TARGET=OFF  \
+                  -DISPC_IOS_TARGET=OFF  \
+                  -DISPC_PS_TARGET=OFF  \
+                  -DSYSROOT_DIR=${STAGING_DIR} \
+                  -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
+                  -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
+                  "
+
+BBCLASSEXTEND = "native nativesdk"
--- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.21.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.21.1.bb
@ -1,32 +1,10 @@
-# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
-# The following is the difference between the old and the new license text.
-# Please update the LICENSE value if needed, and summarize the changes in
-# the commit message via 'License-Update:' tag.
-# (example: 'License-Update: copyright years updated.')
-#
-# The changes:
-#
-# --- LICENSE
-# +++ LICENSE
-# @@ -1,6 +1,6 @@
-#  MIT License
-#  
-# -Copyright (c) 2019 Intel Corporation
-# +Copyright (C) 2019-2021 Intel Corporation
-#  
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-# 
-#
-
 SUMMARY = "oneAPI Level Zero Specification Headers and Loader"
 HOMEPAGE = "https://github.com/oneapi-src/level-zero"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc"

 SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master"
-SRCREV = "78f08cc338d70ac60a8f61084ad194fa0dbc90b0"
-S = "${WORKDIR}/git"
+SRCREV = "9536683855b17a21508e5b54ba358225d6a976da"

 inherit cmake
 DEPENDS += "opencl-headers"
@ -51,3 +29,4 @@ FILES:${PN}-loader = "${libdir}"
 INSANE_SKIP:${PN}-loader = "dev-so"
 INSANE_SKIP:${PN}-samples = "dev-so"
 ALLOW_EMPTY:${PN} = "1"
+BBCLASSEXTEND = "native nativesdk"
--- a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
@ -0,0 +1,99 @@
+From b57297c14d94dac9bdef7570b7b33d70b10171f3 Mon Sep 17 00:00:00 2001
+From: Jozef Wludzik <jozef.wludzik@intel.com>
+Date: Tue, 26 Mar 2024 14:43:29 +0100
+Subject: [PATCH 1/2] Fix the compilation warning when using gcc-13 (#25)
+
+Added missing headers. Fixed compilation error about casting from
+unsigned to signed int.
+
+Upstream-Status: Backport [https://github.com/intel/linux-npu-driver/commit/4bcbf2abe94eb4d9c083bd616b58e309a82d008a]
+
+Signed-off-by: Jozef Wludzik <jozef.wludzik@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp | 7 ++++---
+ umd/vpu_driver/include/umd_common.hpp                  | 1 +
+ validation/umd-test/umd_prime_buffers.h                | 9 +++++++--
+ validation/umd-test/utilities/data_handle.h            | 1 +
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+index f206ebe..682e5b4 100644
+--- a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+++ b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+@@ -5,12 +5,13 @@
+  *
+  */
+ 
+-#include <dlfcn.h>
+-#include <memory>
+-
+ #include "vpux_driver_compiler.h"
+ #include "vpu_driver/source/utilities/log.hpp"
+ 
+#include <array>
+#include <dlfcn.h>
+#include <memory>
+
+ class Vcl {
+   public:
+     static Vcl &sym() {
+diff --git a/umd/vpu_driver/include/umd_common.hpp b/umd/vpu_driver/include/umd_common.hpp
+index 0c874a3..5ad9be2 100644
+--- a/umd/vpu_driver/include/umd_common.hpp
+++ b/umd/vpu_driver/include/umd_common.hpp
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
+#include <cstdint>
+ #include <limits>
+ #include <linux/kernel.h>
+ #include <stdexcept>
+diff --git a/validation/umd-test/umd_prime_buffers.h b/validation/umd-test/umd_prime_buffers.h
+index 6f7c7de..ab4814c 100644
+--- a/validation/umd-test/umd_prime_buffers.h
+++ b/validation/umd-test/umd_prime_buffers.h
+@@ -6,12 +6,17 @@
+  */
+ 
+ #pragma once
+
+#include "umd_test.h"
+
+ #include <fcntl.h>
+-#include <linux/kernel.h>
+ #include <linux/dma-buf.h>
+ #include <linux/dma-heap.h>
+#include <linux/kernel.h>
+#include <stdint.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+#include <unistd.h>
+ 
+ #define ALLIGN_TO_PAGE(x) __ALIGN_KERNEL((x), (UmdTest::PAGE_SIZE))
+ 
+@@ -60,7 +65,7 @@ class PrimeBufferHelper {
+             return false;
+ 
+         bufferFd = heapAlloc.fd;
+-        buffers.insert({heapAlloc.fd, {size, nullptr}});
+        buffers.insert({static_cast<int>(heapAlloc.fd), {size, nullptr}});
+         return true;
+     }
+ 
+diff --git a/validation/umd-test/utilities/data_handle.h b/validation/umd-test/utilities/data_handle.h
+index d6e0ec0..5d937b2 100644
+--- a/validation/umd-test/utilities/data_handle.h
+++ b/validation/umd-test/utilities/data_handle.h
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <linux/kernel.h>
+#include <stdint.h>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.43.0
+
--- a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
@ -0,0 +1,28 @@
+From 561e3b5edc0ec3d8835aaf8ef8e5c9e8f9b53061 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Wed, 28 May 2025 13:35:18 +0800
+Subject: [PATCH] linux-npu-driver : fix multilib install issue
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ firmware/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
+index 0c093ca..ba346a0 100644
+--- a/firmware/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
+@@ -12,7 +12,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE include)
+ file(GLOB FIRMWARE_BINARIES ${CMAKE_CURRENT_SOURCE_DIR}/bin/*.bin)
+ if (FIRMWARE_BINARIES)
+   install(FILES ${FIRMWARE_BINARIES}
+-    DESTINATION /lib/firmware/updates/intel/vpu/
+    DESTINATION ${CMAKE_INSTALL_FIRMWARE_DIR}/firmware/updates/intel/vpu/
+     PERMISSIONS OWNER_READ
+     COMPONENT fw-npu)
+ endif()
+-- 
+2.37.3
+
--- a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
@ -0,0 +1,110 @@
+From a9f51fd88effb7d324609e692ca7da576d6dad2e Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Tue, 28 May 2024 10:23:42 +0800
+Subject: [PATCH 2/2] Fix compilation failure with GCC-14
+
+umd/level_zero_driver/core/source/event/event.cpp:65:31: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'?
+|    65 |     associatedJobs.erase(std::remove_if(associatedJobs.begin(),
+|       |                               ^~~~~~~~~
+|       |                               remove_cv
+
+| umd/vpu_driver/source/command/vpu_command.cpp: In member function 'void VPU::VPUCommand::appendAssociateBufferObject(VPU::VPUBufferObject*)':
+| umd/vpu_driver/source/command/vpu_command.cpp:126:20: error: 'find' is not a member of 'std'; did you mean 'bind'?
+|   126 |     auto it = std::find(bufferObjects.begin(), bufferObjects.end(), bo);
+|       |                    ^~~~
+|       |                    bind
+
+| umd/vpu_driver/source/command/vpu_command_buffer.cpp: In member function 'bool VPU::VPUCommandBuffer::addCommand(VPU::VPUCommand*, uint64_t&, uint64_t&)':
+| umd/vpu_driver/source/command/vpu_command_buffer.cpp:185:24: error: 'find' is not a member of 'std'; did you mean 'bind'?
+|   185 |         auto it = std::find(bufferHandles.begin(), bufferHandles.end(), bo->getHandle());
+|       |                        ^~~~
+|       |                        bind
+
+| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:301:32: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'?
+|   301 |                           std::max_element(stride_begin + TENSOR_5D_STRIDE_C, stride_end));
+|       |                                ^~~~~~~~~~~
+|       |                                tuple_element
+| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:315:37: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'?
+|   315 |         auto max_stride_val = *std::max_element(stride_begin + TENSOR_4D_STRIDE_C, stride_end);
+|       |                                     ^~~~~~~~~~~
+
+| umd/level_zero_driver/tools/source/metrics/metric.cpp: In member function 'void L0::MetricContext::deactivateMetricGroups(int)':
+| umd/level_zero_driver/tools/source/metrics/metric.cpp:275:38: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'?
+|   275 |     activatedMetricGroups.erase(std::remove_if(activatedMetricGroups.begin(),
+|       |                                      ^~~~~~~~~
+|       |                                      remove_cv
+
+Upstream-Status: Submitted [https://github.com/intel/linux-npu-driver/pull/30]
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ umd/level_zero_driver/core/source/event/event.cpp     | 1 +
+ umd/level_zero_driver/ext/source/graph/elf_parser.cpp | 1 +
+ umd/level_zero_driver/tools/source/metrics/metric.cpp | 1 +
+ umd/vpu_driver/source/command/vpu_command.cpp         | 1 +
+ umd/vpu_driver/source/command/vpu_command_buffer.cpp  | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/umd/level_zero_driver/core/source/event/event.cpp b/umd/level_zero_driver/core/source/event/event.cpp
+index a92248f..196d176 100644
+--- a/umd/level_zero_driver/core/source/event/event.cpp
+++ b/umd/level_zero_driver/core/source/event/event.cpp
+@@ -14,6 +14,7 @@
+ 
+ #include <level_zero/ze_api.h>
+ #include <thread>
+#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+index a1c8e14..dfbd61d 100644
+--- a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+++ b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+@@ -21,6 +21,7 @@
+ #include <vpux_headers/metadata.hpp>
+ #include <vpux_elf/types/vpu_extensions.hpp>
+ #include <vpux_elf/utils/error.hpp>
+#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/level_zero_driver/tools/source/metrics/metric.cpp b/umd/level_zero_driver/tools/source/metrics/metric.cpp
+index b67750f..9497311 100644
+--- a/umd/level_zero_driver/tools/source/metrics/metric.cpp
+++ b/umd/level_zero_driver/tools/source/metrics/metric.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include "level_zero_driver/tools/source/metrics/metric.hpp"
+ #include "vpu_driver/source/utilities/log.hpp"
+#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/vpu_driver/source/command/vpu_command.cpp b/umd/vpu_driver/source/command/vpu_command.cpp
+index f4ca23f..75331d9 100644
+--- a/umd/vpu_driver/source/command/vpu_command.cpp
+++ b/umd/vpu_driver/source/command/vpu_command.cpp
+@@ -14,6 +14,7 @@
+ #include <cstdint>
+ #include <vector>
+ #include <map>
+#include <algorithm>
+ 
+ namespace VPU {
+ 
+diff --git a/umd/vpu_driver/source/command/vpu_command_buffer.cpp b/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+index c4ad052..bbb80ec 100644
+--- a/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+++ b/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+@@ -11,6 +11,7 @@
+ #include "vpu_driver/source/command/vpu_command_buffer.hpp"
+ #include "vpu_driver/source/command/vpu_copy_command.hpp"
+ #include "vpu_driver/source/utilities/log.hpp"
+#include <algorithm>
+ 
+ namespace VPU {
+ 
+-- 
+2.43.0
+
--- a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
@ -0,0 +1,43 @@
+SUMMARY = "User Mode Driver for Intel® NPU device"
+HOMEPAGE = "https://github.com/intel/linux-npu-driver"
+LICENSE = "MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7b256470048be42466f7d10e1d6482e6 \
+                    file://third-party-programs.txt;md5=0ae40d7f1ef3bbd509197e427fdd7e70 \
+                    file://third_party/vpux_elf/LICENSE;md5=a7a2dfa2b52a22cf2257893ee87ba11c"
+
+SRC_URI = "git://github.com/intel/linux-npu-driver.git;protocol=https;name=linux-npu-driver;branch=main;lfs=1 \
+            git://github.com/openvinotoolkit/npu_plugin_elf.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/vpux_elf;name=vpux-elf;nobranch=1 \
+            git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \
+            git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/level-zero-npu-extensions;name=lzvext;nobranch=1 \
+            git://github.com/google/googletest.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/googletest;name=googletest;nobranch=1 \
+            file://0001-linux-npu-driver-fix-multilib-install-issue.patch \
+        "
+
+SRCREV_linux-npu-driver = "0fe92dd0720448fb571f0ac4e5e64ef9f2ec3bd7"
+SRCREV_vpux-elf = "50f2b13dbb6dd435c3e2ef6f8abb7393633bfcdd"
+SRCREV_yaml-cpp = "f7320141120f720aecc4c32be25586e7da9eb978"
+SRCREV_lzvext = "c7d8f849d6a8195c1db38cbaca8d431cbabf3a6e"
+SRCREV_googletest = "b514bdc898e2951020cbdca1304b75f5950d1f59"
+SRCREV_FORMAT = "linux-npu-driver_vpux-elf_yaml-cpp_lzvext_googletest"
+
+inherit cmake
+
+
+# Fix warning _FORTIFY_SOURCE requires compiling with optimization (-O)
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release "
+EXTRA_OECMAKE += " -DCMAKE_CXX_FLAGS_RELEASE=-O2 "
+
+EXTRA_OECMAKE += " -DCMAKE_CXX_FLAGS='-I${RECIPE_SYSROOT}/usr/include/level_zero'"
+EXTRA_OECMAKE += " -DCMAKE_INSTALL_FIRMWARE_DIR=${nonarch_base_libdir}"
+
+DEPENDS = "level-zero dpkg-native pkgconfig-native"
+
+PACKAGES =+ "${PN}-firmware ${PN}-tests"
+
+FILES:${PN}-firmware = "${nonarch_base_libdir}/firmware/updates/intel/vpu/*"
+FILES:${PN}-tests = "${bindir}"
+
+INSANE_SKIP:${PN} += "buildpaths"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
+INSANE_SKIP:${PN}-tests += "buildpaths"
+INSANE_SKIP:${PN}-firmware += "buildpaths"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb
@ -1,59 +0,0 @@
-SUMMARY = "Intel® oneAPI DPC++/C++ Compiler & Intel® C++ Compiler Classic runtime common files"
-DESCRIPTION = "Intel® C++ Compiler Classic generates applications\
- that can run on Intel® 64 architecture and the IA-32 architecture.\
- Intel® oneAPI Data Parallel C++ (DPC++) is an open alternative \
- to single-architecture proprietary languages. It allows developers to reuse \
- code across hardware targets (CPUs and accelerators such as GPUs and FPGAs) \
- and also perform custom tuning for a specific accelerator."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html"
-
-LICENSE="EULA"
-
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/compiler/Intel%20Developer%20Tools%20EULA;md5=7bfc91523de2e84e7131d0eacf2827d4 \
-                     file://opt/intel/oneapi/lib/licensing/compiler/openmp/third-party-programs.txt;md5=da72b17a4a1efef54faf14df4a703282 \
-                     file://opt/intel/oneapi/lib/licensing/compiler/c/third-party-programs.txt;md5=3414f5649b09160ade46d4981f3452fe \
-                     file://opt/intel/oneapi/lib/licensing/opencl/EULA.txt;md5=7bfc91523de2e84e7131d0eacf2827d4 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/TBB_TPP.txt;md5=0a69156543e3e115c673c6041b6aee92 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/redist.txt;md5=32fb3b7d1c0a92ea577fe2e4b0dfa663 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/third-party-programs.txt;md5=c660b8b0891e780a62da6a198e80e9ac \
-                     "
-
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-${PV}_amd64.deb;subdir=${BPN};name=runtime-compilers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-common-${PV}_all.deb;subdir=${BPN};name=common-compilers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-${PV}_amd64.deb;subdir=${BPN};name=runtime-dpcpp-cpp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-common-${PV}_all.deb;subdir=${BPN};name=common-dpcpp-cpp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-${PV}_amd64.deb;subdir=${BPN};name=runtime-openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-common-${PV}_all.deb;subdir=${BPN};name=common-openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-opencl-${PV}_amd64.deb;subdir=${BPN};name=runtime-opencl \
-            "
-
-SRC_URI[runtime-compilers.sha256sum] = "8951fd8a0946095609f0ef7bb2b51c698fc0315455a76d268a54851936c07db9"
-SRC_URI[common-compilers.sha256sum] = "c592482f68b131fff0623fdc978c592950f02d7f35f6795587e93a28fe1d3c31"
-SRC_URI[runtime-dpcpp-cpp.sha256sum] = "9e26b9c5321281d829d62542c22552182d00255ebc2f8a6e179b95515c63c24d"
-SRC_URI[common-dpcpp-cpp.sha256sum] = "9cd0957a75f5ad45b208f2c1c8ee2aa032e335ada9193ca69f8ac5a7cb548d02"
-SRC_URI[runtime-openmp.sha256sum] = "86fb0d6e3a34217cc30594e9f21e89070425c6c56773edae4d5a86730239c171"
-SRC_URI[common-openmp.sha256sum] = "5bd2fc7a1605545fc8536ec0e8d80c982f1feb7dc6eed5b45adf3cd0370e0a98"
-SRC_URI[runtime-opencl.sha256sum] = "65d73c23f07c2419b8a1d22043b73346f25b387d3ec07b48f08177de1835a360"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit bin_package update-alternatives
-
-ALTERNATIVE:${PN} = "Intel_FPGA_SSG_Emulator.icd"
-ALTERNATIVE_LINK_NAME[Intel_FPGA_SSG_Emulator.icd] = "/etc/OpenCL/vendors/intel64-fpgaemu.icd"
-ALTERNATIVE_TARGET[Intel_FPGA_SSG_Emulator.icd] = "/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd"
-ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-
-RDEPENDS:${PN} += "perl elfutils opencl-icd-loader level-zero-loader zlib tbb libelf setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "textrel dev-so"
-
-# The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6
-do_install:append () {
-    rm -f ${D}/opt/intel/oneapi/lib/libomptarget.rtl.x86_64.so
-    echo "/opt/intel/oneapi/lib/emu/libintelocl_emu.so" > ${D}/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd
-}
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
@ -0,0 +1,54 @@
+SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files"
+DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
+that help your applications run faster on Intel® 64 architectures with support \
+for the latest C, C++, and SYCL language standards. This compiler produces \
+optimized code that can run significantly faster by taking advantage of the \
+ever-increasing core count and vector register width in Intel® Xeon® processors \
+and compatible processors."
+
+HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
+
+LICENSE = "EULA"
+
+COMPILERMAINVER = "2024.0"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/licensing/${COMPILERMAINVER}/licensing/${COMPILERMAINVER}/license.htm;md5=5ff64c6ff3ef98089ed69360e7a84c39 \
+                     "
+COMPILERDOTVER = "2024.0.0-49406"
+DEVUTILITVERSION = "2024.0-2024.0.0-49320"
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=common-vars \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=openmp \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=openmp-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-${COMPILERMAINVER}-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=license \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dev-utilities-${DEVUTILITVERSION}_amd64.deb;subdir=${BPN};name=dev-utils \
+            "
+
+SRC_URI[dpcpp-runtime.sha256sum] = "e24f0ba69daf3f66ceaf23d5e632f183cdb90bac69f65407fdb4407fc9034f33"
+SRC_URI[dpcpp-common.sha256sum] = "f5a3db6a725598224edf1099260955aee3e36beadcaed2af5b8b453e873a82fa"
+SRC_URI[compiler-shared-runtime.sha256sum] = "bce010cbe076259ddd3feb8e69792869e22fccd5b4e2c9af9e815826f2c1a394"
+SRC_URI[common-vars.sha256sum] = "368553c99db1b52060b8225355336778be0b00e5991d0f769c42f891c6328750"
+SRC_URI[openmp.sha256sum] = "154ff1e81adfdc872ba1d47bd860de70d62188417c7128422435dfd0ceca62fe"
+SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c3843ba57d7894d15c07d"
+SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6"
+SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50"
+
+S = "${UNPACKDIR}/${BPN}"
+
+inherit bin_package
+
+RDEPENDS:${PN} += "virtual-opencl-icd zlib tbb level-zero-loader bash tcsh"
+SKIP_FILEDEPS:${PN} = '1'
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+
+# doesn't have GNU_HASH (didn't pass LDFLAGS?)
+INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps"
+
+FILES_SOLIBSDEV = ""
+BBCLASSEXTEND = "native nativesdk"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
@ -0,0 +1,45 @@
+SUMMARY = "Intel® oneAPI DPC++/C++ Compiler"
+DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
+that help your applications run faster on Intel® 64 architectures with support \
+for the latest C, C++, and SYCL language standards. This compiler produces \
+optimized code that can run significantly faster by taking advantage of the \
+ever-increasing core count and vector register width in Intel® Xeon® processors \
+and compatible processors."
+
+HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
+
+LICENSE = "EULA"
+
+COMPILERMAINVER = "2024.0"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/compiler/${COMPILERMAINVER}/share/doc/compiler/credist.txt;md5=b41f55af9f479b9570fc35b955d5ba1a \
+                     "
+
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=shared-common \
+            "
+
+SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77638f3f849796b62cd82"
+SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236"
+SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558"
+
+S = "${UNPACKDIR}/${BPN}"
+
+inherit bin_package
+
+RDEPENDS:${PN} += "intel-oneapi-dpcpp-cpp-runtime"
+SKIP_FILEDEPS:${PN} = '1'
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+
+# doesn't have GNU_HASH (didn't pass LDFLAGS?)
+INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped file-rdeps staticdev rpaths arch useless-rpaths"
+
+FILES_SOLIBSDEV = ""
+
+EXCLUDE_FROM_SHLIBS = "1"
+BBCLASSEXTEND = "native nativesdk"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.3.bb
@ -4,18 +4,15 @@ intended to graphics application engineers that want to improve the \
 performance of their application."
 HOMEPAGE = "https://github.com/embree/embree"

-LICENSE  = "Apache-2.0 & syrah"
+LICENSE  = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://third-party-programs.txt;md5=86f6028ba2138fe41ac5c121d0a3518e \
+                    file://third-party-programs.txt;md5=f989f5b74cfff0d45d3ccf0e1366cbdc \
                    file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8"

 inherit pkgconfig cmake

-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master \
-            "
-SRCREV = "0835461a5dd1659696524303dc9cb2f2300ae156"
+SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master"
+SRCREV = "5730b150471602d6dc02d9b7d8a4a6ce9ceffe16"

 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
@ -23,9 +20,11 @@ COMPATIBLE_HOST:libc-musl = "null"
 DEPENDS = "tbb jpeg libpng glfw ispc-native"

 EXTRA_OECMAKE += " \
-                  -DEMBREE_ISPC_SUPPORT=OFF  \
                  -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF  \
                  -DEMBREE_MAX_ISA=DEFAULT  \
                  -DEMBREE_TUTORIALS=OFF  \
                  -DEMBREE_ISPC_SUPPORT=ON  \
+                  -DEMBREE_ZIP_MODE=OFF  \
                  "
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
@ -0,0 +1,35 @@
+DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
+ building blocks for cross-platform performance. Develop high-performance vision, \
+ signal, security, and storage applications with this multithreaded software library."
+HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
+
+LICENSE = "ISSL"
+
+MAXVER = "2021.10"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/license.txt;md5=d7cdc92ed6c4de1263da879599ddc3e2 \
+                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/third-party-programs.txt;md5=22bd13987911dcf790907041b43081f3 \
+                     "
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-${MAXVER}-${PV}_amd64.deb;subdir=${BPN};name=ipp \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-devel-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=headers \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=env \
+            "
+
+SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd23e92bea07"
+SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005"
+SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6"
+
+S = "${UNPACKDIR}/${BPN}"
+
+COMPATIBLE_HOST:libc-musl = "null"
+
+inherit bin_package
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+INHIBIT_DEFAULT_DEPS = ""
+
+RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
+INSANE_SKIP:${PN} += "ldflags dev-so"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb
@ -1,42 +0,0 @@
-DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
- building blocks for cross-platform performance. Develop high-performance vision, \
- signal, security, and storage applications with this multithreaded software library."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
-
-LICENSE = "ISSL"
-
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/ipp/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \
-                     file://opt/intel/oneapi/lib/licensing/ipp/third-party-programs.txt;md5=6cd9ad51f3b5cdfd4a355fa5599a6c03 \
-                     "
-
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-common-${PV}_all.deb;subdir=${BPN};name=common \
-            "
-
-SRC_URI[runtime.sha256sum] = "98cd14bf635969d57bf9ea7bb27b90f27f72404f1927aa486a2bcf3c20a0f303"
-SRC_URI[common.sha256sum] = "1aac41633179e824567b90afd39b8405db30df79a027421568df019b2b51bdd1"
-
-S = "${WORKDIR}/${BPN}"
-
-COMPATIBLE_HOST:libc-musl = "null"
-
-inherit bin_package
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-
-RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "ldflags dev-so"
-
-# Some libraries are linking against the unversioned lib and there's no soname entry.
-# Workaround errors like:
-# Problem: conflicting requests
-#  - nothing provides libippcore_tl_omp.so()(64bit) needed by intel-oneapi-ipp-2021.3.0+333-r0.skylake_64
-do_install:append () {
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so
-}
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb
@ -1,39 +0,0 @@
-SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
-DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
- math library of highly optimized and extensively parallelized routines \
- for applications that require maximum performance. oneMKL contains \
- the high-performance optimizations from the full Intel® Math Kernel Library \
- for CPU architectures (with C/Fortran programming language interfaces)\
- and adds to them a set of DPC++ programming language interfaces for \
- achieving performance on various CPU architectures \
- and Intel Graphics Technology for certain key functionalities."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
-
-LICENSE = "ISSL"
-
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/mkl/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs.txt;md5=980965cf1f086d40998ca4981968b6a4 \
-                     "
-
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-common-${PV}_all.deb;subdir=${BPN};name=common \
-            "
-
-SRC_URI[runtime.sha256sum] = "b20e0f7400fbbc55d8489f9f3ef35a8c8df7f5af7d87903bf305703e3a2ebc3b"
-SRC_URI[common.sha256sum] = "bff8b2bfedbd09c9e6d0366cca3d4de80af521302bd5938fe6fa0128c6839041"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit bin_package
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-
-RDEPENDS:${PN} += "tbb intel-oneapi-compiler setup-intel-oneapi-env"
-INSANE_SKIP:${PN} = "ldflags textrel dev-so"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
@ -0,0 +1,74 @@
+SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
+DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
+ math library of highly optimized and extensively parallelized routines \
+ for applications that require maximum performance. oneMKL contains \
+ the high-performance optimizations from the full Intel® Math Kernel Library \
+ for CPU architectures (with C/Fortran programming language interfaces)\
+ and adds to them a set of DPC++ programming language interfaces for \
+ achieving performance on various CPU architectures \
+ and Intel Graphics Technology for certain key functionalities."
+HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
+
+LICENSE = "ISSL"
+
+MKLMAINVER = "2024.0"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/license.txt;md5=8510d21bf355a76e378c3216c3929ccd  \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs.txt;md5=27de873e4084d62530fe828406b33ca9 \
+                     "
+
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-devel \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-devel-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=devel \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-vars \
+            "
+
+SRC_URI[runtime.sha256sum] = "10a86e24051d6ef4a80fd839c570e629190638a3c0ac9bcca99ab855f534b959"
+SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c81655b268aa2c7bb908192"
+SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84"
+SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef"
+
+S = "${UNPACKDIR}/${BPN}"
+
+inherit bin_package
+
+do_install:append () {
+	install -d ${D}${bindir}
+	(cd ${D}${bindir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/bin/* .)
+	install -d ${D}${libdir}
+	(cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.so* .)
+	(cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.a* .)
+	install -d ${D}${libdir}/pkgconfig
+	(cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .)
+	install -d ${D}${libdir}/cmake
+	(cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .)
+
+	install -d ${D}${includedir}
+	find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read srcdir; do
+            install -d ${D}${includedir}/$srcdir
+            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcdir/* ./$srcdir/)
+	done
+
+	find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type f -printf '%f\n' | while read srcfile; do
+            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcfile .)
+	done
+}
+
+AUTO_LIBNAME_PKGS = ""
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+
+RDEPENDS:${PN} += "bash tbb intel-oneapi-dpcpp-cpp-runtime setup-intel-oneapi-env virtual-opencl-icd"
+INSANE_SKIP:${PN} = "ldflags textrel dev-so staticdev arch already-stripped"
+
+FILES:${PN}-staticdev += "/opt/intel/oneapi/mkl/${MKLMAINVER}/lib/*.a*"
+
+SKIP_FILEDEPS:${PN} = '1'
+
+SYSROOT_DIRS += "/opt"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
@ -1,37 +0,0 @@
-From 46b7de8c4ae0cc34805c2a11356c5a730fb8760a Mon Sep 17 00:00:00 2001
-From: Ezhilarasan <ezhilarasanx.s@intel.com>
-Date: Fri, 4 Mar 2022 21:04:47 +0530
-Subject: [PATCH] remove-redundant-RPATH
-
-Error Log:
-ERROR: oidn-1.4.3-r0 do_package_qa: QA Issue: oidn: /usr/lib/libOpenImageDenoise.so.1.4.3 contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnTest contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnDenoise contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnBenchmark contains probably-redundant RPATH /usr/lib [useless-rpaths]
-ERROR: oidn-1.4.3-r0 do_package_qa: Fatal QA errors were found, failing task.
-
-Remove the redundant RPATH
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Ezhilarasan <ezhilarasanx.s@intel.com>
---
- cmake/oidn_package.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/oidn_package.cmake b/cmake/oidn_package.cmake
-index 1f76af8..46c0854 100644
--- a/cmake/oidn_package.cmake
-+++ b/cmake/oidn_package.cmake
-@@ -29,7 +29,7 @@ if(OIDN_ZIP_MODE)
-     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-   endif()
- else()
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
-+#  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- endif()
- 
- ## -----------------------------------------------------------------------------
-- 
-2.17.1
-
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
@ -7,18 +7,21 @@ HOMEPAGE = "https://www.openimagedenoise.org/"

 LICENSE = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://mkl-dnn/LICENSE;md5=8e17c0f9656ebaf0c380d9b22707c846 \
-                    file://mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
-                    file://mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
+                    file://external/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+                    file://external/mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
+                    file://external/mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
                    file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"

 SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\
-           file://0001-remove-redundant-RPATH.patch \
           "
-SRC_URI[sha256sum] = "3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a"
+SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6"

 inherit cmake

 DEPENDS += "tbb ispc-native"

+do_install:append() {
+        chrpath -d ${D}${bindir}/* ${D}${libdir}/*${SOLIBS}
+}
+
 UPSTREAM_CHECK_URI = "https://github.com/OpenImageDenoise/oidn/releases"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
@ -16,20 +16,24 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \

 inherit pkgconfig cmake

-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \
           "
-SRCREV = "5da393e9edc8becebbf41c9bb6cb9b87aa0b1e93"
+SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce"

 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"

-DEPENDS = "ispc-native rkcommon embree"
+DEPENDS = "ispc ispc-native rkcommon embree"

 EXTRA_OECMAKE += " \
                  -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc  \
                  "
+EXTRA_OECMAKE:intel-corei7-64 += " \
+                  -DOPENVKL_ISA_AVX=OFF  \
+                  -DOPENVKL_ISA_AVX2=OFF  \
+                  -DOPENVKL_ISA_AVX512SKX=OFF  \
+                  "
+
 PACKAGES =+ "${PN}-examples"
 FILES:${PN}-examples = "\
                     ${bindir} \
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.2.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.2.0.bb
@ -6,25 +6,26 @@ HOMEPAGE = "https://www.ospray.org/"

 LICENSE  = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \
-                    file://third-party-programs.txt;md5=d0b3d9b55b2ccd6a3bffc374cf2d5563"
+                    file://third-party-programs.txt;md5=e37b77e3bd997abccc359c710fb1f1db \
+                    "

 inherit pkgconfig cmake

-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \
-            "
-SRCREV = "bc891f413f5657a31faa273992fda61d3666eef7"
+           git://github.com/nothings/stb;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/apps/common/external/stb_image/stb;name=stb;nobranch=1 \
+          "
+SRCREV = "85af2929937d516997451cbd52d352cf93125ed2"

 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"

-DEPENDS = "rkcommon ispc-native openvkl embree"
+DEPENDS = "rkcommon ispc ispc-native openvkl embree"

 EXTRA_OECMAKE += " \
                  -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \
                  -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF \
                  -DOSPRAY_ENABLE_APPS_TESTING=OFF \
+                  -DOSPRAY_ENABLE_APPS_EXAMPLES=OFF \
                  "

 PACKAGES =+ "${PN}-apps"
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.14.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.14.0.bb
@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"

 inherit pkgconfig cmake

-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \
            "
-SRCREV = "8636cc74a254178175601a656b58faefb299fd43"
+SRCREV = "4a00047ae5a3ac705b6b33b4a7574588d91e7953"

 DEPENDS = "tbb"

--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
@ -0,0 +1,38 @@
+From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 18 May 2022 12:24:03 +0800
+Subject: [PATCH] CMakeLists: disable Werror
+
+gcc12 highlights minor warnings that cause the build to fail. Ignore
+those until they aren't fixed upstream.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 418483f7..c019fea0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -146,7 +146,7 @@ else()
+   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
+   if(LNX_BUILD)
+     #A few warnings yet to resolve under esx
+-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
+    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
+     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror")
+   endif()
+   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
+@@ -791,4 +791,4 @@ if(ESX_BUILD)
+   include(CMake/esx.cmake)
+ endif()
+ 
+-add_subdirectory(src/os/nvm_api_sample)
+\ No newline at end of file
+add_subdirectory(src/os/nvm_api_sample)
+-- 
+2.35.3
+
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@ -1,27 +1,29 @@
-
+Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
+ builds
 Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
 MdePkg/Include/Base.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

-diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
-index 2da08b0c78..072eefdb94 100644
--- a/MdePkg/Include/Base.h
-+++ b/MdePkg/Include/Base.h
-@@ -318,7 +318,11 @@ struct _LIST_ENTRY {
- ///
- /// NULL pointer (VOID *)
- ///
+Index: edk2/MdePkg/Include/Base.h
+===================================================================
+--- edk2.orig/MdePkg/Include/Base.h
+++ edk2/MdePkg/Include/Base.h
+@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
+ #define NULL  __null
+   #endif
+ #else
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
 #define NULL  ((VOID *) 0)
+ #endif
 +#endif
 +#endif
 
 //
 // Null character
-@@ -810,6 +814,8 @@ typedef UINTN  *BASE_LIST;
+@@ -813,6 +817,8 @@ typedef UINTN *BASE_LIST;
 // Section 2.3.1 of the UEFI 2.3 Specification.
 //
 
@ -30,28 +32,31 @@ index 2da08b0c78..072eefdb94 100644
 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (INT8)    == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (UINT8)   == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
-@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
- STATIC_ASSERT (sizeof (CHAR16)  == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");
- STATIC_ASSERT (sizeof (L'A')    == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements");
- STATIC_ASSERT (sizeof (L"A")    == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
+@@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16)  == size
+ STATIC_ASSERT (ALIGNOF (INTN)    == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (UINTN)   == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (VOID *)  == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements");
+-
 +#endif
 +#endif
- 
 //
 // The following three enum types are used to verify that the compiler
-@@ -843,9 +851,13 @@ typedef enum {
-   __VerifyUint32EnumValue = 0xffffffff
- } __VERIFY_UINT32_ENUM_SIZE;
+ // configuration for enum types is compliant with Section 2.3.1 of the
+@@ -861,6 +868,8 @@ typedef enum {
+   __VerifyInt32EnumValue = 0x7fffffff
+ } __VERIFY_INT32_ENUM_SIZE;
 
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
- STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
+@@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN
+ STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE)  == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
 
 /**
   Macro that returns a pointer to the data structure that contains a specified field of
-- 
-2.31.0.windows.1
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
@ -15,16 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71  \
                    file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"

-SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \
-        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
+SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master_3_0;name=ipmctl; \
+        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/edk2;branch=master \
        file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
+        file://0001-CMakeLists-disable-Werror.patch \
 "

-SRCREV_ipmctl = "4502cf18beac3acfaee1f774b69bb681daf5c9f7"
-#tag: edk2-stable202111
-SRCREV_edk2 = "bb1bba3d776733c41dbfa2d1dc0fe234819a79f2"
-
-S = "${WORKDIR}/git"
+SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
+#tag edk2-stable202408
+SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
+SRCREV_FORMAT = "ipmctl_edk2"

 inherit cmake dos2unix

--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
@ -1,56 +0,0 @@
-From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Tue, 9 Jun 2020 11:35:59 +0800
-Subject: [PATCH] don't install licenses and version
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- ngraph/CMakeLists.txt              | 8 ++------
- ngraph/test/runtime/CMakeLists.txt | 2 ++
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index a05ca3b15c..9bc507b4c7 100644
--- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
-         install(EXPORT ngraphTargets
-             FILE ngraphTargets.cmake
-             NAMESPACE ngraph::
-            DESTINATION "deployment_tools/ngraph/cmake"
-+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-             COMPONENT ngraph_dev)
-     endif()
- 
-@@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
- 
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
-        DESTINATION "deployment_tools/ngraph/cmake"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-         COMPONENT ngraph_dev)
- endif()
- 
-@@ -337,7 +337,3 @@ add_subdirectory(test)
- if (NGRAPH_PYTHON_BUILD_ENABLE)
-     add_subdirectory(python)
- endif()
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
-    DESTINATION "deployment_tools/ngraph"
-    COMPONENT ngraph)
-diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
-index be84499ee0..f65357b751 100644
--- a/ngraph/test/runtime/CMakeLists.txt
-+++ b/ngraph/test/runtime/CMakeLists.txt
-@@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
- add_subdirectory(interpreter)
- add_subdirectory(ie)
-+
-+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB})
-- 
-2.32.0
-
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
@ -1,333 +0,0 @@
-From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 8 Apr 2021 14:19:51 +0800
-Subject: [PATCH] inference-engine: use system installed packages
-
-Use installed versions of ade, protobuf, zlib and tbb.
-
-Don't fetch pybind11 at runtime and use the one that we have fetched while
-running do_fetch.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- cmake/dependencies.cmake                      | 19 --------
- inference-engine/CMakeLists.txt               |  6 +--
- inference-engine/cmake/dependencies.cmake     | 45 -------------------
- inference-engine/cmake/ie_parallel.cmake      |  2 +-
- .../templates/InferenceEngineConfig.cmake.in  | 10 -----
- inference-engine/samples/CMakeLists.txt       |  3 +-
- .../src/inference_engine/CMakeLists.txt       |  4 +-
- .../common_test_utils/CMakeLists.txt          |  4 +-
- .../unit_test_utils/CMakeLists.txt            |  3 +-
- inference-engine/thirdparty/CMakeLists.txt    |  5 +--
- ngraph/python/CMakeLists.txt                  | 12 +----
- tests/fuzz/src/CMakeLists.txt                 |  1 -
- thirdparty/CMakeLists.txt                     |  1 -
- thirdparty/cnpy/CMakeLists.txt                |  4 +-
- 14 files changed, 14 insertions(+), 105 deletions(-)
-
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index 6cb15a077e..74d4ac4124 100644
--- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
- if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-     set(protoc_version "3.7.1")
- 
-    RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
-        ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
-        TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
-        SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
-    )
-    debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
-
-    reset_deps_cache(SYSTEM_PROTOC)
-
-    find_program(
-        SYSTEM_PROTOC
-        NAMES protoc
-        PATHS "${SYSTEM_PROTOC_ROOT}/bin"
-        NO_DEFAULT_PATH)
-    if(NOT SYSTEM_PROTOC)
-        message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
-    endif()
-
-    update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
- endif()
-diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
-index 1ac7fd8bf6..0615873110 100644
--- a/inference-engine/CMakeLists.txt
-+++ b/inference-engine/CMakeLists.txt
-@@ -18,7 +18,7 @@ function(ie_developer_export_targets)
- endfunction()
- 
- function(ie_developer_export)
-    set(all_dev_targets gflags ie_libraries)
-+    set(all_dev_targets ie_libraries)
-     foreach(component IN LISTS openvino_export_components)
-         export(TARGETS ${${component}} NAMESPACE IE::
-                APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
-@@ -142,7 +142,7 @@ endif()
- # Developer package
- #
- 
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils)
-+openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
- 
- # for Template plugin
- if(NGRAPH_INTERPRETER_ENABLE)
-@@ -158,7 +158,7 @@ function(ie_generate_dev_package_config)
-     configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
-                                 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
-                                 INSTALL_DESTINATION share # not used
-                                PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
-+                                PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR"
-                                 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
-     configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
-diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
-index b270c46f2d..5f85197a85 100644
--- a/inference-engine/cmake/dependencies.cmake
-+++ b/inference-engine/cmake/dependencies.cmake
-@@ -81,51 +81,6 @@ endif ()
- if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-     reset_deps_cache(TBBROOT TBB_DIR)
- 
-    if (WIN32 AND X86_64)
-        #TODO: add target_path to be platform specific as well, to avoid following if
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_WIN "tbb2020_20200415_win.zip"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
-        RESOLVE_DEPENDENCY(TBBBIND_2_4
-                ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip"
-                TARGET_PATH "${TEMP}/tbbbind_2_4"
-                ENVIRONMENT "TBBBIND_2_4_ROOT"
-                SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a")
-    elseif(ANDROID)  # Should be before LINUX due LINUX is detected as well
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
-    elseif(LINUX AND X86_64)
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
-        RESOLVE_DEPENDENCY(TBBBIND_2_4
-                ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz"
-                TARGET_PATH "${TEMP}/tbbbind_2_4"
-                ENVIRONMENT "TBBBIND_2_4_ROOT"
-                SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6")
-    elseif(LINUX AND AARCH64)
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
-                TARGET_PATH "${TEMP}/tbb_yocto"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
-    elseif(APPLE AND X86_64)
-        RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
-                TARGET_PATH "${TEMP}/tbb"
-                ENVIRONMENT "TBBROOT"
-                SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
-    else()
-        message(FATAL_ERROR "TBB is not available on current platform")
-    endif()
-
-     update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
-     update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
- 
-diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index edf3d2f2b2..6579d0f7ea 100644
--- a/inference-engine/cmake/ie_parallel.cmake
-+++ b/inference-engine/cmake/ie_parallel.cmake
-@@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
-             find_dependency(TBB COMPONENTS tbb tbbmalloc)
-         endif()
-         set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE)
-        set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
-+        set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE)
-         set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE)
-         if (NOT TBB_FOUND)
-             ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\
-diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
-index 261edbf3d7..bf217a789a 100644
--- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
-+++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
-@@ -86,16 +86,6 @@ endfunction()
- set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")
- 
- set(THREADING "@THREADING@")
-if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
-    set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
-    _ie_find_dependency(TBB
-                        COMPONENTS tbb tbbmalloc
-                        CONFIG
-                        PATHS ${TBBROOT}/cmake
-                              ${_tbb_dir}
-                        NO_CMAKE_FIND_ROOT_PATH
-                        NO_DEFAULT_PATH)
-endif()
- 
- set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@")
- _ie_find_dependency(ngraph
-diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index 7924c56779..ae93857944 100644
--- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
-         add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
-         set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
-     endfunction()
-    add_gflags()
-+    #add_gflags()
- endif()
- 
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib")
-    add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL)
- endif()
- 
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy")
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index e8ed1a5c4c..2fcb0bed4a 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf
-                                INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}"
-                                PATH_VARS ${PATH_VARS})
- 
-set(IE_INCLUDE_DIR "include")
-set(IE_NGRAPH_DIR "../ngraph/cmake")
-+set(IE_INCLUDE_DIR "../../include")
-+set(IE_NGRAPH_DIR "ngraph")
- set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}")
- set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake")
- 
-diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-index 5e8643dc5d..031557efc3 100644
--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-@@ -43,7 +43,7 @@ function(add_gtest_libraries)
-                           PROPERTIES FOLDER thirdparty)
- endfunction()
- 
-add_gtest_libraries()
-+#add_gtest_libraries()
- 
- if (MSVC)
-     set(PUGI pugixml_mt)
-@@ -52,8 +52,6 @@ else ()
- endif ()
- 
- list(APPEND EXPORT_DEPENDENCIES
-        gtest
-        gtest_main
-         )
- 
- set(TARGET_NAME commonTestUtils)
-diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-index 7c1d89eabf..2fbd8fc324 100644
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
- 
- list(APPEND EXPORT_DEPENDENCIES
-         commonTestUtils_s
-        inference_engine_s
-        gmock)
-+        inference_engine_s)
- 
- addIeTarget(
-         NAME ${TARGET_NAME}
-diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
-index f028ebdd8a..9c5bd53466 100644
--- a/inference-engine/thirdparty/CMakeLists.txt
-+++ b/inference-engine/thirdparty/CMakeLists.txt
-@@ -62,14 +62,13 @@ else()
-     target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
- endif()
- 
-add_subdirectory(ade EXCLUDE_FROM_ALL)
- add_subdirectory(fluid/modules/gapi)
- 
-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
-+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
- 
- # developer package
- 
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
-+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
- 
- if (NOT USE_SYSTEM_PUGIXML)
-     set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
-diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt
-index 501bfffb4b..b45612c19c 100644
--- a/ngraph/python/CMakeLists.txt
-+++ b/ngraph/python/CMakeLists.txt
-@@ -17,17 +17,7 @@ endif()
- 
- include(FetchContent)
- 
-FetchContent_Declare(
-    pybind11
-    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
-    GIT_TAG        "v2.5.0"
-)
-
-FetchContent_GetProperties(pybind11)
-if(NOT pybind11_POPULATED)
-    FetchContent_Populate(pybind11)
-    add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
-endif()
-+add_subdirectory(pybind11)
- 
- # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11
- set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
-index b9400d9e7e..669938526c 100644
--- a/tests/fuzz/src/CMakeLists.txt
-+++ b/tests/fuzz/src/CMakeLists.txt
-@@ -10,7 +10,6 @@ add_custom_target(fuzz)
- FILE(GLOB tests "*-fuzzer.cc")
- 
- add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy)
-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
- 
- foreach(test_source ${tests})
-     get_filename_component(test_name ${test_source} NAME_WE)
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 2c6b656408..4e86bd21ef 100644
--- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -5,6 +5,5 @@
- add_subdirectory(ittapi)
- add_subdirectory(itt_collector)
- add_subdirectory(xbyak EXCLUDE_FROM_ALL)
-add_subdirectory(zlib EXCLUDE_FROM_ALL)
- add_subdirectory(cnpy EXCLUDE_FROM_ALL)
- openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
-diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
-index 5571cd5f78..e30604927a 100644
--- a/thirdparty/cnpy/CMakeLists.txt
-+++ b/thirdparty/cnpy/CMakeLists.txt
-@@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-     target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable)
- endif()
- 
-target_link_libraries(${TARGET_NAME} PUBLIC zlib)
-+target_link_libraries(${TARGET_NAME} PUBLIC z)
- target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
-                                                  "${CMAKE_CURRENT_SOURCE_DIR}/..")
- 
-set_target_properties(cnpy PROPERTIES FOLDER thirdparty)
-\ No newline at end of file
-+set_target_properties(cnpy PROPERTIES FOLDER thirdparty)
-- 
-2.32.0
-
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch
@ -1,43 +0,0 @@
-From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:45:48 +0800
-Subject: [PATCH] Disable Werror
-
-Don't treat warnings as errors. This just leads to failures every time
-we upgrade the compiler.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
- ngraph/CMakeLists.txt                            | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-index d14da47860..08ed695c0d 100644
--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
-+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
-         MultiProcessorCompilation
-         DeadCodeEliminate
-         ExtensionsEnabled
-        TreatWarnAsErrorEnabled
-         WarnLevel4
-         NoFastMath
-         StackProtector
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index a05ca3b15c..ae888c4cb2 100644
--- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -197,7 +197,6 @@ if (WIN32)
- endif()
- 
- if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
- endif()
- 
- if(WIN32)
-- 
-2.32.0
-
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
@ -1,326 +0,0 @@
-From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 11 Jun 2020 14:24:04 +0800
-Subject: [PATCH] cmake installation fixes
-
-Make sure that libraries/samples/binaries are installed correctly.
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- CMakeLists.txt                                | 15 --------
- .../IEDevScriptsConfig.cmake                  |  2 +-
- cmake/developer_package/packaging.cmake       |  8 +++--
- cmake/developer_package/plugins/plugins.cmake |  2 +-
- .../common/opencv_c_wrapper/CMakeLists.txt    |  2 ++
- inference-engine/samples/CMakeLists.txt       |  4 ++-
- .../common/format_reader/CMakeLists.txt       |  4 ++-
- .../src/inference_engine/CMakeLists.txt       | 35 ++-----------------
- .../src/preprocessing/CMakeLists.txt          |  2 +-
- .../src/readers/ir_reader/CMakeLists.txt      |  2 +-
- .../src/vpu/myriad_plugin/CMakeLists.txt      |  2 +-
- .../tests/unit/cpu/CMakeLists.txt             |  2 ++
- .../unit/inference_engine/CMakeLists.txt      |  2 ++
- .../tests/unit/vpu/CMakeLists.txt             |  2 ++
- .../tools/compile_tool/CMakeLists.txt         |  2 +-
- ngraph/CMakeLists.txt                         |  8 ++---
- 16 files changed, 32 insertions(+), 62 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0706a72e8..7920de9a42 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
- 
- # install setupvars
- 
-ie_cpack_add_component(setupvars REQUIRED)
-
- if(UNIX)
-    install(PROGRAMS scripts/setupvars/setupvars.sh
-            DESTINATION bin
-            COMPONENT setupvars)
- elseif(WIN32)
-     install(PROGRAMS scripts/setupvars/setupvars.bat
-             DESTINATION bin
-@@ -195,22 +190,12 @@ endif()
- # install install_dependencies
- 
- if(UNIX)
-    ie_cpack_add_component(install_dependencies REQUIRED)
-    install(DIRECTORY scripts/install_dependencies/
-            DESTINATION install_dependencies
-            COMPONENT install_dependencies)
- endif()
- 
- # install files for demo
- 
-ie_cpack_add_component(demo_scripts DEPENDS core)
- 
- if(UNIX)
-    install(DIRECTORY scripts/demo/
-            DESTINATION deployment_tools/demo
-            COMPONENT demo_scripts
-            USE_SOURCE_PERMISSIONS
-            PATTERN *.bat EXCLUDE)
- elseif(WIN32)
-     install(DIRECTORY scripts/demo/
-             DESTINATION deployment_tools/demo
-diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
-index 0e1fe76db2..97867a24f8 100644
--- a/cmake/developer_package/IEDevScriptsConfig.cmake
-+++ b/cmake/developer_package/IEDevScriptsConfig.cmake
-@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT)
-     if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
-         message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
-     endif()
-    set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
-+    set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
- endif()
- 
- # Enable postfixes for Debug/Release builds
-diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
-index 2b5e945b17..adc4bef0bc 100644
--- a/cmake/developer_package/packaging.cmake
-+++ b/cmake/developer_package/packaging.cmake
-@@ -5,7 +5,9 @@
- include(CPackComponent)
- unset(IE_CPACK_COMPONENTS_ALL CACHE)
- 
-set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
-+if (NOT DEFINED IE_CPACK_IE_DIR)
-+    set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
-+endif()
- 
- #
- # ie_cpack_set_library_dir()
-@@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir)
-         set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-     else()
-        set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
-        set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
-+        set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-+        set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
-     endif()
- endfunction()
-diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
-index aae1dbb7fb..e6dac2a478 100644
--- a/cmake/developer_package/plugins/plugins.cmake
-+++ b/cmake/developer_package/plugins/plugins.cmake
-@@ -124,7 +124,7 @@ function(ie_add_plugin)
- 
-         install(TARGETS ${IE_PLUGIN_NAME}
-             RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}
-            LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component})
-+            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component})
-     endif()
- endfunction()
- 
-diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
-index 45b2b3e9ed..55f7dfd214 100644
--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
-+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
-@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
- if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
-     add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
- endif()
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index ae93857944..fba24c6fed 100644
--- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -33,7 +33,7 @@ endif()
- 
- if(IE_MAIN_SOURCE_DIR)
-     # in case if samples are built from IE repo
-    set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
-+    set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
-     # hint for find_package(InferenceEngine in the samples folder)
-     set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
-     # hint for find_package(ngraph in the samples folder)
-@@ -256,6 +256,8 @@ macro(ie_add_sample)
-     if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
-         add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS})
-     endif()
-+    
-+    install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
- endmacro()
- 
- # collect all samples subdirectories
-diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
-index d75061e56c..a2f8bd6397 100644
--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
-+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
-@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
- 
- if(COMMAND add_clang_format_target)
-     add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
-endif()
-\ No newline at end of file
-+endif()
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 5d044e097c..103c187913 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -227,35 +227,6 @@ list(APPEND core_components ngraph)
- list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR"
-                       "IE_PARALLEL_CMAKE")
- 
-if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
-    ie_cpack_add_component(tbb REQUIRED)
-    list(APPEND core_components tbb)
-
-    install(DIRECTORY "${TBB}/include"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-            COMPONENT tbb)
-    install(DIRECTORY "${TBB}/lib"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-            COMPONENT tbb)
-    if(EXISTS "${TBB}/bin")
-        install(DIRECTORY "${TBB}/bin"
-                DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-                COMPONENT tbb)
-    endif()
-    install(FILES "${TBB}/LICENSE"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-            COMPONENT tbb)
-
-    set(IE_TBB_DIR_INSTALL "external/tbb/cmake")
-    set(IE_TBB_DIR "${TBB_DIR}")
-    list(APPEND PATH_VARS "IE_TBB_DIR")
-
-    install(FILES "${TBB}/cmake/TBBConfig.cmake"
-                  "${TBB}/cmake/TBBConfigVersion.cmake"
-            DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL}
-            COMPONENT tbb)
-endif()
-
- # Install Inference Engine
- 
- ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
-@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
-         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
- 
- install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT core)
- 
- # Install cmake scripts
-@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
- install(EXPORT InferenceEngineTargets
-         FILE InferenceEngineTargets.cmake
-         NAMESPACE IE::
-        DESTINATION ${IE_CPACK_IE_DIR}/share
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core_dev)
- 
- set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph")
-@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers
- install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-               "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
-               "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake"
-        DESTINATION ${IE_CPACK_IE_DIR}/share
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core_dev)
-diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
-index f9548339d1..2670a04b60 100644
--- a/inference-engine/src/preprocessing/CMakeLists.txt
-+++ b/inference-engine/src/preprocessing/CMakeLists.txt
-@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME})
- 
- install(TARGETS ${TARGET_NAME}
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
-+        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
-diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt
-index 6d2bd39f3c..0722702055 100644
--- a/inference-engine/src/readers/ir_reader/CMakeLists.txt
-+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt
-@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- 
- install(TARGETS ${TARGET_NAME}
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
-+        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
-diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-index a3e0182ed9..1b0e241485 100644
--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
- # install
- if (LINUX)
-     install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
-        DESTINATION ${IE_CPACK_IE_DIR}/external
-+        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
-         COMPONENT myriad)
- endif()
-diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
-index dfa8ce9d3f..88e7fbf67f 100644
--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
-@@ -25,3 +25,5 @@ addIeTargetTest(
- ie_faster_build(${TARGET_NAME}
-     UNITY
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-index 5c38c77b9b..927f93484f 100644
--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-@@ -26,3 +26,5 @@ addIeTargetTest(
-         LABELS
-             IE
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
-index fcb9f567bb..d4ac1952b8 100644
--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
-@@ -33,3 +33,5 @@ addIeTargetTest(
-             VPU
-             MYRIAD
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
-index 6e6f384289..a76ba55e64 100644
--- a/inference-engine/tools/compile_tool/CMakeLists.txt
-+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
-@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- ie_cpack_add_component(core_tools DEPENDS core)
- 
- install(TARGETS compile_tool
-        RUNTIME DESTINATION deployment_tools/tools/compile_tool
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-         COMPONENT core_tools)
- 
- install(FILES README.md
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index 830fb3eb36..3093596e4a 100644
--- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -183,10 +183,10 @@ endif()
- message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
- 
- # Destinations
-set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}")
-set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}")
-set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}")
-set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}")
-+set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}")
-+set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}")
-+set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}")
-+set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}")
- 
- #-----------------------------------------------------------------------------------------------
- # Compile Flags for nGraph...
-- 
-2.32.0
-
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
@ -1,29 +0,0 @@
-From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Mon, 30 Aug 2021 17:54:17 +0800
-Subject: [PATCH] demos: use gflags from meta-oe
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- demos/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
-index 1df8f248d..d368d608c 100644
--- a/demos/CMakeLists.txt
-+++ b/demos/CMakeLists.txt
-@@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g
- find_package(InferenceEngine REQUIRED)
- find_package(ngraph REQUIRED)
- 
-add_subdirectory(thirdparty/gflags)
-+#add_subdirectory(thirdparty/gflags)
- add_subdirectory(common/cpp)
- add_subdirectory(multi_channel_common/cpp)
- 
-- 
-2.17.1
-
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb
@ -1,66 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository"
-HOMEPAGE = "https://github.com/opencv/open_model_zoo"
-DESCRIPTION = "This repository includes optimized deep learning \
-models and a set of demos to expedite development of high-performance \
-deep learning inference applications."
-
-SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \
-           file://0001-use-oe-gflags.patch \
-           "
-
-SRCREV = "0d7aeac5eacdd343fdf9b375a23b7ec9a3846002"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-"
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-OECMAKE_SOURCEPATH = "${S}/demos"
-
-DEPENDS += "openvino-inference-engine opencv gflags"
-
-RDEPENDS:${PN} += " \
-                   python3-decorator \
-                   python3-defusedxml \
-                   python3-networkx \
-                   python3-protobuf \
-                   python3-requests \
-                   python3-pyyaml \
-                   python3-numpy \
-                   bash \
-"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-EXTRA_OECMAKE += " \
-                 -DIE_MAIN_SOURCE_DIR=${B} \
-                 -DENABLE_SAMPLES=ON \
-                 -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \
-                 -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \
-                 -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \
-                 -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \
-                 -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \
-                 -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \
-"
-
-do_configure:prepend(){
-	mkdir -p ${WORKDIR}/InferenceEngine/share
-	cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/
-}
-
-do_install(){
-	install -d ${D}${libdir}
-	install -d ${D}${bindir}
-	install -d ${D}${datadir}/openvino/open-model-zoo/tools
-	install -d ${D}${datadir}/openvino/open-model-zoo/demos
-	cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir}
-	cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
-	cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
-	cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
-	cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools
-}
-
-FILES:${PN} += "${datadir}/openvino"
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb
@ -1,132 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
-HOMEPAGE = "https://github.com/opencv/dldt"
-DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
-deep learning models through a high-level C++ Inference Engine API \
-integrated with application logic."
-
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2021/4;lfs=0 \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \
-           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
-           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
-           git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/ngraph/python/pybind11;name=pybind11;branch=master \
-           file://0001-inference-engine-use-system-installed-packages.patch \
-           file://0002-Disable-Werror.patch \
-           file://0003-inference-engine-installation-fixes.patch \
-           file://0001-dont-install-licenses-and-version-file.patch \
-           "
-
-SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8"
-SRCREV_mkl = "60f41b3a9988ce7b1bc85c4f1ce7f9443bc91c9d"
-SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
-SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879"
-
-SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
-SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
-
-LICENSE = "Apache-2.0 & ISSL & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \
-                    file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
-                    file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-"
-LICENSE:${PN}-vpu-firmware = "ISSL"
-
-inherit cmake python3native
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += " \
-                  -DENABLE_OPENCV=0 \
-                  -DENABLE_PLUGIN_RPATH=0 \
-                  -DENABLE_GNA=0 \
-                  -DPYTHON_EXECUTABLE=${PYTHON} \
-                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \
-                  -DENABLE_SAMPLES=1 \
-                  -DIE_CPACK_IE_DIR=${prefix} \
-                  -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
-                  -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
-                  -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
-                  -DNGRAPH_JSON_ENABLE=FALSE \
-                  -DTREAT_WARNING_AS_ERROR=FALSE \
-                  -DENABLE_SPEECH_DEMO=FALSE \
-                  -DENABLE_DATA=FALSE \
-                  -DUSE_SYSTEM_PUGIXML=TRUE \
-                  "
-
-DEPENDS += "libusb1 \
-            ade \
-            opencv \
-            pugixml \
-            protobuf-native \
-            tbb \
-            zlib \
-            "
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-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
-#compile with LLVM13. Enable it after upstream has fixed it.
-#PACKAGECONFIG ?= "vpu opencl"
-PACKAGECONFIG ?= "vpu"
-PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime"
-PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
-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() {
-    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}/
-    fi
-
-    if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-        install -d ${D}${datadir}/inference_engine
-        mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/
-
-        install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-        mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
-        mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
-        mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
-
-        rm -rf ${D}${prefix}/python
-    fi
-
-    rm -rf ${D}${prefix}/deployment_tools
-
-    # Remove the samples source directory. We install the built samples.
-    rm -rf ${D}/usr/samples
-}
-
-# 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"
-
-FILES:${PN}-dev = "${includedir} \
-                   ${libdir}/cmake \
-                   "
-
-FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \
-                ${datadir}/openvino \
-                ${libdir}/custom_kernels \
-                ${libdir}/plugins.xml \
-                ${libdir}/cache.json \
-                "
-
-# Move inference engine samples into a separate package
-PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
-
-FILES:${PN}-samples = "${datadir}/inference_engine \
-                       ${bindir} \
-                       "
-FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd"
-
-# Package for inference engine python API
-PACKAGES =+ "${PN}-${PYTHON_PN}"
-
-FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
--- a/lib/oeqa/runtime/cases/dldt_inference_engine.py
+++ b/lib/oeqa/runtime/cases/dldt_inference_engine.py
@ -1,109 +0,0 @@
-from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.runtime.decorator.package import OEHasPackage
-from oeqa.core.decorator.depends import OETestDepends
-from oeqa.runtime.miutils.targets.oeqatarget import OEQATarget
-from oeqa.runtime.miutils.tests.squeezenet_model_download_test import SqueezenetModelDownloadTest
-from oeqa.runtime.miutils.tests.dldt_model_optimizer_test import DldtModelOptimizerTest
-from oeqa.runtime.miutils.tests.dldt_inference_engine_test import DldtInferenceEngineTest
-from oeqa.runtime.miutils.dldtutils import get_testdata_config
-
-class DldtInferenceEngine(OERuntimeTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.sqn_download = SqueezenetModelDownloadTest(OEQATarget(cls.tc.target), '/tmp/ie/md')
-        cls.sqn_download.setup()
-        cls.dldt_mo = DldtModelOptimizerTest(OEQATarget(cls.tc.target), '/tmp/ie/ir')
-        cls.dldt_mo.setup()
-        cls.dldt_ie = DldtInferenceEngineTest(OEQATarget(cls.tc.target), '/tmp/ie/inputs')
-        cls.dldt_ie.setup()
-        cls.ir_files_dir = cls.dldt_mo.work_dir
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.dldt_ie.tear_down()
-        cls.dldt_mo.tear_down()
-        cls.sqn_download.tear_down()
-
-    @OEHasPackage(['dldt-model-optimizer'])
-    @OEHasPackage(['wget'])
-    def test_dldt_ie_can_create_ir_and_download_input(self):
-        proxy_port = get_testdata_config(self.tc.td, 'DLDT_PIP_PROXY')
-        if not proxy_port:
-            self.skipTest('Need to configure bitbake configuration (DLDT_PIP_PROXY="proxy.server:port").')
-        (status, output) = self.sqn_download.test_can_download_squeezenet_model(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-        (status, output) = self.sqn_download.test_can_download_squeezenet_prototxt(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-        mo_exe_dir = get_testdata_config(self.tc.td, 'DLDT_MO_EXE_DIR')
-        if not mo_exe_dir:
-            self.skipTest('Need to configure bitbake configuration (DLDT_MO_EXE_DIR="directory_to_mo.py").')
-        mo_files_dir = self.sqn_download.work_dir
-        (status, output) = self.dldt_mo.test_dldt_mo_can_create_ir(mo_exe_dir, mo_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-        (status, output) = self.dldt_ie.test_can_download_input_file(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-samples'])
-    def test_dldt_ie_classification_with_cpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('CPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-samples'])
-    @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['ocl-icd'])
-    def test_dldt_ie_classification_with_gpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device('GPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-samples'])
-    @OEHasPackage(['dldt-inference-engine-vpu-firmware'])
-    def test_dldt_ie_classification_with_myriad(self):
-        device = 'MYRIAD'
-        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
-        if not status:
-            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_with_device(device, self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-python3'])
-    @OEHasPackage(['python3-opencv'])
-    @OEHasPackage(['python3-numpy'])
-    def test_dldt_ie_classification_python_api_with_cpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('CPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-python3'])
-    @OEHasPackage(['intel-compute-runtime'])
-    @OEHasPackage(['ocl-icd'])
-    @OEHasPackage(['python3-opencv'])
-    @OEHasPackage(['python3-numpy'])
-    def test_dldt_ie_classification_python_api_with_gpu(self):
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device('GPU', self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-    @OETestDepends(['dldt_inference_engine.DldtInferenceEngine.test_dldt_ie_can_create_ir_and_download_input'])
-    @OEHasPackage(['dldt-inference-engine'])
-    @OEHasPackage(['dldt-inference-engine-python3'])
-    @OEHasPackage(['dldt-inference-engine-vpu-firmware'])
-    @OEHasPackage(['python3-opencv'])
-    @OEHasPackage(['python3-numpy'])
-    def test_dldt_ie_classification_python_api_with_myriad(self):
-        device = 'MYRIAD'
-        (status, output) = self.dldt_ie.test_check_if_openvino_device_available(device)
-        if not status:
-            self.skipTest('OpenVINO %s device not available on target machine(availalbe devices: %s)' % (device, output))
-        (status, output) = self.dldt_ie.test_dldt_ie_classification_python_api_with_device(device, self.ir_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
--- a/lib/oeqa/runtime/cases/dldt_model_optimizer.py
+++ b/lib/oeqa/runtime/cases/dldt_model_optimizer.py
@ -1,38 +0,0 @@
-from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.runtime.decorator.package import OEHasPackage
-from oeqa.runtime.miutils.targets.oeqatarget import OEQATarget
-from oeqa.runtime.miutils.tests.squeezenet_model_download_test import SqueezenetModelDownloadTest
-from oeqa.runtime.miutils.tests.dldt_model_optimizer_test import DldtModelOptimizerTest
-from oeqa.runtime.miutils.dldtutils import get_testdata_config
-
-class DldtModelOptimizer(OERuntimeTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.sqn_download = SqueezenetModelDownloadTest(OEQATarget(cls.tc.target), '/tmp/mo/md')
-        cls.sqn_download.setup()
-        cls.dldt_mo = DldtModelOptimizerTest(OEQATarget(cls.tc.target), '/tmp/mo/ir')
-        cls.dldt_mo.setup()
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.dldt_mo.tear_down()
-        cls.sqn_download.tear_down()
-
-    @OEHasPackage(['dldt-model-optimizer'])
-    @OEHasPackage(['wget'])
-    def test_dldt_mo_can_create_ir(self):
-        proxy_port = get_testdata_config(self.tc.td, 'DLDT_PIP_PROXY')
-        if not proxy_port:
-            self.skipTest('Need to configure bitbake configuration (DLDT_PIP_PROXY="proxy.server:port").')
-        (status, output) = self.sqn_download.test_can_download_squeezenet_model(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-        (status, output) = self.sqn_download.test_can_download_squeezenet_prototxt(proxy_port)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-
-        mo_exe_dir = get_testdata_config(self.tc.td, 'DLDT_MO_EXE_DIR')
-        if not mo_exe_dir:
-            self.skipTest('Need to configure bitbake configuration (DLDT_MO_EXE_DIR="directory_to_mo.py").')
-        mo_files_dir = self.sqn_download.work_dir
-        (status, output) = self.dldt_mo.test_dldt_mo_can_create_ir(mo_exe_dir, mo_files_dir)
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
--- a/lib/oeqa/runtime/cases/jhi.py
+++ b/lib/oeqa/runtime/cases/jhi.py
@ -1,41 +0,0 @@
-import os
-from oeqa.runtime.decorator.package import OEHasPackage
-from oeqa.runtime.case import OERuntimeTestCase
-from oeqa.core.decorator.depends import OETestDepends
-
-class JhiTest(OERuntimeTestCase):
-
-    @classmethod
-    def tearDownClass(cls):
-        _, output = cls.tc.target.run('pidof jhid')
-        cls.tc.target.run('kill %s' % output)
-
-    @OEHasPackage(['openssh-sshd'])
-    @OEHasPackage(['jhi'])
-    def test_jhi_mei_driver(self):
-        command = 'ls /dev/mei*'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
-
-    @OETestDepends(['jhi.JhiTest.test_jhi_mei_driver'])
-    def test_jhi_daemon_version(self):
-        command = 'jhid -v'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
-
-    @OETestDepends(['jhi.JhiTest.test_jhi_mei_driver'])
-    def test_jhi_daemon_can_initialized(self):
-        command = 'jhid -d'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
-
-    @OEHasPackage(['jhi-test'])
-    @OETestDepends(['jhi.JhiTest.test_jhi_daemon_can_initialized'])
-    def test_jhi_bist(self):
-        (status, output) = self.target.run('uname -m')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
-        if 'x86_64' not in output:
-            self.skipTest("Skipped jhi bist test if not x86_64 machine (current machine: %s)." % output)
-        command = 'bist'
-        (status, output) = self.target.run(command)
-        self.assertEqual(status, 0, msg="Error messages: %s" % output)
--- a/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
+++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
@ -0,0 +1,9 @@
+# These should be reviewed to see if they are still needed
+ACPI: No _BQC method, cannot determine initial brightness
+[Firmware Bug]: ACPI: No _BQC method, cannot determine initial brightness
+(EE) Failed to load module "psb"
+(EE) Failed to load module "psbdrv"
+(EE) open /dev/fb0: No such file or directory
+(EE) AIGLX: reverting to software rendering
+dmi: Firmware registration failed.
+ioremap error for 0x78
--- a/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
+++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
@ -0,0 +1,14 @@
+# These should be reviewed to see if they are still needed
+can't set Max Payload Size to 256
+intel_punit_ipc: can't request region for resource
+[drm] parse error at position 4 in video mode 'efifb'
+ACPI Error: Could not enable RealTimeClock event
+ACPI Warning: Could not enable fixed event - RealTimeClock
+hci_intel INT33E1:00: Unable to retrieve gpio
+hci_intel: probe of INT33E1:00 failed
+can't derive routing for PCI INT A
+failed to read out thermal zone
+Bluetooth: hci0: Setting Intel event mask failed
+ttyS2 - failed to request DMA
+Bluetooth: hci0: Failed to send firmware data (-38)
+atkbd serio0: Failed to enable keyboard on isa0060/serio0
--- a/lib/oeqa/runtime/files/dldt-inference-engine/classification_sample.py
+++ b/lib/oeqa/runtime/files/dldt-inference-engine/classification_sample.py
@ -1,135 +0,0 @@
-#!/usr/bin/env python3
-"""
- Copyright (C) 2018-2019 Intel Corporation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-"""
-from __future__ import print_function
-import sys
-import os
-from argparse import ArgumentParser, SUPPRESS
-import cv2
-import numpy as np
-import logging as log
-from time import time
-from openvino.inference_engine import IENetwork, IECore
-
-
-def build_argparser():
-    parser = ArgumentParser(add_help=False)
-    args = parser.add_argument_group('Options')
-    args.add_argument('-h', '--help', action='help', default=SUPPRESS, help='Show this help message and exit.')
-    args.add_argument("-m", "--model", help="Required. Path to an .xml file with a trained model.", required=True,
-                      type=str)
-    args.add_argument("-i", "--input", help="Required. Path to a folder with images or path to an image files",
-                      required=True,
-                      type=str, nargs="+")
-    args.add_argument("-l", "--cpu_extension",
-                      help="Optional. Required for CPU custom layers. "
-                           "MKLDNN (CPU)-targeted custom layers. Absolute path to a shared library with the"
-                           " kernels implementations.", type=str, default=None)
-    args.add_argument("-d", "--device",
-                      help="Optional. Specify the target device to infer on; CPU, GPU, FPGA, HDDL, MYRIAD or HETERO: is "
-                           "acceptable. The sample will look for a suitable plugin for device specified. Default "
-                           "value is CPU",
-                      default="CPU", type=str)
-    args.add_argument("--labels", help="Optional. Path to a labels mapping file", default=None, type=str)
-    args.add_argument("-nt", "--number_top", help="Optional. Number of top results", default=10, type=int)
-
-    return parser
-
-
-def main():
-    log.basicConfig(format="[ %(levelname)s ] %(message)s", level=log.INFO, stream=sys.stdout)
-    args = build_argparser().parse_args()
-    model_xml = args.model
-    model_bin = os.path.splitext(model_xml)[0] + ".bin"
-
-    # Plugin initialization for specified device and load extensions library if specified
-    log.info("Creating Inference Engine")
-    ie = IECore()
-    if args.cpu_extension and 'CPU' in args.device:
-        ie.add_extension(args.cpu_extension, "CPU")
-    # Read IR
-    log.info("Loading network files:\n\t{}\n\t{}".format(model_xml, model_bin))
-    net = IENetwork(model=model_xml, weights=model_bin)
-
-    if "CPU" in args.device:
-        supported_layers = ie.query_network(net, "CPU")
-        not_supported_layers = [l for l in net.layers.keys() if l not in supported_layers]
-        if len(not_supported_layers) != 0:
-            log.error("Following layers are not supported by the plugin for specified device {}:\n {}".
-                      format(args.device, ', '.join(not_supported_layers)))
-            log.error("Please try to specify cpu extensions library path in sample's command line parameters using -l "
-                      "or --cpu_extension command line argument")
-            sys.exit(1)
-
-    assert len(net.inputs.keys()) == 1, "Sample supports only single input topologies"
-    assert len(net.outputs) == 1, "Sample supports only single output topologies"
-
-    log.info("Preparing input blobs")
-    input_blob = next(iter(net.inputs))
-    out_blob = next(iter(net.outputs))
-    net.batch_size = len(args.input)
-
-    # Read and pre-process input images
-    n, c, h, w = net.inputs[input_blob].shape
-    images = np.ndarray(shape=(n, c, h, w))
-    for i in range(n):
-        image = cv2.imread(args.input[i])
-        if image.shape[:-1] != (h, w):
-            log.warning("Image {} is resized from {} to {}".format(args.input[i], image.shape[:-1], (h, w)))
-            image = cv2.resize(image, (w, h))
-        image = image.transpose((2, 0, 1))  # Change data layout from HWC to CHW
-        images[i] = image
-    log.info("Batch size is {}".format(n))
-
-    # Loading model to the plugin
-    log.info("Loading model to the plugin")
-    exec_net = ie.load_network(network=net, device_name=args.device)
-
-    # Start sync inference
-    log.info("Starting inference in synchronous mode")
-    res = exec_net.infer(inputs={input_blob: images})
-
-    # Processing output blob
-    log.info("Processing output blob")
-    res = res[out_blob]
-    log.info("Top {} results: ".format(args.number_top))
-    if args.labels:
-        with open(args.labels, 'r') as f:
-            labels_map = [x.split(sep=' ', maxsplit=1)[-1].strip() for x in f]
-    else:
-        labels_map = None
-    classid_str = "classid"
-    probability_str = "probability"
-    for i, probs in enumerate(res):
-        probs = np.squeeze(probs)
-        top_ind = np.argsort(probs)[-args.number_top:][::-1]
-        print("Image {}\n".format(args.input[i]))
-        print(classid_str, probability_str)
-        print("{} {}".format('-' * len(classid_str), '-' * len(probability_str)))
-        for id in top_ind:
-            det_label = labels_map[id] if labels_map else "{}".format(id)
-            label_length = len(det_label)
-            space_num_before = (len(classid_str) - label_length) // 2
-            space_num_after = len(classid_str) - (space_num_before + label_length) + 2
-            space_num_before_prob = (len(probability_str) - len(str(probs[id]))) // 2
-            print("{}{}{}{}{:.7f}".format(' ' * space_num_before, det_label,
-                                          ' ' * space_num_after, ' ' * space_num_before_prob,
-                                          probs[id]))
-        print("\n")
-    log.info("This sample is an API example, for any performance measurements please use the dedicated benchmark_app tool\n")
-
-if __name__ == '__main__':
-    sys.exit(main() or 0)
--- a/lib/oeqa/runtime/miutils/dldtutils.py
+++ b/lib/oeqa/runtime/miutils/dldtutils.py
@ -1,3 +0,0 @@
-
-def get_testdata_config(testdata, config):
-    return testdata.get(config)
--- a/Show More
+++ b/Show More