294 files changed, 6754 insertions, 7062 deletions
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index a99cbb1f..00000000
--- a/CHANGELOG
+++ /dev/null
@@ -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"
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 880481e8..00000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,38 +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:      California Sullivan <california.l.sullivan@intel.com>
-F:      *
-M:      Juro Bystricky <juro.bystricky@intel.com>
-F:      *
-M:      Anuj Mittal <anuj.mittal@intel.com>
-F:      *
diff --git a/README b/README
deleted file mode 100644
index 0977e798..00000000
--- a/README
+++ /dev/null
@@ -1,440 +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
-  branch: 1.38
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: sumo
-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
-  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 downloaded the BSP tarball, you will find bootable images in
-the /binary directory.  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.
-The BSP /binary directory or build contains bootable live images,
-which can be used to directly boot Yocto off of a USB flash drive.
-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
-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)
-  * RMC - Runtime Machine Configuration, which allows the bootload to determine
-board and CPU information in order to set specific kernel command line
-information at startup.
-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
-    MinnowBoard Turbot
-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@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.
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..3ec3992b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,35 @@
+# 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)
+- [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>
diff --git a/README.sources b/README.sources
deleted file mode 100644
index ab71eb2b..00000000
--- a/README.sources
+++ /dev/null
@@ -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.5/poky-sumo-19.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
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000..e70fcb0f
--- /dev/null
+++ 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).
diff --git a/classes/rmc-boot.bbclass b/classes/rmc-boot.bbclass
deleted file mode 100644
index 37c3e30c..00000000
--- a/classes/rmc-boot.bbclass
+++ /dev/null
@@ -1,17 +0,0 @@
-# rmc-boot bbclass
-# Deploy central RMC database file to ESP
-IMAGE_INSTALL_append = " rmc"
-RMC_BOOTLOADER ?= "systemd-boot"
-inherit ${RMC_BOOTLOADER}
-do_bootimg[depends] += "${MLPREFIX}rmc-db:do_deploy"
-efi_populate_append() {
-        if [ -f ${DEPLOY_DIR_IMAGE}/rmc.db ]; then
-                install -m 0400 ${DEPLOY_DIR_IMAGE}/rmc.db ${DEST}/rmc.db
-        else
-                rm -f ${DEST}/rmc.db
-        fi
-}
diff --git a/classes/rmc-db.bbclass b/classes/rmc-db.bbclass
deleted file mode 100644
index 72594d69..00000000
--- a/classes/rmc-db.bbclass
+++ /dev/null
@@ -1,92 +0,0 @@
-# RMC database bbclass
-# provide functions to generate RMC database file on build host (native)
-DEPENDS += "rmc-native"
-# rmc_generate_db()
-# $1: a list of directories. Each directory holds directories for a group of
-# boards.
-# $2: path_name of rmc generates database file and records
-#
-# WARNING: content of directory of database file will be removed.
-#
-# Each board directory shall contain a fingerprint file (*.fp) at least, with
-# optional file blob(s) associated to the type of board. If a board directory
-# has no file blob, no record is created for that board.
-#
-# An example of two directories each of which contains two boards for RMC:
-# (All file and directory names are for illustration purpose.)
-#
-# dir_1/
-#     board_1/
-#         board_1_fingerprint.fp
-#         file_1.blob
-#     board_2/
-#         board_2.fp
-# dir_2/
-#     board_3/
-#         b3.fp
-#         file_1.blob
-#         file_2.conf
-#     board_4/
-#         board_foo.fp
-#         mylib.config
-#
-# To generate a RMC database "rmc.db" with data of all (actually 3) of boards in
-# a directory "deploy_dir":
-#
-# rmc_generate_db "dir_1 dir_2" "deploy_dir/rmc.db"
-#
-# The board_2 will be skipped. No record or any data for it is packed in
-# generated database because it only contains a fingerprint file.
-#
-rmc_generate_db () {
-        RMC_BOARD_DIRS=$1
-        if [ "$#" -ne 2 ]; then
-                echo "rmc_generate_db(): Wrong number of arguments: $#"
-                return 1
-        fi
-        RMC_DB_DIR=$(dirname "$2")
-        RMC_RECORDS=""
-        rm -rf ${RMC_DB_DIR}
-        mkdir -p ${RMC_DB_DIR}
-        # generate rmc database
-        for topdir in ${RMC_BOARD_DIRS}; do
-                # For all board dirs in a topdir:
-                CUR_BOARD_DIRS=$(find ${topdir}/* -type d)
-                for board_dir in ${CUR_BOARD_DIRS}; do
-                        CUR_FINGERPRINT=$(find ${board_dir}/ -name "*.fp")
-                        # disallow a board directory without any fingerprint file in it.
-                        if [ -z "${CUR_FINGERPRINT}" ]; then
-                                echo "Cannot find RMC fingerprint file in ${board_dir}"
-                                return 1
-                        fi
-                        CUR_FILES=$(find ${board_dir}/ -type f |grep -v '\.fp$' || true)
-                        # allow a directory only with fingerprint file. Developer may
-                        # check in fingerprint for future use.
-                        if [ -z "${CUR_FILES}" ]; then
-                                continue
-                        fi
-                        for fp in ${CUR_FINGERPRINT}; do
-                                fullname=$(basename ${fp})
-                                CUR_TAG="${fullname%.*}"
-                                CUR_RECORD=${RMC_DB_DIR}/${CUR_TAG}.rec
-                                rmc -R -f ${fp} -b ${CUR_FILES} -o ${CUR_RECORD}
-                                RMC_RECORDS="${RMC_RECORDS} ${CUR_RECORD}"
-                        done
-                done
-        done
-        if [ ! -z "${RMC_RECORDS}" ]; then
-                rmc -D ${RMC_RECORDS} -o "$2"
-        fi
-}
diff --git a/classes/uefi-comboapp.bbclass b/classes/uefi-comboapp.bbclass
index 4ecc5535..a05e0ca0 100644
--- a/classes/uefi-comboapp.bbclass
+++ b/classes/uefi-comboapp.bbclass
@@ -4,8 +4,8 @@
 # it with the efi stub obtained from systemd-boot.
 # Don't add syslinux or build an ISO
-PCBIOS_forcevariable = "0"
+PCBIOS:forcevariable = "0"
-NOISO_forcevariable  = "1"
+NOISO:forcevariable  = "1"
 # image-live.bbclass will default INITRD_LIVE to the image INITRD_IMAGE creates.
 # We want behavior to be consistent whether or not "live" is in IMAGE_FSTYPES, so
@@ -138,7 +138,7 @@ build_efi_cfg() {
    :
 }
-populate_kernel_append() {
+populate_kernel:append() {
    # The kernel and initrd are built into the app, so we don't need these
    if [ -f $dest/initrd ]; then
        rm $dest/initrd
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index d37ddb5e..9849d0d8 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -1,21 +1,54 @@
 # This file contains a list of recipe maintainers for meta-intel
-RECIPE_MAINTAINER_pn-core-image-rt = "Stephano Cetola <stephano.cetola@linux.intel.com>"
+RECIPE_MAINTAINER:pn-backport-iwlwifi = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Stephano Cetola <stephano.cetola@linux.intel.com>"
+RECIPE_MAINTAINER:pn-core-image-rt = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-gma500-gfx-check = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-core-image-rt-sdk = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-intel-gpu-tools = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-core-image-tiny = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-intel-microcode = "California Sullivan <california.l.sullivan@intel.com>"
+RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-core-image-minimal-initramfs = "California Sullivan <califorddnia.l.sullivan@intel.com>"
+RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-iucode-tool = "California Sullivan <california.l.sullivan@intel.com>"
+RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER_pn-intel-vaapi-driver = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-intel-cmt-cat = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-linux-intel = "California Sullivan <california.l.sullivan@intel.com>"
+RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-linux-intel-rt = "California Sullivan <california.l.sullivan@intel.com>"
+RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-lms7 = "TBD"
+RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER_pn-lms8 = "TBD"
+RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER_pn-rmc = "Stephano Cetola <stephano.cetola@linux.intel.com>"
+RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-rmc-db = "Stephano Cetola <stephano.cetola@linux.intel.com>"
+RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER_pn-thermald = "California Sullivan <california.l.sullivan@intel.com>"
+RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-va-intel = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-isa-l = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-ispc = "Naveen Saini <naveen.kumar.saini@intel.com>"
+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-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-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-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>"
+RECIPE_MAINTAINER:pn-oidn = "Naveen Saini <naveen.kumar.saini@intel.com>"
+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>"
diff --git a/conf/layer.conf b/conf/layer.conf
index 29a0f389..97dfb897 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,15 +10,36 @@ BBFILE_PATTERN_intel := "^${LAYERDIR}/"
 BBFILE_PRIORITY_intel = "5"
 # Additional license directories.
-LICENSE_PATH += "${LAYERDIR}/custom-licenses"
+CUSTOM_LICENSES_PATH = "${LAYERDIR}/custom-licenses"
+LICENSE_PATH += "${CUSTOM_LICENSES_PATH}"
 LAYERDEPENDS_intel = "core"
-LAYERRECOMMENDS_intel = "dpdk intel-qat"
+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 = "sumo"
+LAYERSERIES_COMPAT_intel = "kirkstone scarthgap"
+BBFILES_DYNAMIC += " \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bbappend \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
+"
 require ${LAYERDIR}/conf/include/maintainers.inc
+# Use the libva from OE-Core when layer is included but no MACHINE
+# from meta-intel is being used.
+PREFERRED_PROVIDER_libva ?= "libva"
+PREFERRED_PROVIDER_libva-native ?= "libva-native"
+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
diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc
index d0f208bd..94d77e06 100644
--- a/conf/machine/include/intel-common-pkgarch.inc
+++ b/conf/machine/include/intel-common-pkgarch.inc
@@ -1,15 +1,15 @@
 INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common"
-PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_EXTRA_ARCHS:append = " ${INTEL_COMMON_PACKAGE_ARCH}"
 MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:"
diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc
index 8c469499..ce34d9bb 100644
--- a/conf/machine/include/intel-core2-32-common.inc
+++ b/conf/machine/include/intel-core2-32-common.inc
@@ -3,5 +3,5 @@
 #
 DEFAULTTUNE ?= "core2-32"
-require conf/machine/include/tune-core2.inc
+require conf/machine/include/x86/tune-core2.inc
-require conf/machine/include/x86-base.inc
+require conf/machine/include/x86/x86-base.inc
diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc
index 00282569..3498ebe3 100644
--- a/conf/machine/include/intel-corei7-64-common.inc
+++ b/conf/machine/include/intel-corei7-64-common.inc
@@ -3,5 +3,5 @@
 #
 DEFAULTTUNE ?= "corei7-64"
-require conf/machine/include/tune-corei7.inc
+require conf/machine/include/x86/tune-corei7.inc
-require conf/machine/include/x86-base.inc
+require conf/machine/include/x86/x86-base.inc
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index c5f9ceee..230d0253 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -4,33 +4,44 @@
 # to use them.
 #
-#
-# XSERVER subcomponents, used to build the XSERVER variable
-#
-# Soft set linux-yocto as preferred kernel like x86-base.inc
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
-PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel"
+PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel"
-PREFERRED_VERSION_linux-intel_linuxstdbase ?= "4.9%"
-PREFERRED_VERSION_linux-intel ?= "4.14%"
+PREFERRED_VERSION_linux-intel ?= "6.6%"
+PREFERRED_VERSION_linux-intel-rt ?= "6.6%"
+PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.8%"
+# Need to point to latest version of libva needed for media components
+PREFERRED_PROVIDER_libva = "libva-intel"
+PREFERRED_PROVIDER_libva-native = "libva-intel-native"
+PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel"
+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"
+LLVM_MAJOR_VERSION = "${@d.getVar('LLVMVERSION').split('.')[0]}"
+PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}"
+PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}"
 XSERVER_X86_ASPEED_AST = "xf86-video-ast \
           "
 # include the user space intel microcode loading support in the generated images.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)} thermald"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}"
 # recommended extra packages common to all intel machines
-MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware"
+MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware"
+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.
-INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
+INITRD_LIVE:prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
 DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef"
 EFI_PROVIDER ?= "systemd-boot"
-EFI_PROVIDER_x86-x32 = "grub-efi"
+EFI_PROVIDER:x86-x32 = "grub-efi"
 # Add general MACHINEOVERRIDE for meta-intel
 MACHINEOVERRIDES =. "intel-x86-common:"
diff --git a/conf/machine/include/qemu-intel.inc b/conf/machine/include/qemu-intel.inc
index 81510404..4608db99 100644
--- a/conf/machine/include/qemu-intel.inc
+++ b/conf/machine/include/qemu-intel.inc
@@ -2,7 +2,7 @@
 # distro content (in particular the kernel) less than qemu.inc.
 # Ensure that qemu gets built when building images.
-EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
+EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
 # Build ovmf firmware for uefi support in qemu.
 EXTRA_IMAGEDEPENDS += "ovmf"
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
index 6586cf09..17a1234d 100644
--- a/conf/machine/include/qemuboot-intel.inc
+++ b/conf/machine/include/qemuboot-intel.inc
@@ -1,15 +1,18 @@
 # For runqemu
 IMAGE_CLASSES += "qemuboot"
-QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386"
+QB_SYSTEM_NAME:intel-core2-32 = "qemu-system-i386"
-QB_CPU_intel-core2-32 = "-cpu coreduo"
+QB_CPU:intel-core2-32 = "-cpu coreduo"
-QB_CPU_KVM_intel-core2-32 = "-cpu kvm32"
+QB_CPU_KVM:intel-core2-32 = "-cpu kvm32"
-QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64"
+QB_SYSTEM_NAME:intel-corei7-64 = "qemu-system-x86_64"
-QB_CPU_intel-corei7-64 = "-cpu Nehalem"
+QB_CPU:intel-corei7-64 = "-cpu Nehalem"
-QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64"
+QB_CPU_KVM:intel-corei7-64 = "-cpu kvm64"
+QB_SYSTEM_NAME:intel-skylake-64 = "qemu-system-x86_64"
+QB_CPU:intel-skylake-64 = "-cpu Skylake-Client"
+QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client"
 QB_AUDIO_DRV = "alsa"
-QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_AUDIO_OPT = "-device AC97"
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
+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 "
-QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 90c7956d..5b134dc3 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -8,13 +8,10 @@ require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 MACHINE_FEATURES += "pcbios efi"
-MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
-MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
 XSERVER ?= "${XSERVER_X86_BASE} \
            ${XSERVER_X86_EXT} \
@@ -27,9 +24,9 @@ XSERVER ?= "${XSERVER_X86_BASE} \
           "
 SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
 APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
-WKS_FILE_DEPENDS_append = " intel-microcode"
+WKS_FILE_DEPENDS:append = " intel-microcode"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 9467d090..968395fe 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -8,22 +8,14 @@ require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 MACHINE_FEATURES += "pcbios efi"
-MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
-MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi"
-MACHINE_EXTRA_RRECOMMENDS += "lms8"
 # Enable optional dpdk:
-COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64"
+COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
-COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64"
+COMPATIBLE_MACHINE:pn-dpdk-module = "intel-corei7-64"
-# Enable optional QAT items:
-COMPATIBLE_MACHINE_pn-openssl-qat = "intel-corei7-64"
-COMPATIBLE_MACHINE_pn-qat16 = "intel-corei7-64"
-COMPATIBLE_MACHINE_pn-zlib-qat = "intel-corei7-64"
 XSERVER ?= "${XSERVER_X86_BASE} \
            ${XSERVER_X86_EXT} \
@@ -36,9 +28,9 @@ XSERVER ?= "${XSERVER_X86_BASE} \
           "
 SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
-WKS_FILE_DEPENDS_append = " intel-microcode"
+WKS_FILE_DEPENDS:append = " intel-microcode"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
new file mode 100644
index 00000000..a2b392c2
--- /dev/null
+++ b/conf/machine/intel-skylake-64.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: intel-skylake-64
+#@DESCRIPTION: Machine configuration for 64 bit Intel Skylake CPU (and later) with MMX, SSE, SSE2, SSE3, SSE4.1, SSE4.2, AVX, and AVX2 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
+require conf/machine/include/meta-intel.inc
+require conf/machine/include/x86/x86-base.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"
+COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64"
+COMPATIBLE_MACHINE:pn-dpdk-module = "intel-skylake-64"
+XSERVER ?= "${XSERVER_X86_BASE} \
+            ${XSERVER_X86_EXT} \
+            ${XSERVER_X86_FBDEV} \
+            ${XSERVER_X86_I915} \
+            ${XSERVER_X86_I965} \
+            ${XSERVER_X86_MODESETTING} \
+            ${XSERVER_X86_VESA} \
+            ${XSERVER_X86_ASPEED_AST} \
+           "
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+APPEND += "rootwait console=ttyS0,115200 console=tty0"
+IMAGE_FSTYPES += "wic"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
+WKS_FILE_DEPENDS:append = " intel-microcode"
diff --git a/custom-licenses/BSD_LMS b/custom-licenses/BSD_LMS
deleted file mode 100755
index 2ea28ff4..00000000
--- a/custom-licenses/BSD_LMS
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (C) 2004-2012 Intel Corporation. All rights reserved.
-�       This license covers the sources of the Local Manageability Service (LMS). 
-For licensing information for the LMS build scripts, please refer to the file build_script_license.txt.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  - Neither the name of Intel Corporation. nor the names of its
-    contributors may be used to endorse or promote products derived from this
-    software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/custom-licenses/EULA b/custom-licenses/EULA
new file mode 100644
index 00000000..549f78e1
--- /dev/null
+++ b/custom-licenses/EULA
@@ -0,0 +1,392 @@
+Intel End User License Agreement for Developer Tools (Version October 2021)
+IMPORTANT NOTICE - PLEASE READ AND AGREE BEFORE DOWNLOADING, INSTALLING, COPYING
+OR USING
+This Agreement is between you, or the company or other legal entity that you
+represent and warrant you have the legal authority to bind, (each, "You" or
+"Your") and Intel Corporation and its subsidiaries (collectively, "Intel")
+regarding Your use of the Materials. By downloading, installing, copying or
+using the Materials, You agree to be bound by the terms of this Agreement. If
+You do not agree to the terms of this Agreement, or do not have legal authority
+or required age to agree to them, do not download, install, copy or use the
+Materials.
+1. LICENSE DEFINITIONS.
+ A. "Cloud Provider" means a third party service provider offering a cloud-based
+    platform, infrastructure, application or storage services, such as Microsoft
+    Azure or Amazon Web Services, which You may only utilize to host the 
+    Materials subject to the restrictions set forth in Section 2.3 B.
+ B. "Derivative Work" means a derivative work, as defined in 17 U.S.C. 101, of
+    the Source Code.
+ C. "Executable Code" means computer programming code in binary form suitable
+    for machine execution by a processor without the intervening steps of
+    interpretation or compilation.
+ D. "Materials" mean the software, documentation, the software product serial
+    number, and other collateral, including any updates, made available to You 
+    by Intel under this Agreement. Materials include Redistributables, 
+    Executable Code, Source Code, Sample Source Code, and Pre-Release Materials, 
+    but do not include Third Party Software.
+ E. "Pre-Release Materials" mean the Materials, or portions of the Materials,
+    that are identified (in the product release notes, on Intel's download 
+    website for the Materials or elsewhere) or labeled as pre-release, 
+    prototype, alpha or beta code and, as such, are deemed to be pre-release 
+    code (i) which may not be fully functional or tested and may contain bugs or 
+    errors; (ii) which Intel may substantially modify in its development of a 
+    production version; or (iii) for which Intel makes no assurances that it 
+    will ever develop or make a production version generally available. 
+    Pre-Release Materials are subject to the terms of Section 3.2.
+ F. "Reciprocal Open Source Software" means any software that is subject to a
+    license which requires that (i) it must be distributed in source code form;
+    (ii) it must be licensed under the same open source license terms; and (iii)
+    its derivative works must be licensed under the same open source license 
+    terms. Examples of this type of license are the GNU General Public License 
+    or the Mozilla Public License.
+ G. "Redistributables" mean the files (if any) listed in the "redist.txt,"
+    "redist-rt.txt" or similarly-named text files that may be included in the
+    Materials. Redistributables include Sample Source Code.
+ H. "Sample Source Code" means those portions of the Materials that are Source
+    Code and are identified as sample code. Sample Source Code may not have been
+    tested or validated by Intel and is provided purely as a programming example.
+ I. "Source Code" means the software portion of the Materials provided in human
+    readable format.
+ J. "Third Party Software" mean the files (if any) listed in the
+    "third-party-software.txt" or other similarly-named text file that may be
+    included in the Materials for the applicable software. Third Party Software 
+    is subject to the terms of Section 2.2.
+ K. "Your Product" means one or more applications, products or projects
+    developed by or for You using the Materials.
+2. LICENSE GRANTS.
+2.1 License to the Materials. Subject to the terms and conditions of this
+    Agreement, Intel grants You a non-exclusive, worldwide, non-assignable,
+    non-sublicensable, limited right and license under its copyrights, to:
+ A. reproduce internally a reasonable number of copies of the Materials for Your
+    personal or business use;
+ B. use the Materials solely for Your personal or business use to develop Your
+    Product, in accordance with the documentation included as part of the
+    Materials;
+ C. modify or create Derivative Works only of the Redistributables, or any
+    portions, that are provided to You in Source Code;
+ D. distribute (directly and through Your distributors, resellers, and other
+    channel partners, if applicable), the Redistributables, including any
+    modifications to or Derivative Works of the Redistributables or any portions
+    made pursuant to Section 2.1.C subject to the following conditions:
+  (1) Any distribution of the Redistributables must only be as part of Your
+      Product which must add significant primary functionality different than 
+      that of the Redistributables themselves;
+  (2) You must only distribute the Redistributables originally provided to You
+      by Intel only in Executable Code subject to a license agreement that 
+      prohibits reverse engineering, decompiling or disassembling the 
+      Redistributables;
+  (3) This distribution right includes a limited right to sublicense only the
+      Intel copyrights in the Redistributables and only to the extent necessary 
+      to perform, display, and distribute the Redistributables (including Your
+      modifications and Derivative Works of the Redistributables provided in 
+      Source Code) solely as incorporated in Your Product; and
+  (4) You: (i) will be solely responsible to Your customers for any update,
+      support obligation or other obligation or liability which may arise from 
+      the distribution of Your Product, (ii) will not make any statement that 
+      Your Product is "certified" or that its performance is guaranteed by Intel 
+      or its suppliers, (iii) will not use Intel's or its suppliers' names or 
+      trademarks to market Your Product, (iv) will comply with any additional 
+      restrictions which are included in the text files with the 
+      Redistributables and in Section 3 below, (v) will indemnify, hold 
+      harmless, and defend Intel and its suppliers from and against any claims 
+      or lawsuits, costs, damages, and expenses, including attorney's fees, that 
+      arise or result from (a) Your modifications or Derivative Works of the 
+      Materials or (b) Your distribution of Your Product.
+2.2 Third Party Software. Third Party Software, even if included with the
+    distribution of the Materials, may be governed by separate license terms,
+    including without limitation, third party license terms, open source 
+    software notices and terms, and/or other Intel software license terms. These 
+    separate license terms solely govern Your use of the Third Party Software.
+2.3 Third Party Use.
+ A. If You are an entity, Your contractors may use the Materials under the
+    license specified in Section 2, provided: (i) their use of the Materials is
+    solely on behalf of and in support of Your business, (ii) they agree to the
+    terms and conditions of this Agreement, and (iii) You are solely responsible
+    for their use, misuse or disclosure of the Materials.
+ B. You may utilize a Cloud Provider to host the Materials for You, provided:
+    (i) the Cloud Provider may only host the Materials for Your exclusive use 
+   and may not use the Materials for any other purpose whatsoever, including the
+   restriction set forth in Section 3.1(xi); (ii) the Cloud Provider's use of 
+   the Materials must be solely on behalf of and in support of Your Product, and 
+   (iii) You will indemnify, hold harmless, and defend Intel and its suppliers 
+   from and against any claims or lawsuits, costs, damages, and expenses, 
+   including attorney's fees, that arise or result from Your Cloud Provider's 
+   use, misuse or disclosure of the Materials.
+3. LICENSE CONDITIONS.
+3.1 Restrictions. Except as expressly provided in this Agreement, You may NOT:
+    (i) use, reproduce, disclose, distribute, or publicly display the 
+    Materials; (ii) share, publish, rent or lease the Materials to any third 
+    party; (iii) assign this Agreement or transfer the Materials; (iv) modify, 
+    adapt, or translate the Materials in whole or in part; (v) reverse engineer, 
+    decompile, or disassemble the Materials, or otherwise attempt to derive the 
+    source code for the software; (vi) work around any technical limitations in 
+    the Materials; (vii) distribute, sublicense or transfer any Source Code, 
+    modifications or Derivative Works of any Source Code to any third party; 
+    (viii) remove, minimize, block or modify any notices of Intel or its 
+    suppliers in the Materials; (ix) include the Redistributables in malicious, 
+    deceptive, or unlawful programs or products or use the Materials in any way 
+    that is against the law; (x) modify, create a Derivative Work, link, or 
+    distribute the Materials so that any part of it becomes Reciprocal Open 
+    Source Software; (xi) use the Materials directly or indirectly for SaaS 
+    services or service bureau purposes (i.e., a service that allows use of or 
+    access to the Materials by a third party as part of that service, such as 
+    the salesforce.com service business model).
+3.2 Pre-Release Materials. If You receive Pre-Release Materials, You may
+    reproduce a reasonable number of copies and use the Pre-Release Materials 
+    for evaluation and testing purposes only. You may not (i) modify or 
+    incorporate the Pre-Release Materials into Your Product; (ii) continue to 
+    use the Pre-Release Materials once a commercial version is released; or 
+    (iii) disclose to any third party any benchmarks, performance results, or 
+    other information relating to the Pre-Release Materials. Intel may waive 
+    these restrictions in writing at its sole discretion; however, if You decide 
+    to use the Pre-Release Materials in Your Product (even with Intel's waiver), 
+    You acknowledge and agree that You are fully responsible for any and all 
+    issues that result from such use.
+3.3 Safety-Critical, and Life-Saving Applications; Indemnity. The Materials may
+    provide information relevant to safety-critical applications 
+    ("Safety-Critical Applications") to allow compliance with functional safety 
+    standards or requirements. You acknowledge and agree that safety is Your 
+    responsibility. To the extent You use the Materials to create, or as part 
+    of, products used in Safety-Critical Applications, it is Your responsibility 
+    to design, manage, and ensure that there are system-level safeguards to 
+    anticipate, monitor, and control system failures, and You agree that You are 
+    solely responsible for all applicable regulatory standards and 
+    safety-related requirements concerning Your use of the Materials in Safety 
+    Critical Applications. 
+    Should You use the Materials for Safety-Critical Applications or in any type 
+    of a system or application in which the failure of the Materials could 
+    create a situation where personal injury or death may occur (e.g., medical 
+    systems, life-sustaining or life-saving systems) ("Life-Saving 
+    Applications"), You agree to indemnify, defend, and hold Intel and its 
+    representatives harmless against any claims or lawsuits, costs, damages, and 
+    expenses, including reasonable attorney fees, arising in any way out of Your 
+    use of the Materials in Safety-Critical Applications or Life-Saving 
+    Applications and claims of product liability, personal injury or death 
+    associated with those applications; even if such claims allege that Intel 
+    was negligent or strictly liable regarding the design or manufacture of the 
+    Materials or its failure to warn regarding the Materials.
+3.4 Media Format Codecs and Digital Rights Management. You acknowledge and agree
+    that Your use of the Materials or distribution of the Redistributables with 
+    Your Product as permitted by this Agreement may require You to procure 
+    license(s) from third parties that may hold intellectual property rights 
+    applicable to any media decoding, encoding or transcoding technology (e.g., 
+    the use of an audio or video codec) and/or digital rights management 
+    capabilities of the Materials, if any. Should any such additional licenses 
+    be required, You are solely responsible for obtaining any such licenses and 
+    agree to obtain any such licenses at Your own expense.
+4. DATA COLLECTION AND PRIVACY.
+4.1 Data Collection. The Materials may generate and collect anonymous data
+    and/or provisioning data about the Materials and/or the development 
+    environment and transmit the data to Intel as a one-time event during 
+    installation. Optional data may also be collected by the Materials, however, 
+    You will be provided notice of the request to collect optional data and no 
+    optional data will be collected without Your consent. All data collection by 
+    Intel is performed pursuant to relevant privacy laws, including notice and 
+    consent requirements.
+4.2 Intel's Privacy Notice. Intel is committed to respecting Your privacy. To
+    learn more about Intel's privacy practices, please visit
+    http://www.intel.com/privacy.
+5. OWNERSHIP. Title to the Materials and all copies remain with Intel or its
+   suppliers. The Materials are protected by intellectual property rights,
+   including without limitation, United States copyright laws and international
+   treaty provisions. You will not remove any copyright or other proprietary
+   notices from the Materials. Except as expressly provided herein, no license 
+   or right is granted to You directly or by implication, inducement, estoppel 
+   or otherwise; specifically, Intel does not grant any express or implied right 
+   to You under Intel patents, copyrights, trademarks, or trade secrets.
+6. NO WARRANTY AND NO SUPPORT.
+6.1 No Warranty. Disclaimer. Intel disclaims all warranties of any kind and the
+    terms and remedies provided in this Agreement are instead of any other 
+    warranty or condition, express, implied or statutory, including those 
+    regarding merchantability, fitness for any particular purpose, 
+    non-infringement or any warranty arising out of any course of dealing, usage 
+    of trade, proposal, specification or sample. Intel does not assume (and does 
+    not authorize any person to assume on its behalf) any liability.
+6.2 No Support; Priority Support. Intel may make changes to the Materials, or to
+    items referenced therein, at any time without notice, but is not obligated 
+    to support, update or provide training for the Materials under the terms of 
+    this Agreement. Intel offers free community and paid priority support 
+    options. More information on these support options can be found at:
+    https://software.intel.com/content/www/us/en/develop/support/priority-support.html.
+7. LIMITATION OF LIABILITY.
+7.1 Intel will not be liable for any of the following losses or damages (whether
+    such losses or damages were foreseen, foreseeable, known or otherwise):  (i)
+    loss of revenue; (ii) loss of actual or anticipated profits; (iii) loss of 
+    the use of money; (iv) loss of anticipated savings; (v) loss of business; 
+    (vi) loss of opportunity; (vii) loss of goodwill; (viii) loss of use of the 
+    Materials; (ix) loss of reputation; (x) loss of, damage to, or corruption of 
+    data; or (xi) any indirect, incidental, special or consequential loss of 
+    damage however caused (including loss or damage of the type specified in 
+    this Section 7).
+7.2 Intel's total cumulative liability to You, including for direct damages for
+    claims relating to this Agreement, and whether for breach of contract,
+    negligence, or for any other reason, will not exceed $100.
+7.3 You acknowledge that the limitations of liability provided in this Section 7
+    are an essential part of this Agreement. You agree that the limitations of
+    liability provided in this Agreement with respect to Intel will be conveyed 
+    to and made binding upon any customer of Yours that acquires the 
+    Redistributables.
+8. USER SUBMISSIONS. Should you provide Intel with comments, modifications,
+   corrections, enhancements or other input ("Feedback") related to the 
+   Materials, Intel will be free to use, disclose, reproduce, license or 
+   otherwise distribute or exploit the Feedback in its sole discretion without 
+   any obligations or restrictions of any kind, including without limitation, 
+   intellectual property rights or licensing obligations. If You wish to provide 
+   Intel with information that You intend to be treated as confidential 
+   information, Intel requires that such confidential information be provided 
+   pursuant to a non-disclosure agreement ("NDA"); please contact Your Intel 
+   representative to ensure the proper NDA is in place.
+9. NON-DISCLOSURE. Information provided by Intel to You may include information
+   marked as confidential. You must treat such information as confidential under
+   the terms of the applicable NDA between Intel and You. If You have not 
+   entered into an NDA with Intel, You must not disclose, distribute or make use 
+   of any information marked as confidential, except as expressly authorized in 
+   writing by Intel. Intel retains all rights in and to its confidential 
+   information specifications, designs, engineering details, discoveries, 
+   inventions, patents, copyrights, trademarks, trade secrets, and other 
+   proprietary rights relating to the Materials. Any breach by You of the 
+   confidentiality obligations provided for in this Section 9 will cause 
+   irreparable injury to Intel for which money damages may be inadequate to 
+   compensate Intel for losses arising from such a breach. Intel may obtain 
+   equitable relief, including injunctive relief, if You breach or threaten to 
+   breach Your confidentiality obligations.
+10. TERM AND TERMINATION. This Agreement becomes effective on the date You
+    accept this Agreement and will continue until terminated as provided for in 
+   this Agreement. The term for any Pre-Release Materials terminates upon 
+   release of a commercial version. This Agreement will terminate if You are in 
+   breach of any of its terms and conditions. Upon termination, You will 
+   promptly destroy the Materials and all copies. In the event of termination of 
+   this Agreement, Your license to any Redistributables distributed by You in 
+   accordance with the terms and conditions of this Agreement, prior to the 
+   effective date of such termination, will survive any such termination of this 
+   Agreement. Sections 1, 2.1.D(4)(v), 2.2, 2.3.A(iii), 2.3.B(iii), 3.3, 5, 6, 
+   7, 8, 9, 10 (with respect to these survival provisions in the last sentence), 
+   and 12 will survive expiration or termination of this Agreement.
+11. U.S. GOVERNMENT RESTRICTED RIGHTS. The technical data and computer software
+    covered by this license is a "Commercial Item," as such term is defined by 
+    the FAR 2.101 (48 C.F.R. 2.101) and is "commercial computer software" and
+    "commercial computer software documentation" as specified under FAR 12.212 
+    (48 C.F.R. 12.212) or DFARS 227.7202 (48 C.F.R. 227.7202), as applicable. 
+    This commercial computer software and related documentation is provided to 
+    end users for use by and on behalf of the U.S. Government with only those 
+    rights as are granted to all other end users pursuant to the terms and 
+    conditions of this Agreement.
+12. GENERAL PROVISIONS.
+12.1 ENTIRE AGREEMENT. This Agreement contains the complete and exclusive
+     agreement and understanding between the parties concerning the subject 
+     matter of this Agreement, and supersedes all prior and contemporaneous 
+     proposals, agreements, understanding, negotiations, representations, 
+     warranties, conditions, and communications, oral or written, between the 
+     parties relating to the same subject matter. Each party acknowledges and 
+     agrees that in entering into this Agreement it has not relied on, and will 
+     not be entitled to rely on, any oral or written representations, 
+     warranties, conditions, understanding, or communications between the 
+     parties that are not expressly set forth in this Agreement. The express 
+     provisions of this Agreement control over any course of performance, course 
+     of dealing, or usage of the trade inconsistent with any of the provisions 
+     of this Agreement. The provisions of this Agreement will prevail 
+     notwithstanding any different, conflicting, or additional provisions that 
+     may appear on any purchase order, acknowledgement, invoice, or other 
+     writing issued by either party in connection with this Agreement. No 
+     modification or amendment to this Agreement will be effective unless in 
+     writing and signed by authorized representatives of each party, and must 
+     specifically identify this Agreement by its title and version (e.g., "Intel 
+     End User License Agreement for Developer Tools (Version October 2021)"); 
+     except that Intel may make changes to this Agreement as it distributes new 
+     versions of the Materials. When changes are made, Intel will make a new 
+     version of the Agreement available on its website. If You received a copy 
+     of this Agreement translated into another language, the English language 
+     version of this Agreement will prevail in the event of any conflict between 
+     versions.
+12.2 EXPORT. You acknowledge that the Materials and all related technical
+     information are subject to export controls and you agree to comply with all 
+     laws and regulations of the United States and other applicable governments 
+     governing export, re-export, import, transfer, distribution, and use of the 
+     Materials. In particular, but without limitation, the Materials may not be 
+     exported or re-exported (i) into any U.S. embargoed countries or (ii) to 
+     any person or entity listed on a denial order published by the U.S. 
+     government or any other applicable governments. By using the Materials, You 
+     represent and warrant that You are not located in any such country or on 
+     any such list. You also agree that You will not use the Materials for, or 
+     sell or transfer them to a third party who is known or suspected to be 
+     involved in, any purposes prohibited by the U.S. government or other 
+     applicable governments, including, without limitation, the development, 
+     design, manufacture, or production of nuclear, missile, chemical or 
+     biological weapons.
+12.3 GOVERNING LAW, JURISDICTION, AND VENUE. All disputes arising out of or
+     related to this Agreement, whether based on contract, tort, or any other 
+     legal or equitable theory, will in all respects be governed by, and 
+     construed and interpreted under, the laws of the United States of America 
+     and the State of Delaware, without reference to conflict of laws 
+     principles. The parties agree that the United Nations Convention on 
+     Contracts for the International Sale of Goods (1980) is specifically 
+     excluded from and will not apply to this Agreement. All disputes arising 
+     out of or related to this Agreement, whether based on contract, tort, or 
+     any other legal or equitable theory, will be subject to the exclusive 
+     jurisdiction of the courts of the State of Delaware or of the Federal 
+     courts sitting in that State. Each party submits to the personal 
+     jurisdiction of those courts and waives all objections to that jurisdiction 
+     and venue for those disputes.
+12.4 SEVERABILITY. The parties intend that if a court holds that any provision
+     or part of this Agreement is invalid or unenforceable under applicable law, 
+     the court will modify the provision to the minimum extent necessary to make 
+     it valid and enforceable, or if it cannot be made valid and enforceable, 
+     the parties intend that the court will sever and delete the provision or 
+     part from this Agreement. Any change to or deletion of a provision or part 
+     of this Agreement under this Section will not affect the validity or 
+     enforceability of the remainder of this Agreement, which will continue in 
+     full force and effect.
diff --git a/custom-licenses/ISSL b/custom-licenses/ISSL
new file mode 100644
index 00000000..f987e502
--- /dev/null
+++ b/custom-licenses/ISSL
@@ -0,0 +1,73 @@
+Intel Simplified Software License (Version August 2021)
+Use and Redistribution. You may use and redistribute the software (the
+"Software"), without modification, provided the following conditions are met:
+* Redistributions must reproduce the above copyright notice and the following
+  terms of use in the Software and in the documentation and/or other materials
+  provided with the distribution.
+* Neither the name of Intel nor the names of its suppliers may be used to 
+  endorse or promote products derived from this Software without specific  
+  prior written permission.
+* No reverse engineering, decompilation, or disassembly of this Software is
+  permitted.
+No other licenses. Except as provided in the preceding section, Intel grants no
+licenses or other rights by implication, estoppel or otherwise to, patent,
+copyright, trademark, trade name, service mark or other intellectual property
+licenses or rights of Intel.
+Third party software. The Software may contain Third Party Software. "Third
+Party Software" is open source software, third party software, or other Intel
+software that may be identified in the Software itself or in the files (if any)
+listed in the "third-party-software.txt" or similarly named text file included
+with the Software. Third Party Software, even if included with the distribution
+of the Software, may be governed by separate license terms, including without
+limitation, open source software license terms, third party software license
+terms, and other Intel software license terms. Those separate license terms
+solely govern your use of the Third Party Software, and nothing in this license
+limits any rights under, or grants rights that supersede, the terms of the
+applicable license terms.
+DISCLAIMER. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE
+DISCLAIMED. THIS SOFTWARE IS NOT INTENDED FOR USE IN SYSTEMS OR APPLICATIONS
+WHERE FAILURE OF THE SOFTWARE MAY CAUSE PERSONAL INJURY OR DEATH AND YOU AGREE
+THAT YOU ARE FULLY RESPONSIBLE FOR ANY CLAIMS, COSTS, DAMAGES, EXPENSES, AND
+ATTORNEYS' FEES ARISING OUT OF ANY SUCH USE, EVEN IF ANY CLAIM ALLEGES THAT
+INTEL WAS NEGLIGENT REGARDING THE DESIGN OR MANUFACTURE OF THE SOFTWARE.
+LIMITATION OF LIABILITY. IN NO EVENT WILL INTEL BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+No support. Intel may make changes to the Software, at any time without notice,
+and is not obligated to support, update or provide training for the Software.
+Termination. Your right to use the Software is terminated in the event of your
+breach of this license.
+Feedback. Should you provide Intel with comments, modifications, corrections,
+enhancements or other input ("Feedback") related to the Software, Intel will be
+free to use, disclose, reproduce, license or otherwise distribute or exploit the
+Feedback in its sole discretion without any obligations or restrictions of any
+kind, including without limitation, intellectual property rights or licensing
+obligations.
+Compliance with laws. You agree to comply with all relevant laws and regulations
+governing your use, transfer, import or export (or prohibition thereof) of the
+Software.
+Governing law. All disputes will be governed by the laws of the United States of
+America and the State of Delaware without reference to conflict of law
+principles and subject to the exclusive jurisdiction of the state or federal
+courts sitting in the State of Delaware, and each party agrees that it submits
+to the personal jurisdiction and venue of those courts and waives any
+objections. The United Nations Convention on Contracts for the International
+Sale of Goods (1980) is specifically excluded and will not apply to the
+Software.
diff --git a/custom-licenses/Intel-Microcode-License b/custom-licenses/Intel-Microcode-License
index af5b41c2..707d0908 100644
--- a/custom-licenses/Intel-Microcode-License
+++ b/custom-licenses/Intel-Microcode-License
@@ -1,123 +1,37 @@
-INTEL SOFTWARE LICENSE AGREEMENT 
+Copyright (c) 2018-2019 Intel Corporation.
+All rights reserved.
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING. 
-Do not use or load this software and any associated materials (collectively, 
+Redistribution.
-the "Software") until you have carefully read the following terms and 
-conditions. By loading or using the Software, you agree to the terms of this 
+Redistribution and use in binary form, without modification, are permitted,
-Agreement. If you do not wish to so agree, do not install or use the Software.
+provided that the following conditions are met:
-LICENSES: Please Note:
+1.  Redistributions must reproduce the above copyright notice and the
- If you are a network administrator, the "Site License" below shall 
+    following disclaimer in the documentation and/or other materials provided
-apply to you.
+    with the distribution.
- If you are an end user, the "Single User License" shall apply to you.
- If you are an original equipment manufacturer (OEM), the "OEM License" 
+2.  Neither the name of Intel Corporation nor the names of its suppliers may
-shall apply to you.
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
-SITE LICENSE. You may copy the Software onto your organization's computers 
-for your organization's use, and you may make a reasonable number of 
+3.  No reverse engineering, decompilation, or disassembly of this software
-back-up copies of the Software, subject to these conditions:
+    is permitted.
-1. This Software is licensed for use only in conjunction with Intel 
-component products. Use of the Software in conjunction with non-Intel 
+"Binary form" includes any format that is commonly used for electronic
-component products is not licensed hereunder. 
+conveyance that is a reversible, bit-exact translation of binary
-2. You may not copy, modify, rent, sell, distribute or transfer any part 
+representation to ASCII or ISO text, for example "uuencode".
-of the Software except as provided in this Agreement, and you agree to 
-prevent unauthorized copying of the Software.
+DISCLAIMER.
-3. You may not reverse engineer, decompile, or disassemble the Software. 
-4. You may not sublicense or permit simultaneous use of the Software by 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-more than one user.
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-5. The Software may include portions offered on terms in addition to those
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-set out here, as set out in a license accompanying those portions. 
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-SINGLE USER LICENSE. You may copy the Software onto a single computer for 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-your personal, noncommercial use, and you may make one back-up copy of the
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-Software, subject to these conditions:
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-1. This Software is licensed for use only in conjunction with Intel 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-component products. Use of the Software in conjunction with non-Intel 
+POSSIBILITY OF SUCH DAMAGE.
-component products is not licensed hereunder. 
-2. You may not copy, modify, rent, sell, distribute or transfer any part 
-of the Software except as provided in this Agreement, and you agree to 
-prevent unauthorized copying of the Software.
-3. You may not reverse engineer, decompile, or disassemble the Software. 
-4. You may not sublicense or permit simultaneous use of the Software by 
-more than one user.
-5. The Software may include portions offered on terms in addition to those
-set out here, as set out in a license accompanying those portions. 
-OEM LICENSE: You may reproduce and distribute the Software only as an 
-integral part of or incorporated in Your product or as a standalone 
-Software maintenance update for existing end users of Your products, 
-excluding any other standalone products, subject to these conditions:
-1. This Software is licensed for use only in conjunction with Intel 
-component products. Use of the Software in conjunction with non-Intel 
-component products is not licensed hereunder.
-2. You may not copy, modify, rent, sell, distribute or transfer any part 
-of the Software except as provided in this Agreement, and you agree to 
-prevent unauthorized copying of the Software.
-3. You may not reverse engineer, decompile, or disassemble the Software. 
-4. You may only distribute the Software to your customers pursuant to a 
-written license agreement. Such license agreement may be a "break-the-
-seal" license agreement. At a minimum such license shall safeguard 
-Intel's ownership rights to the Software.
-5. The Software may include portions offered on terms in addition to those
-set out here, as set out in a license accompanying those portions.
-NO OTHER RIGHTS. No rights or licenses are granted by Intel to You, expressly 
-or by implication, with respect to any proprietary information or patent, 
-copyright, mask work, trademark, trade secret, or other intellectual property
-right owned or controlled by Intel, except as expressly provided in this 
-Agreement.
-OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Title to all copies of the Software 
-remains with Intel or its suppliers. The Software is copyrighted and 
-protected by the laws of the United States and other countries, and 
-international treaty provisions. You may not remove any copyright notices 
-from the Software. Intel may make changes to the Software, or to items 
-referenced therein, at any time without notice, but is not obligated to 
-support or update the Software. Except as otherwise expressly provided, Intel
-grants no express or implied right under Intel patents, copyrights, 
-trademarks, or other intellectual property rights. You may transfer the 
-Software only if the recipient agrees to be fully bound by these terms and if 
-you retain no copies of the Software.
-LIMITED MEDIA WARRANTY. If the Software has been delivered by Intel on 
-physical media, Intel warrants the media to be free from material physical 
-defects for a period of ninety days after delivery by Intel. If such a defect 
-is found, return the media to Intel for replacement or alternate delivery of 
-the Software as Intel may select.
-EXCLUSION OF OTHER WARRANTIES. EXCEPT AS PROVIDED ABOVE, THE SOFTWARE IS 
-PROVIDED "AS IS" WITHOUT ANY EXPRESS OR IMPLIED WARRANTY OF ANY KIND 
-INCLUDING WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT, OR FITNESS FOR A 
-PARTICULAR PURPOSE. Intel does not warrant or assume responsibility for the 
-accuracy or completeness of any information, text, graphics, links or other 
-items contained within the Software.
-LIMITATION OF LIABILITY. IN NO EVENT SHALL INTEL OR ITS SUPPLIERS BE LIABLE 
-FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, LOST PROFITS, 
-BUSINESS INTERRUPTION, OR LOST INFORMATION) ARISING OUT OF THE USE OF OR 
-INABILITY TO USE THE SOFTWARE, EVEN IF INTEL HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS PROHIBIT EXCLUSION OR 
-LIMITATION OF LIABILITY FOR IMPLIED WARRANTIES OR CONSEQUENTIAL OR INCIDENTAL 
-DAMAGES, SO THE ABOVE LIMITATION MAY NOT APPLY TO YOU. YOU MAY ALSO HAVE 
-OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO JURISDICTION. 
-TERMINATION OF THIS AGREEMENT. Intel may terminate this Agreement at any time
-if you violate its terms. Upon termination, you will immediately destroy the 
-Software or return all copies of the Software to Intel.
-APPLICABLE LAWS. Claims arising under this Agreement shall be governed by the
-laws of California, excluding its principles of conflict of laws and the 
-United Nations Convention on Contracts for the Sale of Goods. You may not 
-export the Software in violation of applicable export laws and regulations. 
-Intel is not obligated under any other agreements unless they are in writing 
-and signed by an authorized representative of Intel.
-GOVERNMENT RESTRICTED RIGHTS. The Software is provided with "RESTRICTED 
-RIGHTS." Use, duplication, or disclosure by the Government is subject to 
-restrictions as set forth in FAR52.227-14 and DFAR252.227-7013 et seq. or its
-successor. Use of the Software by the Government constitutes acknowledgment 
-of Intel's proprietary rights therein. Contractor or Manufacturer is Intel
-2200 Mission College Blvd., Santa Clara, CA 95052. 
diff --git a/custom-licenses/syrah b/custom-licenses/syrah
new file mode 100644
index 00000000..5cd7f4e6
--- /dev/null
+++ b/custom-licenses/syrah
@@ -0,0 +1,32 @@
+Copyright (c) 2009, Stanford University, and authors listed below.
+All rights reserved.
+Original authors:
+  Solomon Boulos
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+Neither the name of Stanford University nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+\ No newline at end of file
diff --git a/documentation/building_and_booting.md b/documentation/building_and_booting.md
new file mode 100644
index 00000000..478a4fb0
--- /dev/null
+++ 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.
diff --git a/documentation/dpcpp-compiler.md b/documentation/dpcpp-compiler.md
new file mode 100644
index 00000000..b709a685
--- /dev/null
+++ 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
+```
diff --git a/documentation/reporting_bugs.md b/documentation/reporting_bugs.md
new file mode 100644
index 00000000..5fbc3d27
--- /dev/null
+++ 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.
diff --git a/documentation/rmc/README b/documentation/rmc/README
deleted file mode 100644
index 2c352f29..00000000
--- a/documentation/rmc/README
+++ /dev/null
@@ -1,373 +0,0 @@
-Runtime Machine Configuration (RMC)
--------------------------------------------------------------------------------
-Table of Contents
-Introduction
-Usage
-Enable RMC Feature
-Examples
-Troubleshooting
-When you (don't) need RMC feature
-Introduction:
--------------------------------------------------------------------------------
-RMC Project - a light-weight project provide developers a mechanism to keep
-their software implementation board-type agnostic, yet still able to customize
-software behavior according to the type of a running board at runtime. Recipes
-and bbclasses are available for other components to reuse to construct their own
-RMC database.
-RMC Feature - An end-to-end solution based on RMC project to have a generic
-image capable to apply board-type-specific quirks and configurations for a board
-at runtime. It consists of a modified bootloader (systemd-boot), an updated EFI
-installer, recipes, bbclass and RMC project.
-RMC feature supports special customizations cannot be covered by conventional
-auto-detection features based on probing a hardware module because they happen
-at a board or a product level. For example:
- - tty console for kernel log output in kernel cmdline
- - default audio route configuration
- - network configuration
- - UI layout
- - requirement to software driven by a mechanical design
- - or static configuration bits for a physical bus that doesn't support to
-   identify devices or their presence at runtime
-An image with the feature has ability to configure supported boards with data
-associated only to a type of board to get full functionality of the target at
-runtime, yet still with a single image.
-Effect after installation is identical to what a conventional image specially
-customized for a type of board (depending on the way to deploy image).
-Main functions of RMC Feature:
-Show board-specific boot entries in boot menu and boot system with configuration
-(boot title, boot options, etc) in a selected boot entry.
-Support a "global" kernel boot command line fragment which is effective for all
-boot entries.
-Deploy file blobs and create directories specific to the type of running board.
-Beside from this document, you can also find several built-in examples in
-common/recipes-bsp/rmc/boards/. Refer to "Examples" section.
-You can also add new board types in your layer via a simple variable.
-Usage
--------------------------------------------------------------------------------
-Developers are suggested to organize all board-specific files in their own layer
-following this example, so that RMC recipes can pick up them correctly in build.
- my_top_dir/                    Top directory of your board (Note 0)
-  |- rmc-db.bbappend         bbappend file to rmc-db recipe at a lower level
-  |- rmc/
-      |- target_board_1/         subdirectory of a board.
-      |   |- board1.fp           fingerprint file must be provided (NOTE 1)
-      |   |- BOOTENTRY.CONFIG    optional config file for boot entries. (NOTE 2)
-      |   |- INSTALLER.CONFIG    optional config file for installer. (NOTE 3)
-      |   |- POSTINSTALL.sh      optional script hook for installer (NOTE 4)
-      |   |- board_file_1        A file blob specific to the type of board
-      |   |- board_file_2        An another file specific to the type of board
-      |   |- ...more files
-      |- target_board_2/         subdirectory of another board.
-          |- board_2_v2.fp       fingerprint file for board 2.
-          |- BOOTENTRY.CONFIG
-          |- INSTALLER.CONFIG
-          |- board_file_1
-          |- ...more files
-Note 0:
-Developers are expected to use variable RMC_BOARD_DATA_DIRS to specify data of
-boards packed into RMC database file generated in a build. The default value of
-the variable in meta-intel specifies a group of boards. They work as examples
-and necessary quirks for these boards to function properly. Developers can
-override, append to the default boards with data of their own boards in the
-database file, or even disable the generation of the database file.
-For example, in your local.conf file:
-This line adds your boards along with the default boards into RMC database file,
-assuming you have a directory named "rmc" which has a subdirectory for each
-board:
-RMC_BOARD_DATA_DIRS_append = " /path_of/rmc"
-This line directs RMC to pack data of your boards only, without data of the
-default boards in meta-intel:
-RMC_BOARD_DATA_DIRS = "/path_of/rmc"
-And this line disables database generation:
-RMC_BOARD_DATA_DIRS = ""
-Please also refer to the "Example 1" in this document.
-Subdirectory is not supported in a board's directory.
-Note 1:
-Fingerprint files must be provided and with ".fp" at the end of their names.
-Fingerprint can be obtained by running RMC tool on your board. An easy way is to
-live-boot USB stick flashed with any image enabled this feature on your board,
-then run this command:
-# rmc -F -o my_board.fp
-Or you will need to build RMC tool for the architecture of your board, 32 or
-64 bit x86, from RMC project.
-You can run RMC tool without any argument to get usage and examples.
-DO NOT NAME ANY FILE ENDING WITH '.fp' IF IT IS NOT A RMC FINGERPRINT FILE.
-If you do need a .fp file deployed onto target, please rename it in source and
-specify the real name of file on target in INSTALLER.CONFIG.
-Note 2:
-At runtime, RMC bootloader tries to fetch this file specific to the board at run
-time, then tries to fetch each boot entry file specified in BOOTENTRY.CONFIG and
-show them in boot menu options. The format of this file is very simple. Each
-line is the name of a boot entry file:
-boot.conf
-Install.conf
-myrmcboot.conf
-Name of a boot entry file is defined by developer so it can be anything. But the
-name of config file is what RMC bootloader looks up in RMC database, so it must
-be named BOOTENTRY.CONFIG.
-Bootloader skips loading entry conf files from disk once any entry is loaded
-from RMC database.
-Note 3:
-At runtime, RMC installer tries to fetch INSTALLER.CONFIG file specific to the
-board, then tries to fetch each file specified in this config file, and then
-deploy the file onto target with its permissions, UID, GID and other attributes
-also specified in this config file if file for the board can be retrieved from
-RMC database. The format of this file is (# is for comment line)
-# name:uid:gid:mode:path_on_target
-# to create a directory, add a “/” at the end of path_on_target:
-audio_policy:0:0:600:/etc/audio/
-audio_def_policy:0:0:600:/etc/audio/audio_policy
-The above example creates /etc/audio directory first, then fetch a file named
-“audio_def_policy” from RMC database for the board, then copy it to /etc/audio/
-with a new name “audio_policy”.
-If this config file is not provided, No data in RMC database is deployed to the
-target.
-Some steps defined by developers could not be supported on a filesystem.
-Installer simply ignores any errors in RMC deployment stage.
-The name of this config file is what installer looks up first, so it must be
-INSTALLER.CONFIG.
-Note 4:
-At the end of RMC deployment during installation, RMC installer queries a script
-file POSTINSTALL.sh from RMC database file, and execute it when query is
-successful on the running board. This hook provides developers almost ultimate
-flexibility to retouch what have been deployed on the target. There are some
-steps still can override results from this hook for boot entries and KBOOTPARAM.
-Enable RMC Feature
--------------------------------------------------------------------------------
-To enable the RMC feature please add the following variables to your local.conf.
-DISTRO_FEATURES_append = " rmc"
-EFI_PROVIDER = "rmc-boot"
-The default EFI bootloader used with RMC is systemd-boot. To change the default
-bootloader please overwrite the RMC_BOOTLOADER variable in your local.conf
-Note:
-Image could be still bootable if you only have either of two lines, but RMC
-feature could not be fully functional, depending on the availability of the
-database file, installer and the rmc tool.
-Examples
--------------------------------------------------------------------------------
-We checked in configuration data in common/recipes-bsp/rmc/boards/ for several
-boards, to help users to understand the RMC feature. These examples are also for
-validation. For any example you find not working as what this section depicts,
-it should be treated as a bug to be fixed.
-To test this feature with examples, enable it and build an image first, then
-boot the built image on supported boards. Examples are always built in when the
-feature is enabled, except for the EXAMPLE 1.
-EXAMPLE 1: Support a new board type:
-(1) enable the feature and do a build to get a live-boot image by adding these
-    lines in conf/local.conf:
-    DISTRO_FEATURES_append = " rmc"
-    EFI_PROVIDER = "rmc-boot"
-(2) flash the image to a USB stick and boot it on your board
-(3) in super user mode, run "rmc -F -o my_board.fp"
-(4) create directories in your host "mkdir -p my_top_dir/my_rmc/my_board"
-(5) copy my_board.fp from target to my_top_dir/my_rmc/my_board/ on host
-(6) create a file my_top_dir/my_rmc/my_board/KBOOTPARAM, put some fake
-    and harmless options in a single line, say, "loglevel=7"
-(7) create a file my_top_dir/rmc-db.bbappend, put this single line in it:
-    RMC_BOARD_DATA_DIRS_append := " ${THISDIR}/my_rmc"
-    From parent directory of my_top_dir, the tree should look like:
-    my_top_dir/
-        my_rmc/
-            my_board/
-                KBOOTPARAM
-                my_board.fp
-        rmc-db.bbappend
-    Later, you can add more board directories in my_rmc directory.
-(8) modify build configuration to add my_top_dir into build, for example, put
-    this line in a bblayers.conf:
-    BBFILES += "/full/path/of/my_top_dir/rmc-db.bbappend"
-(9) build image again then boot it on your board
-(10) Once you login to shell, new options should be effective, run this command
-     "cat /proc/cmdline" to verify the result.
-EXAMPLE 2: Board-specific boot entry
-MinnowBoard MAX and B3 version:
-common/recipes-bsp/rmc/boards/minnowmax
-common/recipes-bsp/rmc/boards/minnowmaxB3
-We have found two identities (type of board) exist for the "same" Minnow Max
-hardware, so they have to be treated as two different types of hardware. The two
-examples show you a boot entry specific to a type of board. Titles shown in boot
-menu have different names according to the type of running board, "Minnow Max
-boot" or "Minnow Max B3 boot". in /proc/cmdline, "console=ttyS0,115200n8" shall
-be there. Kernel prints logs from 6-pin FTDI serial port on Minnow Max(s). This
-console setting is in board-specific entries, so you won't see it effective if
-you select default "boot" entry to boot the device.
-EXAMPLE 3: Board-specific boot entry, global kernel cmdline and installer
-NUC Gen 6:
-common/recipes-bsp/rmc/boards/nucgen6
-This is a combo example with all supported configuration data for NUC Gen 6
-product. It shows two boot entries in bootloader menu when you boot image on NUC
-Gen 6 product, with "NUC Gen6" in entry titles. There shall no any "console=" in
-/proc/cmdline when you boot with either of two "NUC Gen6"entries. We designed it
-this way because there is no accessible tty port on NUC Gen 6 with housing. The
-post-install hook is also provided in this example.
-This example also includes a global kernel cmdline fragment KBOOTPARAM. Content
-of KBOOTPARAM shall be at the end of /proc/cmdline no matter which boot entry
-you selected to boot NUC Gen6.
-INSTALLER.CONFIG directs installer to create a directory and deploy a file in it
-when install the image on NUC Gen6.
-Choose "NUC Gen6 install" boot entry to boot shall start installation. Once
-the device reboots after installation, we can verify the configurations.
-The boot entry "NUC Gen6 boot" shall be shown in boot menu.
-The content of KBOOTPARAM shall be in /proc/cmdline too.
-A directory /etc/mylib/ is created and a file "mylib.conf" is there. The content
-of that file shall be what we put in mylib.conf in
-common/recipes-bsp/rmc/boards/nucgen6
-POSTINSTALL.sh shows how we get rid of an error message caused by no serial
-console available on NUC Gen 6, without creating another static board
-configuration.
-EXAMPLE 4: For validation only
-T100 (32bit):
-common/recipes-bsp/rmc/boards/T100-32bit
-This example is provided for validation on 32 bit X86 architecture. It doesn't
-provide any new function not mentioned in above examples.
-Troubleshooting
--------------------------------------------------------------------------------
-Issue: Cannot obtain RMC fingerprint for a board
-RMC tool requires UEFI BIOS and SMBIOS support in firmware. It doesn't support
-other type of firmware, e.g. legacy BIOS. It also requires EFI driver enabled
-in Linux kernel.
-Issue: Configuration for a board seems not effective at runtime.
-Check if board is booted from the storage where the image or installation lives
-when you have multiple boot options in BIOS. On some old hardwares it is not
-that obvious as you assume. A build image can support boot from both of legacy
-and UEFI mode, but RMC only works with UEFI boot so far.
-Make sure configuration files (BOOTENTRY.CONFIG, INSTALLER.CONFIG and,
-KBOOTPARAM ...) are properly named in the board directory.
-Make sure configuration files have correct contents.
-Some file attributes could not be supported by targeted file system. Installer
-cannot setup file blobs as you wish. It simply move to the next step if a step
-fails.
-Kernel command line can be customized globally with KBOOTPARAM or just in a boot
-entry for the type of board. They have different effective scopes.
-If no any board-specific configuration becomes effective on your board but it
-works on other boards of same product, you can run rmc tool to obtain
-fingerprint file on your board and compare it with fingerprint of a working
-board. It is possible they have different firmware versions and unluckily, some
-information for fingerprint changes between two versions. You can update BIOS
-on every board to the same BIOS version if it is feasible. Otherwise you have
-to treat them as two different type of boards. We could extend rmc design to
-allow multiple fingerprints in a board directory as a workaround.
-Issue: RMC reports error because it cannot find fingerprint when building image.
-Make sure you have a fingerprint file. Its name must be ended with '.fp'. You
-can put a fingerprint file in a board directory and provide data later.
-Issue: Any problems the above troubleshooting cannot help
-Please report it to us. Extra information like the type of your board or a dump
-file from dmidecode tool is helpful. We will investigate the problem and keep
-improving this feature.
-When you (don't) need RMC feature
--------------------------------------------------------------------------------
-RMC feature is designed to as generic as possible, in order to support a large
-number of types of boards. And it shall be designed not to break things when it
-is disabled. These considerations help users to decide if they really need or
-enable it.
-If you are satisfied with a dedicated build target and image for each board in
-your development cycle (source, build, validation, release, etc), you don't need
-this feature.
-If you have a generic build for multiple type of boards and features supported
-by that build meet your needs to functionality on all of boards, you don't need
-to have this feature or you can disable it until you need to check in the first
-board's data, in order to apply a quirk or customization only for that board.
-If you want this feature but have concerns to see more and more boards' finger-
-prints and data in a generic project, you can have another layer to hold all of
-board-specific data to split them from a generic layer at source level. Another
-suggestion is always seeking chances not to clone or copy a common configuration
-to each board's directory.
-Thanks
-Jianxun Zhang <jianxun.zhang@linux.intel.com>
diff --git a/documentation/secureboot/README b/documentation/secureboot/README
deleted file mode 100644
index 3d5703bb..00000000
--- a/documentation/secureboot/README
+++ /dev/null
@@ -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
diff --git a/documentation/submitting_patches.md b/documentation/submitting_patches.md
new file mode 100644
index 00000000..f36c4b08
--- /dev/null
+++ 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.
diff --git a/documentation/tested_hardware.md b/documentation/tested_hardware.md
new file mode 100644
index 00000000..48a25ab4
--- /dev/null
+++ b/documentation/tested_hardware.md
@@ -0,0 +1,24 @@
+## Tested Hardware
+The following undergo regular basic testing with their respective MACHINE types.
+- intel-corei7-64:
+    * Alder Lake-P
+    * Alder Lake-S
+    * Alder Lake-PS
+    * Elkhart Lake
+    * Metor Lake-P
+    * Raptor Lake-P
+    * Tiger Lake
+- intel-skylake-64:
+    * Alder Lake-P
+    * Alder Lake-S
+    * Alder Lake-PS
+    * Elkhart Lake
+    * Metor Lake-P
+    * Raptor Lake-P
+    * Tiger Lake
+- intel-core2-32:
+    * MinnowBoard Turbot
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/files/run-ptest b/dynamic-layers/clang-layer/recipes-core/dnn/files/run-ptest
new file mode 100755
index 00000000..82d4df58
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/files/run-ptest
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd tests
+./api-c
+if [ $? -eq 0 ]; then
+  echo 'PASS: api-c'
+else
+  echo 'FAIL: api-c'
+fi
+./test_c_symbols-c
+if [ $? -eq 0 ]; then
+  echo 'PASS: test_c_symbols-c'
+else
+  echo 'FAIL: test_c_symbols-c'
+fi
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb
new file mode 100644
index 00000000..afea70df
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb
@@ -0,0 +1,57 @@
+HOMEPAGE = "https://www.oneapi.com"
+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=3b64000f6e7d52516017622a37a94ce9 \
+                    file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
+                    file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
+                    file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
+                    "
+SECTION = "lib"
+inherit pkgconfig cmake ptest
+DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
+S = "${WORKDIR}/git"
+SRCREV = "ecd7fb6d5a0df6503d1691c1754a684b9c769c16"
+SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
+           file://run-ptest \
+           "
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
+CVE_PRODUCT = "intel:math_kernel_library"
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = 'null'
+EXTRA_OECMAKE += " \
+                   -DDNNL_LIBRARY_TYPE=SHARED \
+                   -DDNNL_BUILD_EXAMPLES=ON \
+                   -DDNNL_BUILD_TESTS=ON \
+                   -DDNNL_CPU_RUNTIME=OMP \
+                   -DDNNL_ARCH_OPT_FLAGS="" \
+                   -DCMAKE_SKIP_RPATH=ON \
+                   -DONEDNN_BUILD_GRAPH=OFF \
+                   "
+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
+    install -m 0755 ${B}/tests/benchdnn/benchdnn ${D}${bindir}/mkl-dnn/tests/benchdnn
+    cp -r ${B}/tests/benchdnn/inputs/* ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs
+}
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    install -m 0755 ${B}/tests/api-c ${D}${PTEST_PATH}/tests
+    install -m 0755 ${B}/tests/test_c_symbols-c ${D}${PTEST_PATH}/tests
+}
+PACKAGES =+ "${PN}-test"
+FILES:${PN}-test = "${bindir}/mkl-dnn/*"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
new file mode 100644
index 00000000..265fcfa2
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
@@ -0,0 +1,51 @@
+From a6361d635e5f3046853883f3ac06fb175116933c 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.
+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 | 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 ed85a37c52..f7c9e79137 100644
+--- a/shared/source/built_ins/kernels/CMakeLists.txt
+++ b/shared/source/built_ins/kernels/CMakeLists.txt
+@@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode
+       )
+       add_custom_command(
+                          OUTPUT ${OUTPUT_FILE_CPP}
+-                         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()
+@@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin)
+     )
+     add_custom_command(
+                        OUTPUT ${OUTPUT_FILE_CPP}
+-                       COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME}
+                       COMMAND cpp_generate_tool --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME}
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                       DEPENDS ${GENERATED_SPV_INPUT} $<TARGET_FILE:cpp_generate_tool>
+                       DEPENDS ${GENERATED_SPV_INPUT} cpp_generate_tool
+     )
+     set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE)
+   else()
+@@ -277,4 +277,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "")
+   )
+ endif()
+ 
+-apply_macro_for_each_core_type("SUPPORTED")
+\ No newline at end of file
+apply_macro_for_each_core_type("SUPPORTED")
+-- 
+2.43.2
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch
new file mode 100644
index 00000000..20d9b847
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d52e089778..bc0cf35014 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -727,7 +727,7 @@ if(NOT MSVC)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
+     endif()
+   endif()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla")
+ 
+   if(USE_SANITIZE_UB)
+     check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER)
diff --git 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
new file mode 100644
index 00000000..5f93b7b6
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
@@ -0,0 +1,40 @@
+From 1f58c22992ddea4167b01b44448528de427f50d5 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 2b44330831..03067c9df0 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 ${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()
+-- 
+2.37.3
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb
new file mode 100644
index 00000000..60125171
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb
@@ -0,0 +1,64 @@
+SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)"
+DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \
+is an open source project to converge Intel's development efforts \
+on OpenCL(TM) compute stacks supporting the GEN graphics hardware \
+architecture."
+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=releases/24.05 \
+           file://disable-werror.patch \
+           file://allow-to-find-cpp-generation-tool.patch \
+           file://external-ocloc.patch \
+           "
+SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587"
+S = "${WORKDIR}/git"
+DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native"
+RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"
+inherit cmake pkgconfig qemu
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+EXTRA_OECMAKE = " \
+                 -DIGC_DIR=${STAGING_INCDIR}/igc \
+                 -DBUILD_TYPE=Release \
+                 -DSKIP_UNIT_TESTS=1 \
+                 -DCCACHE_ALLOWED=FALSE \
+                 -DNEO_DISABLE_LD_LLD=ON \
+                 -DNEO_DISABLE_LD_GOLD=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_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} += " \
+                 ${libdir}/intel-opencl/libigdrcl.so \
+                 ${libdir}/libocloc.so \
+                 "
+FILES:${PN}-dev = "${includedir}"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git 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
new file mode 100644
index 00000000..377081fd
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
@@ -0,0 +1,35 @@
+From 3d71670f8ad5b54d434c2f5f71713bb1d5433ae4 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
+Otherwise it starts failing with:
+| ninja: error: 'IGC/VectorCompiler/lib/BiF/opt', needed by 'IGC/VectorCompiler/lib/BiF/VCBiFPrintfOCL32.opt.bc', missing and no known rule to make it
+We don't need to explicitly make sure opt is built when
+using prebuilt binaries.
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+index d20d7f887..882e09fea 100644
+--- a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+++ b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+@@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
+     COMMENT "vc_build_bif: Translating CMCL builtins:  ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}"
+     COMMAND CMCLTranslatorTool -o ${BIF_CMCL_BC_NAME} ${BIF_CLANG_BC_NAME_FINAL}
+     COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
+-    DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${BIF_CLANG_BC_PATH_FINAL}
+    DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL}
+     BYPRODUCTS ${BIF_OPT_BC_PATH}
+     SOURCES ${CMCL_SRC_PATH})
+   set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
+-- 
+2.43.2
diff --git 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
new file mode 100644
index 00000000..dca75e22
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
@@ -0,0 +1,31 @@
+From e69a3181482e5f442756a61c7b683914072884f1 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(-)
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index 9afa5746c..7ca24d5dc 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
+++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -43,8 +43,8 @@ else() #By default use build from sources
+  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}")
diff --git 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
new file mode 100644
index 00000000..39443931
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@@ -0,0 +1,24 @@
+From 5648568e597acd0fed82aac3e6aef0f95a1b78d1 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 10322533c..9020cb3c8 100644
+--- a/IGC/cmake/igc_llvm.cmake
+++ b/IGC/cmake/igc_llvm.cmake
+@@ -52,7 +52,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()
diff --git 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
new file mode 100644
index 00000000..650130a8
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
@@ -0,0 +1,34 @@
+From 0559332abd04b6c8bc70171d201f43d2e4735336 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] Improve Reproducibility for src package
+Improve reproducibility for intel-graphics-compiler-src package.
+needs to pass build path as environment variable to the build.
+this only works on bison 3.7 onward, hence check for bison version
+before adding the flags.
+Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream]
+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 6be467587..930c386a6 100644
+--- a/visa/CMakeLists.txt
+++ b/visa/CMakeLists.txt
+@@ -123,8 +123,11 @@ endif()
+ set(bison_output_file ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp)
+ set(flex_output_file ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp)
+ 
+-BISON_TARGET(CISAParser CISA.y ${bison_output_file} COMPILE_FLAGS "-vt -p CISA")
+-FLEX_TARGET(CISAScanner CISA.l ${flex_output_file} COMPILE_FLAGS "-PCISA ${WIN_FLEX_FLAG}")
+if(BISON_VERSION VERSION_GREATER_EQUAL "3.7.0")
+    set(BISON_EXTRA_FLAGS " --file-prefix-map=$ENV{B}=/igc/ ")
+endif()
+BISON_TARGET(CISAParser CISA.y ${bison_output_file} COMPILE_FLAGS "-l -vt -p CISA ${BISON_EXTRA_FLAGS} ")
+FLEX_TARGET(CISAScanner CISA.l ${flex_output_file} COMPILE_FLAGS "-PCISA -L ${WIN_FLEX_FLAG} ")
+ ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser)
+ set(CISAScanner_dependencies)
+ 
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb
new file mode 100644
index 00000000..96d828b6
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb
@@ -0,0 +1,75 @@
+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=7f4fbc3eb2c34807465e63b1ec3c9d1a"
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.15985 \
+           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
+           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \
+           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/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 \
+           "
+SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
+SRCREV_igc = "6cc111d262e1c3abcf4bc6b6d8a589ebf821a5c0"
+SRCREV_vc = "da892e1982b6c25b9a133f85b4ac97142d8a3def"
+SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
+SRCREV_spirv-headers = "cca08c63cefa129d082abca0302adcb81610b465"
+SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
+# Used to replace with relative path in reproducibility patch
+export B
+S = "${WORKDIR}/git"
+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"
+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 = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
+FILES:${PN} += " \
+                 ${libdir}/igc/NOTICES.txt \
+                 "
+# libigc.so contains buildpaths
+INSANE_SKIP:${PN} += "buildpaths"
diff --git 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
new file mode 100644
index 00000000..031a77c7
--- /dev/null
+++ 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
diff --git 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
new file mode 100644
index 00000000..2f1814f8
--- /dev/null
+++ 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
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
new file mode 100644
index 00000000..31a3fb21
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
@@ -0,0 +1,34 @@
+SUMMARY = "Common clang is a thin wrapper library around clang"
+DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \
+ to compile OpenCL C kernels to SPIR-V modules."
+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"
+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}/bin/linux_resource_linker ${D}${bindir}/
+}
+BBCLASSEXTEND = "native nativesdk"
diff --git 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
new file mode 100644
index 00000000..7e56af75
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
@@ -0,0 +1,5 @@
+require opencl-clang.inc
+SRCREV = "980f1691c5babcf824ee10375a04a0d0c5d7d44a"
+BRANCH = "ocl-open-140"
diff --git 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
new file mode 100644
index 00000000..e946c31c
--- /dev/null
+++ 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"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb
new file mode 100644
index 00000000..70177c28
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb
@@ -0,0 +1,33 @@
+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/2024/0;lfs=0 \
+           "
+SRCREV = "34caeefd07800b59065345d651949efbe8ab6649"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+CVE_PRODUCT = "intel:openvino"
+S = "${WORKDIR}/git"
+inherit setuptools3
+SETUPTOOLS_SETUP_PATH = "${WORKDIR}/git/tools/mo"
+RDEPENDS:${PN} += " \
+                    python3-defusedxml \
+                    python3-fastjsonschema \
+                    python3-networkx \
+                    python3-numpy \
+                    python3-protobuf \
+                    python3-requests \
+                    python3-urllib3 \
+                    bash \
+                    "
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"
diff --git 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
new file mode 100644
index 00000000..bdf32576
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -0,0 +1,44 @@
+SUMMARY = "Intel(R) Local Managability Service"
+DESCRIPTION = "Intel Local Manageability Service allows applications \
+to access the Intel Active Management Technology (AMT) firmware via \
+the Intel Management Engine Interface (MEI)."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93"
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+inherit cmake systemd features_check python3native
+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"
+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 \
+           "
+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
+    install -m 0644 ${S}/UNS/linux_scripts/70-mei-wdt.rules ${D}${sysconfdir}/udev/rules.d/70-mei-wdt.rules
+}
+RDEPENDS:${PN} += "ace"
+CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System."
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
new file mode 100644
index 00000000..270cc84d
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
@@ -0,0 +1,39 @@
+From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Mon, 11 Mar 2024 13:13:32 +0800
+Subject: [PATCH] Makefile: Fix build Issue
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+In case build directory is different from source, make sure make is able to find the correct input files. 
+Fixes:
+| dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml
+| glib-compile-resources --generate-source thermald-resource.gresource.xml
+| Failed to open file “thermald-resource.gresource.xml”: No such file or directory
+Upstream-Status: Submitted
+https://github.com/intel/thermal_daemon/pull/436
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile.am b/Makefile.am
+index a0c051a..772e280 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -95,6 +95,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml
+        $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $<
+ 
+ thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml
+-       $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml
+       $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $<
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+-- 
+2.34.1
diff --git a/recipes-bsp/thermald/thermald_1.7.1.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb
index b2e86368..df242cdf 100644
--- a/recipes-bsp/thermald/thermald_1.7.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb
@@ -6,29 +6,38 @@ 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"
+DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
+DEPENDS += "autoconf-archive-native"
-DEPENDS_append_libc-musl = " argp-standalone"
-DEPENDS_append_toolchain-clang = " openmp"
+LICENSE = "GPL-2.0-only"
-LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
-SRC_URI = "git://github.com/intel/thermal_daemon/ \
+SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
-           file://0001-Include-poll.h-instead-of-sys-poll.h.patch \
+           file://0001-Makefile-Fix-build-Issue.patch \
-           file://0002-Use-correct-format-specifier-for-X32.patch \
           "
-SRCREV = "c0d224b7b5cf62d384f5ad0a29bfaaba4bdc4ac1"
+SRCREV = "3990ce2391e5c07293758c056e09e4f2453691b4"
 S = "${WORKDIR}/git"
-inherit pkgconfig autotools systemd
+inherit pkgconfig autotools systemd gtk-doc
+# gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails
+# to copy becuase there is no m4 dir yet.
+do_configure:prepend () {
+        mkdir -p ${S}/m4
+}
+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"
+SYSTEMD_SERVICE:${PN} = "thermald.service"
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-CONFFILES_${PN} = " \
+CONFFILES:${PN} = " \
                   ${sysconfdir}/thermald/thermal-conf.xml \
                   ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \
                  "
diff --git a/dynamic-layers/openembedded-layer/recipes-core/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
new file mode 100644
index 00000000..4d583657
--- /dev/null
+++ 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]
diff --git 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
new file mode 100644
index 00000000..b0a76ff9
--- /dev/null
+++ 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
diff --git 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
new file mode 100644
index 00000000..f452dc50
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
@@ -0,0 +1,52 @@
+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
+Error log:
+| tmp/work/corei7-64-poky-linux/ispc/1.16.0-r0/recipe-sysroot/usr/include/bits/long-double.h:23:10: fatal error: 'bits/long-double-32.h' file not found
+| #include <bits/long-double-32.h>
+|          ^~~~~~~~~~~~~~~~~~~~~~~
+| 1 error generated.
+Remove SYSTEM include search path and set -isysroot dir path
+for root dir for cross compilation.
+Upstream-Status: Inappropriate
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ cmake/GenerateBuiltins.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
+index f84494ed..d90cb1ec 100644
+--- a/cmake/GenerateBuiltins.cmake
+++ b/cmake/GenerateBuiltins.cmake
+@@ -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.
+-            set(includePath -isystem/usr/${debian_triple}/include)
+            set(includePath -isysroot${SYSROOT_DIR})
+         endif()
+     endif()
+ 
+@@ -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})
+-        foreach (bit 32 64)
+        foreach (bit 64)
+             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}})
+@@ -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" "wasm")
+                 builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
new file mode 100644
index 00000000..77d13bb4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+python3 run_tests.py
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb
new file mode 100644
index 00000000..ed8df859
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb
@@ -0,0 +1,64 @@
+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
+S = "${WORKDIR}/git"
+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 = "bcb2cf896c00f9a802a11cbf291ef6e44b205416"
+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"
diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb
new file mode 100644
index 00000000..8bade9f4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb
@@ -0,0 +1,33 @@
+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 = "1685d01497428ca4d8b99200972b64685424d5c9"
+S = "${WORKDIR}/git"
+inherit cmake
+DEPENDS += "opencl-headers"
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
+PACKAGES =+ "${PN}-headers ${PN}-samples ${PN}-loader"
+do_install:append () {
+        install -d ${D}${bindir} ${D}${libdir}
+        install -m 755 ${B}/bin/zello* ${D}${bindir}
+        oe_libinstall -C lib libze_null ${D}${libdir}
+}
+FILES:${PN}-headers = "${includedir}"
+FILES:${PN}-samples = "${bindir} ${libdir}/libze_null* ${libdir}/libze_validation*"
+FILES:${PN}-loader = "${libdir}"
+# PN-loader (non -dev/-dbg/nativesdk- package) contains symlink .so
+INSANE_SKIP:${PN}-loader = "dev-so"
+INSANE_SKIP:${PN}-samples = "dev-so"
+ALLOW_EMPTY:${PN} = "1"
+BBCLASSEXTEND = "native nativesdk"
diff --git 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
new file mode 100644
index 00000000..cedbae1e
--- /dev/null
+++ 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 = "${WORKDIR}/${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"
diff --git 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
new file mode 100644
index 00000000..90ada087
--- /dev/null
+++ 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 = "${WORKDIR}/${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"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
new file mode 100644
index 00000000..fb341b01
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
@@ -0,0 +1,30 @@
+SUMMARY  = "Collection of high-performance ray tracing kernels"
+DESCRIPTION = "A collection of high-performance ray tracing kernels \
+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"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    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 = "daa8de0e714e18ad5e5c9841b67c1950d9c91c51"
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+DEPENDS = "tbb jpeg libpng glfw ispc-native"
+EXTRA_OECMAKE += " \
+                  -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF  \
+                  -DEMBREE_MAX_ISA=DEFAULT  \
+                  -DEMBREE_TUTORIALS=OFF  \
+                  -DEMBREE_ISPC_SUPPORT=ON  \
+                  -DEMBREE_ZIP_MODE=OFF  \
+                  "
diff --git 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
new file mode 100644
index 00000000..1841253e
--- /dev/null
+++ 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 = "${WORKDIR}/${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"
diff --git 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
new file mode 100644
index 00000000..e3e93028
--- /dev/null
+++ 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 = "${WORKDIR}/${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"
diff --git 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
new file mode 100644
index 00000000..4ea6ffbe
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Intel® Open Image Denoise"
+DESCRIPTION = "Intel Open Image Denoise is an open source library of \
+high-performance, high-quality denoising filters for images \
+rendered with ray tracing. Intel Open Image Denoise is part \
+of the Intel® oneAPI Rendering Toolkit"
+HOMEPAGE = "https://www.openimagedenoise.org/"
+LICENSE = "Apache-2.0 & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    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\
+           "
+SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6"
+inherit cmake
+DEPENDS += "tbb ispc-native"
+UPSTREAM_CHECK_URI = "https://github.com/OpenImageDenoise/oidn/releases"
diff --git 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
new file mode 100644
index 00000000..a2d709a1
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
@@ -0,0 +1,42 @@
+SUMMARY  = "Intel(R) Open Volume Kernel Library"
+DESCRIPTION = "Intel(R) Open Volume Kernel Library (Intel(R) Open VKL) is a \
+collection of high-performance volume computation kernels. The target users \
+of Open VKL are graphics application engineers who want to improve the \
+performance of their volume rendering applications by leveraging Open VKL’s \
+performance-optimized kernels, which include volume traversal and sampling \
+functionality for a variety of volumetric data formats. The kernels are optimized \
+for the latest Intel(R) processors with support for SSE, AVX, AVX2, and AVX-512 \
+instructions."
+HOMEPAGE = "https://www.openvkl.org/"
+LICENSE  = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://third-party-programs.txt;md5=69ec7caf49616c471161b921f53d5ec0 \
+                    file://testing/external/half.hpp;beginline=1;endline=17;md5=4b60058493630c3bd0ef145470f04a7b"
+inherit pkgconfig cmake
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \
+           "
+SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce"
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+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} \
+                     "
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray/0001-Fix-GCC11-Compile-Error-in-benchmark_register.h.patch b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray/0001-Fix-GCC11-Compile-Error-in-benchmark_register.h.patch
new file mode 100644
index 00000000..c2136321
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray/0001-Fix-GCC11-Compile-Error-in-benchmark_register.h.patch
@@ -0,0 +1,28 @@
+From 09e6b6615d9a16e9555eff9d569356e32bd26aa4 Mon Sep 17 00:00:00 2001
+From: benradel <86351445+benradel@users.noreply.github.com>
+Date: Wed, 23 Jun 2021 11:56:03 +0200
+Subject: [PATCH] Fix GCC11 Compile Error in benchmark_register.h
+Fix GCC11 compilation error due to missing header "limits" in benchmark_register.h
+Upstream-Status: Submitted [https://github.com/ospray/ospray/pull/484/files]
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ apps/common/external/benchmark/src/benchmark_register.h | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/apps/common/external/benchmark/src/benchmark_register.h b/apps/common/external/benchmark/src/benchmark_register.h
+index 61377d742..8f1bb7795 100644
+--- a/apps/common/external/benchmark/src/benchmark_register.h
+++ b/apps/common/external/benchmark/src/benchmark_register.h
+@@ -2,6 +2,7 @@
+ #define BENCHMARK_REGISTER_H
+ 
+ #include <vector>
+#include <limits>
+ 
+ #include "check.h"
+ 
+-- 
+2.32.0
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb
new file mode 100644
index 00000000..3e03dcc2
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb
@@ -0,0 +1,37 @@
+SUMMARY  = "Intel OSPray, Ray Tracing based Rendering Engine"
+DESCRIPTION = "Intel OSPRay is an open source, scalable, and portable ray \
+tracing engine for high-performance, high-fidelity visualization on \
+Intel Architecture CPUs."
+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=e37b77e3bd997abccc359c710fb1f1db \
+                    "
+inherit pkgconfig cmake
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \
+            "
+SRCREV = "f2a61c2eb58ccd666e34abfdb0fd7049ea073194"
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+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"
+FILES:${PN}-apps = "\
+                     ${bindir} \
+                     "
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb
new file mode 100644
index 00000000..fe6b23ea
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb
@@ -0,0 +1,19 @@
+SUMMARY  = "rkcommon - C++/CMake infrastructure"
+DESCRIPTION = "A common set of C++ infrastructure and CMake utilities \
+used by various components of Intel® oneAPI Rendering Toolkit."
+HOMEPAGE = "https://github.com/ospray/rkcommon"
+LICENSE  = "Apache-2.0"
+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 = "7ebfa0765ea590767202b328e7da38102c2f5a15"
+DEPENDS = "tbb"
+EXTRA_OECMAKE += " -DBUILD_TESTING=OFF"
diff --git 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
new file mode 100644
index 00000000..4474aa3c
--- /dev/null
+++ 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
diff --git 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
new file mode 100644
index 00000000..11305e83
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -0,0 +1,59 @@
+Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
+ builds
+Upstream-Status: Backport
+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 d209e6de28..6e61b8f3d3 100644
+--- a/MdePkg/Include/Base.h
+++ b/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
+@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST;
+ // Section 2.3.1 of the UEFI 2.3 Specification.
+ //
+#ifndef OS_BUILD
+#ifndef UNIT_TEST_UEFI_BUILD
+ 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");
+@@ -792,6 +798,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");
+#endif
+#endif
+ //
+ // The following three enum types are used to verify that the compiler
+@@ -812,9 +820,13 @@ typedef enum {
+   __VerifyUint32EnumValue = 0xffffffff
+ } __VERIFY_UINT32_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");
+#endif
+#endif
+ /**
+   Macro that returns a pointer to the data structure that contains a specified field of
+--
+2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
new file mode 100644
index 00000000..c4743d1c
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
@@ -0,0 +1,47 @@
+SUMMARY = "Utility for managing Intel Optane DC persistent memory modules"
+DESCRIPTION = "Utility for configuring and managing Intel Optane Persistent \
+Memory modules (PMem). It supports functionality to: \
+Discover DCPMMs on the platform. \
+Provision the platform memory configuration. \
+View and update the firmware on DCPMMs. \
+Configure data-at-rest security on DCPMMs. \
+Track health and performance of DCPMMs. \
+Debug and troubleshoot DCPMMs."
+HOMEPAGE = "https://github.com/intel/ipmctl"
+BUGTRACKER = "https://github.com/intel/ipmctl/issues"
+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=master;name=ipmctl; \
+        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/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 = "c75bd840ea7820c8f93a5488fcff75d08beedd51"
+#tag edk2-stable202302
+SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3"
+SRCREV_FORMAT = "ipmctl_edk2"
+S = "${WORKDIR}/git"
+inherit cmake dos2unix
+DEPENDS = "ndctl pkgconfig-native"
+EXTRA_OECMAKE = "-DRELEASE=ON"
+do_configure:prepend() {
+    for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do
+        ln -sf edk2/${dir} ${S}
+    done
+}
+do_install:append() {
+    # Remove /var/log/ipmctl as anything created in /var/log will not be
+    # available when tmpfs is mounted at /var/volatile/log.
+    rm -rf ${D}${localstatedir}/log
+} 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
new file mode 100644
index 00000000..d1851406
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
@@ -0,0 +1,43 @@
+From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001
+From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com>
+Date: Tue, 20 Feb 2024 02:28:14 +0200
+Subject: [PATCH] [CPU] Solving the build failure caused by setting the
+ "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934)
+### Details:
+See the [ticket
+description](https://jira.devtools.intel.com/browse/CVS-132119). The
+solution was checked only on a local setup on Ubuntu, if there's a way
+to check that using the CI please let me know (or if you could run the
+job and paste the link in the comments I would be grateful).
+Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if
+this is the ideal fix and no side effects are introduced. Please take
+that into account when reviewing/merging.
+### Tickets:
+ - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119)
+Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8]
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
+index db5ae8d01c..6941cb528d 100644
+--- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
+++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp
+ if(ENABLE_OV_ONNX_FRONTEND)
+     list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}")
+ else()
+-    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
+    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
+ endif()
+ 
+ if(NOT (ARM OR AARCH64))
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
new file mode 100644
index 00000000..d251f21b
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
@@ -0,0 +1,32 @@
+From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Fri, 15 Mar 2024 16:28:41 +0800
+Subject: [PATCH] cmake: fix build when using sysroot
+When cross-compiling against a sysroot, system headers will not be at a place
+that starts with /usr. Update conditional check to exclude directories
+which have "/usr/include" in them to not add <sysroot>/usr/include as well.
+Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486]
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ src/cmake/ov_parallel.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake
+index 3793db98e30..819d3410531 100644
+--- a/src/cmake/ov_parallel.cmake
+++ b/src/cmake/ov_parallel.cmake
+@@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
+                 if(include_directories)
+                     foreach(include_directory IN LISTS include_directories)
+                         # cannot include /usr/include headers as SYSTEM
+-                        if(NOT "${include_directory}" MATCHES "^/usr.*$")
+                        if(NOT "${include_directory}" MATCHES ".*/usr/include.*$")
+                             target_include_directories(${TARGET_NAME} SYSTEM
+                                 ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>)
+                         else()
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
new file mode 100644
index 00000000..7ab31309
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -0,0 +1,90 @@
+From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:42:57 +0530
+Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process
+* Dont try to detect glibc version as that doesn't work when cross compiling.
+* Install sample binaries as well.
+* Dont strip binaries.
+* Dont try to write triggers for CPack. We package ourselves.
+* Fix the installation path for Python modules when baselib = lib64.
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
+ cmake/developer_package/target_flags.cmake      | 2 +-
+ samples/cpp/CMakeLists.txt                      | 6 +++---
+ src/bindings/python/CMakeLists.txt              | 2 +-
+ src/bindings/python/wheel/setup.py              | 1 -
+ 5 files changed, 6 insertions(+), 7 deletions(-)
+diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
+index a7c0ec2cf61..40448e8a962 100644
+--- a/cmake/developer_package/packaging/rpm/rpm.cmake
+++ b/cmake/developer_package/packaging/rpm/rpm.cmake
+@@ -154,7 +154,7 @@ ov_rpm_specific_settings()
+ # needed to add triggers for packages with libraries
+ set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
+ set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
+-file(WRITE "${def_triggers}" "${triggers_content}")
+#file(WRITE "${def_triggers}" "${triggers_content}")
+ 
+ #
+ # Functions helpful for packaging your modules with RPM cpack
+diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
+index 29f23e713e1..942dd445b19 100644
+--- a/cmake/developer_package/target_flags.cmake
+++ b/cmake/developer_package/target_flags.cmake
+@@ -145,4 +145,4 @@ function(ov_glibc_version)
+     endif()
+ endfunction()
+ 
+-ov_glibc_version()
+#ov_glibc_version()
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index c814cc37e2c..431e7bd2ed3 100644
+--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
+@@ -206,9 +206,9 @@ macro(ov_add_sample)
+     target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES})
+ 
+     install(TARGETS ${SAMPLE_NAME}
+-            RUNTIME DESTINATION samples_bin/
+-            COMPONENT samples_bin
+-            EXCLUDE_FROM_ALL)
+            DESTINATION ${CMAKE_INSTALL_BINDIR}
+            COMPONENT samples_bin)
+
+ 
+     # create global target with all samples / demo apps
+     if(NOT TARGET ov_samples)
+diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
+index 58ff9b74302..4763994ba56 100644
+--- a/src/bindings/python/CMakeLists.txt
+++ b/src/bindings/python/CMakeLists.txt
+@@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING)
+     endif()
+ 
+     set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
+-    set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
+    set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
+     set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
+     set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO")
+ 
+diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
+index 4b056912212..5f05d891310 100644
+--- a/src/bindings/python/wheel/setup.py
+++ b/src/bindings/python/wheel/setup.py
+@@ -270,7 +270,6 @@ class CustomBuild(build):
+                 self.spawn(["cmake", "--install", binary_dir,
+                                      "--prefix", prefix,
+                                      "--config", CONFIG,
+-                                     "--strip",
+                                      "--component", cpack_comp_name])
+ 
+     def run(self):
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch
new file mode 100644
index 00000000..e0967d55
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch
@@ -0,0 +1,33 @@
+From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:49:35 +0530
+Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error
+* Remove -Werror for:
+|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
+|  129 |     virtual JitDefinitions GetDefinitions() const = 0;
+|      |
+Upstream-Status: Pending
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ src/plugins/intel_gpu/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
+index b0c66a435d6..a3037147cc2 100644
+--- a/src/plugins/intel_gpu/CMakeLists.txt
+++ b/src/plugins/intel_gpu/CMakeLists.txt
+@@ -38,7 +38,7 @@ add_subdirectory(thirdparty)
+ include(thirdparty/cmake/rapidjson.cmake)
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    ov_add_compiler_flags(-Werror)
+       #ov_add_compiler_flags(-Werror)
+ endif()
+ 
+ add_subdirectory(src/runtime)
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch
new file mode 100644
index 00000000..59095133
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch
@@ -0,0 +1,45 @@
+From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:55:19 +0530
+Subject: [PATCH 4/4] protobuf: allow target protoc to be built
+We can run target binaries using a qemu wrapper so allow these to be
+built and run.
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/frontends/frontends.cmake | 2 +-
+ thirdparty/protobuf/CMakeLists.txt                | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
+index 49c5b881030..2a1ea8562bc 100644
+--- a/cmake/developer_package/frontends/frontends.cmake
+++ b/cmake/developer_package/frontends/frontends.cmake
+@@ -143,7 +143,7 @@ macro(ov_add_frontend)
+         set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
+         add_custom_command(
+                 OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
+-                COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
+                COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
+                 DEPENDS ${PROTOC_DEPENDENCY} ${proto_file}
+                 COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
+                 VERBATIM
+diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
+index 4b6d6da87f3..409e492a5b3 100644
+--- a/thirdparty/protobuf/CMakeLists.txt
+++ b/thirdparty/protobuf/CMakeLists.txt
+@@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen
+ if(CMAKE_CROSSCOMPILING OR
+     (APPLE AND (HOST_X86_64 AND AARCH64)) OR
+     (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
+-    set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
+    set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ else()
+     set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ endif()
+-- 
+2.34.1
diff --git 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
new file mode 100644
index 00000000..816a98a3
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
@@ -0,0 +1,27 @@
+From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Fri, 21 Oct 2022 11:38:23 +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 51767051c..fb7e3d22f 100644
+--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
+@@ -141,7 +141,7 @@ endmacro()
+ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
+ find_package(OpenVINO REQUIRED COMPONENTS Runtime)
+ 
+-add_subdirectory(thirdparty/gflags)
+#add_subdirectory(thirdparty/gflags)
+ add_subdirectory(common/cpp)
+ 
+ find_package(OpenCV QUIET COMPONENTS gapi)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb
new file mode 100644
index 00000000..495a4786
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb
@@ -0,0 +1,54 @@
+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 = "37f60eb7fe1dcdedc552b2fb184d646723ed5e80"
+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 += " \
+                 -DENABLE_SAMPLES=ON \
+                 "
+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/*.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/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
+}
+FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb
new file mode 100644
index 00000000..94edd1b8
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb
@@ -0,0 +1,143 @@
+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;name=openvino;branch=releases/2024/0;lfs=0 \
+           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
+           git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
+           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
+           git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \
+           git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \
+           git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \
+           git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \
+           git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \
+           git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \
+           git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \
+           git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \
+           file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \
+           file://0003-cmake-Fix-overloaded-virtual-error.patch \
+           file://0004-protobuf-allow-target-protoc-to-be-built.patch \
+           file://0001-cmake-fix-build-when-using-sysroot.patch \
+           file://0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch \
+           "
+SRCREV_openvino = "34caeefd07800b59065345d651949efbe8ab6649"
+SRCREV_mkl = "f82148befdbdc9576ec721c9d500155ee4de8060"
+SRCREV_onednn = "494af5f9921bdae98f1a0e2955fa7d76ff386c4f"
+SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
+SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
+SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e"
+SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
+SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
+SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
+SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
+SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
+SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas"
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \
+                    file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
+                    file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \
+                    file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \
+                    file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \
+                    file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+                    file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \
+                    file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \
+"
+inherit cmake python3native pkgconfig qemu
+S = "${WORKDIR}/git"
+EXTRA_OECMAKE += " \
+                  -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                  -DENABLE_OPENCV=OFF \
+                  -DENABLE_INTEL_GNA=OFF \
+                  -DENABLE_SYSTEM_TBB=ON \
+                  -DPYTHON_EXECUTABLE=${PYTHON} \
+                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                  -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
+                  -DTREAT_WARNING_AS_ERROR=FALSE \
+                  -DENABLE_DATA=FALSE \
+                  -DENABLE_SYSTEM_PUGIXML=TRUE \
+                  -DENABLE_OV_ONNX_FRONTEND=FALSE \
+                  -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
+                  -DENABLE_FUZZING=OFF \
+                  -DENABLE_TBBBIND_2_5=OFF \
+                  -DCPACK_GENERATOR=RPM \
+                  -DENABLE_SYSTEM_FLATBUFFERS=ON \
+                  -DENABLE_SYSTEM_SNAPPY=ON \
+                  -DFETCHCONTENT_BASE_DIR="${S}" \
+                  "
+DEPENDS += "\
+            flatbuffers-native \
+            pugixml \
+            python3-pybind11 \
+            python3-pybind11-native \
+            qemu-native \
+            snappy \
+            tbb \
+            "
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+PACKAGECONFIG ?= "opencl samples"
+PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp,"
+PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress"
+PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv"
+PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
+do_configure:prepend() {
+    # Dont set PROJECT_ROOT_DIR
+    sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
+    # qemu wrapper that can be used by cmake to run target binaries.
+    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
+}
+do_install:append() {
+    rm -rf ${D}${prefix}/install_dependencies
+    rm -rf ${D}${prefix}/setupvars.sh
+    find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} +
+}
+# 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} += "\
+                ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \
+                ${libdir}/openvino-${PV}/plugins.xml \
+                ${libdir}/openvino-${PV}/cache.json \
+                "
+# Move inference engine samples into a separate package
+PACKAGES =+ "${PN}-samples"
+FILES:${PN}-samples = "${datadir}/openvino \
+                       ${bindir} \
+                       ${libdir}/libformat_reader.a \
+                       ${libdir}/libopencv_c_wrapper.a \
+                       "
+RDEPENDS:${PN}-samples += "python3-core"
+# Package for inference engine python API
+PACKAGES =+ "${PN}-python3"
+FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"
diff --git a/lib/oeqa/runtime/cases/cyclictest.py b/lib/oeqa/runtime/cases/cyclictest.py
new file mode 100644
index 00000000..8890651a
--- /dev/null
+++ b/lib/oeqa/runtime/cases/cyclictest.py
@@ -0,0 +1,39 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.runtime.decorator.package import OEHasPackage
+import os
+import subprocess
+import datetime
+class CyclicTest(OERuntimeTestCase):
+    @OEHasPackage(['rt-tests'])
+    @OETestDepends(['ssh.SSHTest.test_ssh'])
+    def test_cyclic(self):
+        # Cyclictest command and argument based on public setup for Intel(R) Core(TM) i7-6700
+        # https://www.osadl.org/Latency-plot-of-system-in-rack-9-slot.qa-latencyplot-r9s5.0.html?shadow=1
+        # Command line: cyclictest -l100000000 -m -Sp99 -i200 -h400 -q
+        status, output = self.target.run('cyclictest -l100000000 -m -Sp99 -i200 -h400')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        test_log_dir = self.td.get('TEST_LOG_DIR', '')
+        if not test_log_dir:
+            test_log_dir = os.path.join(self.td.get('WORKDIR', ''), 'testimage')
+        cyclic_log_dir = os.path.join(test_log_dir, '%s.%s' % ('cyclic_test', datetime.datetime.now().strftime('%Y%m%d%H%M%S')))
+        os.makedirs(cyclic_log_dir)
+        log_path = os.path.join(cyclic_log_dir, 'cyclic_log')
+        with open(log_path, 'w') as f:
+            f.write(output)
+        max_latency = subprocess.check_output(('grep "Max Latencies" %s | tr " " "\n" | sort -n | tail -1 | sed s/^0*//') % log_path, shell=True).strip()
+        max_latency = int(max_latency)
+        
+        # Default target latency based on max latency (24us) captured at public execution multiple by 1.2 (20% buffer) 
+        # https://www.osadl.org/Latency-plot-of-system-in-rack-9-slot.qa-latencyplot-r9s5.0.html?shadow=1
+        target_latency = 1.2*24
+        user_defined_target_latency = self.tc.td.get("RTKERNEL_TARGET_LATENCY")
+        if user_defined_target_latency:
+            target_latency = int(user_defined_target_latency)
+        self.assertTrue(max_latency < target_latency,
+                        msg="Max latency (%sus) is greater than target (%sus)." % (max_latency, target_latency))
diff --git a/lib/oeqa/runtime/cases/dldt_inference_engine.py b/lib/oeqa/runtime/cases/dldt_inference_engine.py
new file mode 100644
index 00000000..fb35d52f
--- /dev/null
+++ b/lib/oeqa/runtime/cases/dldt_inference_engine.py
@@ -0,0 +1,109 @@
+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))
diff --git a/lib/oeqa/runtime/cases/dldt_model_optimizer.py b/lib/oeqa/runtime/cases/dldt_model_optimizer.py
new file mode 100644
index 00000000..736ea661
--- /dev/null
+++ b/lib/oeqa/runtime/cases/dldt_model_optimizer.py
@@ -0,0 +1,38 @@
+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))
diff --git a/lib/oeqa/runtime/cases/intel_mediasdk.py b/lib/oeqa/runtime/cases/intel_mediasdk.py
new file mode 100644
index 00000000..4ae7d580
--- /dev/null
+++ b/lib/oeqa/runtime/cases/intel_mediasdk.py
@@ -0,0 +1,34 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.runtime.decorator.package import OEHasPackage
+from oeqa.core.decorator.depends import OETestDepends
+class MsdkTest(OERuntimeTestCase):
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run("rm /tmp/mtest_h264.mp4")
+    @OEHasPackage(['gstreamer1.0-plugins-base'])
+    @OEHasPackage(['gstreamer1.0-plugins-good'])
+    @OEHasPackage(['gstreamer1.0-plugins-bad'])
+    @OEHasPackage(['intel-mediasdk'])
+    @OEHasPackage(['intel-media-driver', 'libigfxcmrt7'])
+    def test_gstreamer_can_encode_with_msdk_and_intel_media_driver(self):
+        (status, output) = self.target.run('gst-inspect-1.0 msdk')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run('export LIBVA_DRIVER_NAME=iHD; '
+                                           'gst-launch-1.0 -ev videotestsrc num-buffers=120 ! timeoverlay ! '
+                                           'msdkh264enc ! video/x-h264,profile=main ! h264parse ! '
+                                           'filesink location=/tmp/mtest_h264.mp4')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['intel_mediasdk.MsdkTest.test_gstreamer_can_encode_with_msdk_and_intel_media_driver'])
+    def test_gstreamer_can_decode_with_msdk_and_intel_media_driver(self):
+        (status, output) = self.target.run('export LIBVA_DRIVER_NAME=iHD; '
+                                           'gst-launch-1.0 filesrc location=/tmp/mtest_h264.mp4 ! '
+                                           'h264parse ! msdkh264dec ! '
+                                           'msdkh265enc rate-control=cbr bitrate=5000 gop-size=30 b-frames=2 ! '
+                                           'video/x-h265,profile=main ! h265parse ! fakesink')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/intel_vaapi_driver.py b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
new file mode 100644
index 00000000..31e11a81
--- /dev/null
+++ b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
@@ -0,0 +1,27 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.runtime.decorator.package import OEHasPackage
+from oeqa.core.decorator.depends import OETestDepends
+class VaapiDriverTest(OERuntimeTestCase):
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run("rm /tmp/vtest_h264.mp4")
+    @OEHasPackage(['gstreamer1.0-plugins-base'])
+    @OEHasPackage(['gstreamer1.0-plugins-good'])
+    @OEHasPackage(['gstreamer1.0-vaapi'])
+    @OEHasPackage(['intel-vaapi-driver'])
+    def test_gstreamer_can_encode_with_intel_vaapi_driver(self):
+        (status, output) = self.target.run('gst-inspect-1.0 vaapi')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run('gst-launch-1.0 -ev videotestsrc num-buffers=60 ! '
+                                           'timeoverlay ! vaapih264enc ! h264parse ! mp4mux ! filesink location=/tmp/vtest_h264.mp4')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['intel_vaapi_driver.VaapiDriverTest.test_gstreamer_can_encode_with_intel_vaapi_driver'])
+    def test_gstreamer_can_decode_with_intel_vaapi_driver(self):
+        (status, output) = self.target.run('gst-launch-1.0 filesrc location=/tmp/vtest_h264.mp4 ! '
+                                           'qtdemux ! h264parse ! vaapih264dec ! vaapisink')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/isal.py b/lib/oeqa/runtime/cases/isal.py
new file mode 100644
index 00000000..5025f986
--- /dev/null
+++ b/lib/oeqa/runtime/cases/isal.py
@@ -0,0 +1,24 @@
+import os
+from oeqa.runtime.decorator.package import OEHasPackage
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+class IsalTest(OERuntimeTestCase):
+    @OEHasPackage(['isa-l'])
+    def test_isal_igzip_version(self):
+        command = 'igzip -V'
+        (status, output) = self.target.run(command)
+        self.assertEqual(status, 0, msg="Error messages: %s" % output)
+    @OETestDepends(['isal.IsalTest.test_isal_igzip_version'])
+    def test_isal_igzip_can_compress(self):
+        command = 'echo "hello" > /tmp/igzip_sample'
+        (status, output) = self.target.run(command)
+        self.assertEqual(status, 0, msg="Error messages: %s" % output)
+        command = 'igzip -z /tmp/igzip_sample'
+        (status, output) = self.target.run(command)
+        self.assertEqual(status, 0, msg="Error messages: %s" % output)
+        command = 'rm /tmp/igzip_sample*'
+        (status, output) = self.target.run(command)
+        self.assertEqual(status, 0, msg="Error messages: %s" % output)
diff --git a/lib/oeqa/runtime/cases/libipt.py b/lib/oeqa/runtime/cases/libipt.py
new file mode 100644
index 00000000..4adb13f0
--- /dev/null
+++ b/lib/oeqa/runtime/cases/libipt.py
@@ -0,0 +1,23 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.runtime.decorator.package import OEHasPackage
+from oeqa.core.decorator.depends import OETestDepends
+class LibiptTest(OERuntimeTestCase):
+    libipt_bin_dir = '/usr/bin/libipt/'
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run('rm /tmp/loop-tnt*')
+    @OEHasPackage(['libipt', 'libipt2'])
+    @OEHasPackage(['libipt-test'])
+    @OEHasPackage(['yasm'])
+    def test_libipt_can_generate_trace_packet(self):
+        (status, output) = self.target.run('cd /tmp; %spttc %s/tests/loop-tnt.ptt' % 
+                                           (self.libipt_bin_dir, self.libipt_bin_dir))
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['libipt.LibiptTest.test_libipt_can_generate_trace_packet'])
+    def test_libipt_can_perform_trace_packet_dump(self):
+        (status, output) = self.target.run('cd /tmp; %sptdump loop-tnt.pt' % self.libipt_bin_dir)
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/libxcam.py b/lib/oeqa/runtime/cases/libxcam.py
new file mode 100644
index 00000000..57192f07
--- /dev/null
+++ b/lib/oeqa/runtime/cases/libxcam.py
@@ -0,0 +1,37 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.runtime.decorator.package import OEHasPackage
+from oeqa.core.decorator.depends import OETestDepends
+class LibxcamTest(OERuntimeTestCase):
+    yuv_file = 'vtest.yuv'
+    soft_test_app_file = 'test-soft-image'
+    libxcam_test_app_dir = '/usr/bin/libxcam/'
+    libxcam_file_dir = '/tmp/'
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run("rm %s%s" % (cls.libxcam_file_dir, cls.yuv_file))
+    @OEHasPackage(['gstreamer1.0-plugins-base'])
+    @OEHasPackage(['gstreamer1.0-plugins-good'])
+    @OEHasPackage(['gstreamer1.0-vaapi'])
+    @OEHasPackage(['intel-vaapi-driver'])
+    def test_libxcam_can_generate_yuv_file_with_gstreamer(self):
+        (status, output) = self.target.run('gst-inspect-1.0 vaapi')
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run('gst-launch-1.0 -ev videotestsrc num-buffers=60 ! '
+                                           'timeoverlay ! filesink location=%s%s' %
+                                           (self.libxcam_file_dir, self.yuv_file))
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OEHasPackage(['libxcam'])
+    @OEHasPackage(['libxcam-test'])
+    @OETestDepends(['libxcam.LibxcamTest.test_libxcam_can_generate_yuv_file_with_gstreamer'])
+    def test_libxcam_can_execute_soft_image_sample_app(self):
+        (status, output) = self.target.run('%s%s --type remap --input0 %s%s --output soft_out.nv12 --save false' %
+                                            (self.libxcam_test_app_dir,
+                                            self.soft_test_app_file,
+                                            self.libxcam_file_dir,
+                                            self.yuv_file))
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/microcode.py b/lib/oeqa/runtime/cases/microcode.py
new file mode 100644
index 00000000..52c1cdb4
--- /dev/null
+++ b/lib/oeqa/runtime/cases/microcode.py
@@ -0,0 +1,31 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.runtime.decorator.package import OEHasPackage
+import re
+class MicrocodeTest(OERuntimeTestCase):
+    def get_revision_from_microcode_string_list(self, microcode_string_list, re_pattern):
+        re_compile = re.compile(re_pattern)
+        rev_list = []
+        for s in microcode_string_list:
+            matched_revs = re_compile.findall(s)
+            if matched_revs:
+                for mr in matched_revs:
+                    rev_list.append(int(mr, 16))
+        return rev_list
+    @OEHasPackage(["iucode-tool"])
+    def test_microcode_update(self):
+        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -l --scan-system=2 | grep rev')
+        selected_microcodes = output.splitlines()
+        selected_rev_list = self.get_revision_from_microcode_string_list(selected_microcodes, "rev (\w*)")
+        (status, output) = self.target.run("dmesg | grep 'microcode updated early'")
+        updated_microcodes = output.splitlines()
+        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision (\w*)")
+        for ul in updated_rev_list:
+            self.assertTrue(ul in selected_rev_list, msg="Updated revision, %s, not in selected revision list (%s)" %
+                                                         (ul, selected_rev_list))
diff --git a/lib/oeqa/runtime/cases/mkl_dnn.py b/lib/oeqa/runtime/cases/mkl_dnn.py
new file mode 100644
index 00000000..8d50df54
--- /dev/null
+++ b/lib/oeqa/runtime/cases/mkl_dnn.py
@@ -0,0 +1,67 @@
+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.mkl_dnn_test import MkldnnTest
+class MklDnn(OERuntimeTestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.mkldnntest = MkldnnTest(OEQATarget(cls.tc.target))
+        
+    @classmethod
+    def tearDownClass(cls):
+        cls.mkldnntest.tear_down()
+        
+    @OEHasPackage(['onednn', 'libdnnl2'])
+    @OEHasPackage(['onednn-src', 'libdnnl-src'])
+    @OEHasPackage(['onednn-dev', 'libdnnl-dev'])
+    @OEHasPackage(['gcc'])
+    @OEHasPackage(['gcc-symlinks'])
+    @OEHasPackage(['libstdc++-dev'])
+    @OEHasPackage(['binutils'])
+    def test_mkldnn_can_compile_and_execute(self):
+        (status, output) = self.mkldnntest.test_mkldnn_can_compile_and_execute()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    
+    @OEHasPackage(['onednn', 'libdnnl2'])
+    @OEHasPackage(['onednn-test', 'libdnnl-test'])
+    def test_mkldnn_benchdnn_package_available(self):
+        (status, output) = self.mkldnntest.test_mkldnn_benchdnn_package_available()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_conv_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_conv_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_bnorm_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_bnorm_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_deconv_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_deconv_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_ip_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_ip_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_reorder_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_reorder_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_rnn_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_rnn_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+    @OETestDepends(['mkl_dnn.MklDnn.test_mkldnn_benchdnn_package_available'])
+    def test_mkldnn_shuffle_api(self):
+        (status, output) = self.mkldnntest.test_mkldnn_shuffle_api()
+        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt
new file mode 100644
index 00000000..84ce8168
--- /dev/null
+++ 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
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt
new file mode 100644
index 00000000..5c9b4bc7
--- /dev/null
+++ 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
diff --git a/lib/oeqa/runtime/cases/thermald.py b/lib/oeqa/runtime/cases/thermald.py
new file mode 100644
index 00000000..a0b6a92b
--- /dev/null
+++ b/lib/oeqa/runtime/cases/thermald.py
@@ -0,0 +1,47 @@
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.runtime.decorator.package import OEHasPackage
+import threading
+import time
+import re
+class ThermaldTest(OERuntimeTestCase):
+    def get_thermal_zone_with_target_type(self, target_type):
+        i = 0
+        while True:
+            status, output = self.target.run('cat /sys/class/thermal/thermal_zone%s/type' % i)
+            if status:
+                return -1
+            if output == target_type:
+                return i
+            i = i + 1
+    def run_thermald_emulation_to_exceed_setpoint_then_end_thermald_process(self, run_args):
+        time.sleep(2)
+        self.target.run('echo 106000 > /sys/class/thermal/thermal_zone%s/emul_temp' % run_args)
+        time.sleep(5)
+        __, output = self.target.run('pidof thermald')
+        self.target.run('kill -9 %s' % output)
+    def test_thermald_emulation_mode(self):
+        # Thermald test depend on thermal emulation, where CONFIG_THERMAL_EMULATION=y was required
+        # To enable thermal emulation, refer to https://github.com/intel/thermal_daemon/blob/master/test/readme_test.txt
+        (status, output) = self.target.run('gzip -dc /proc/config.gz | grep CONFIG_THERMAL_EMULATION=y')
+        if status:
+            self.skipTest("CONFIG_THERMAL_EMULATION is not set")
+    @OEHasPackage(['thermald'])
+    @OETestDepends(['thermald.ThermaldTest.test_thermald_emulation_mode'])
+    def test_thermald_can_track_thermal_exceed_setpoint(self):
+        x86_thermal_zone_index = self.get_thermal_zone_with_target_type('x86_pkg_temp')
+        if x86_thermal_zone_index < 0:
+            self.skipTest('Could not get the thermal zone index for target type (%s)' % 'x86_pkg_temp')
+        td_thread = threading.Thread(target=self.run_thermald_emulation_to_exceed_setpoint_then_end_thermald_process,
+                                     args=(x86_thermal_zone_index,))
+        td_thread.start()
+        td_thread.join()
+        status, output = self.target.run('timeout 3s thermald --no-daemon --loglevel=info')
+        regex_search = ".*thd_cdev_set_state.*106000"
+        regex_comp = re.compile(regex_search)
+        m = regex_comp.search(output)
+        self.assertTrue(m, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/files/dldt-inference-engine/classification_sample.py b/lib/oeqa/runtime/files/dldt-inference-engine/classification_sample.py
new file mode 100644
index 00000000..1906e9fe
--- /dev/null
+++ b/lib/oeqa/runtime/files/dldt-inference-engine/classification_sample.py
@@ -0,0 +1,135 @@
+#!/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)
diff --git a/lib/oeqa/runtime/miutils/dldtutils.py b/lib/oeqa/runtime/miutils/dldtutils.py
new file mode 100644
index 00000000..45bf2e12
--- /dev/null
+++ b/lib/oeqa/runtime/miutils/dldtutils.py
@@ -0,0 +1,3 @@
+def get_testdata_config(testdata, config):
+    return testdata.get(config)
diff --git a/lib/oeqa/runtime/miutils/targets/oeqatarget.py b/lib/oeqa/runtime/miutils/targets/oeqatarget.py
new file mode 100644
index 00000000..a9f7f1b4
--- /dev/null
+++ b/lib/oeqa/runtime/miutils/targets/oeqatarget.py
@@ -0,0 +1,11 @@
+class OEQATarget(object):
+    def __init__(self, target):
+        self.target = target
+    def run(self, cmd):
+        return self.target.run(cmd)
+    def copy_to(self, source, destination_dir):
+        self.target.copyTo(source, destination_dir)
diff --git a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
new file mode 100644
index 00000000..31bfb539
--- /dev/null
+++ b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
@@ -0,0 +1,56 @@
+import os
+script_path = os.path.dirname(os.path.realpath(__file__))
+files_path = os.path.join(script_path, '../../files/')
+class DldtInferenceEngineTest(object):
+    ie_input_files = {'ie_python_sample': 'classification_sample.py',
+                      'input': 'chicky_512.png',
+                      'input_download': 'https://raw.githubusercontent.com/opencv/opencv/master/samples/data/chicky_512.png',
+                      'model': 'squeezenet_v1.1.xml'}
+    def __init__(self, target, work_dir):
+        self.target = target
+        self.work_dir = work_dir
+    def setup(self):
+        self.target.run('mkdir -p %s' % self.work_dir)
+        self.target.copy_to(os.path.join(files_path, 'dldt-inference-engine', self.ie_input_files['ie_python_sample']),
+                            self.work_dir)
+        python_cmd = 'from openvino.inference_engine import IENetwork, IECore; ie = IECore(); print(ie.available_devices)'
+        __, output = self.target.run('python3 -c "%s"' % python_cmd)
+        self.available_devices = output
+    def tear_down(self):
+        self.target.run('rm -rf %s' % self.work_dir)
+    def test_check_if_openvino_device_available(self, device):
+        if device not in self.available_devices:
+            return False, self.available_devices
+        return True, self.available_devices
+    def test_can_download_input_file(self, proxy_port):
+        return self.target.run('cd %s; wget %s -e https_proxy=%s' %
+                               (self.work_dir,
+                                self.ie_input_files['input_download'],
+                                proxy_port))
+    def test_dldt_ie_classification_with_device(self, device, ir_files_dir):
+        return self.target.run('classification_sample_async -d %s -i %s -m %s' %
+                               (device,
+                                os.path.join(self.work_dir, self.ie_input_files['input']),
+                                os.path.join(ir_files_dir, self.ie_input_files['model'])))
+    def test_dldt_ie_classification_python_api_with_device(self, device, ir_files_dir, extension=''):
+        if extension:
+            return self.target.run('python3 %s -d %s -i %s -m %s -l %s' %
+                                   (os.path.join(self.work_dir, self.ie_input_files['ie_python_sample']),
+                                    device,
+                                    os.path.join(self.work_dir, self.ie_input_files['input']),
+                                    os.path.join(ir_files_dir, self.ie_input_files['model']),
+                                    extension))
+        else:
+            return self.target.run('python3 %s -d %s -i %s -m %s' %
+                                   (os.path.join(self.work_dir, self.ie_input_files['ie_python_sample']),
+                                    device,
+                                    os.path.join(self.work_dir, self.ie_input_files['input']),
+                                    os.path.join(ir_files_dir, self.ie_input_files['model'])))
diff --git a/lib/oeqa/runtime/miutils/tests/dldt_model_optimizer_test.py b/lib/oeqa/runtime/miutils/tests/dldt_model_optimizer_test.py
new file mode 100644
index 00000000..7d3db15b
--- /dev/null
+++ b/lib/oeqa/runtime/miutils/tests/dldt_model_optimizer_test.py
@@ -0,0 +1,23 @@
+import os
+class DldtModelOptimizerTest(object):
+    mo_input_files = {'model': 'squeezenet_v1.1.caffemodel',
+                      'prototxt': 'deploy.prototxt'}
+    mo_exe = 'mo.py'
+    def __init__(self, target, work_dir):
+        self.target = target
+        self.work_dir = work_dir
+    def setup(self):
+        self.target.run('mkdir -p %s' % self.work_dir)
+    def tear_down(self):
+        self.target.run('rm -rf %s' % self.work_dir)
+    def test_dldt_mo_can_create_ir(self, mo_exe_dir, mo_files_dir):
+        return self.target.run('python3 %s --input_model %s --input_proto %s --output_dir %s --data_type FP16' %
+                               (os.path.join(mo_exe_dir, self.mo_exe),
+                                os.path.join(mo_files_dir, self.mo_input_files['model']),
+                                os.path.join(mo_files_dir, self.mo_input_files['prototxt']),
+                                self.work_dir))
diff --git a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
new file mode 100644
index 00000000..869a4cbe
--- /dev/null
+++ b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
@@ -0,0 +1,55 @@
+class MkldnnTest(object):
+    mkldnn_target_test_filename = 'mkl-dnn-c'
+    def __init__(self, target):
+        self.target = target
+    def tear_down(self):
+        self.target.run('rm /tmp/%s' % self.mkldnn_target_test_filename)
+        
+    def test_mkldnn_can_compile_and_execute(self):
+        mkldnn_src_dir = '/usr/src/debug/onednn/'
+        mkldnn_src_test_filename = 'api.c'
+        mkldnn_src_test_file = ''
+        
+        (__, output) = self.target.run('cd %s; find -name %s' % (mkldnn_src_dir, mkldnn_src_test_filename))
+        if 'No such file or directory' in output:
+            return -1, output
+        mkldnn_src_test_file = os.path.join(mkldnn_src_dir, output)
+        (status, output) = self.target.run('gcc %s -o /tmp/%s -ldnnl' % (mkldnn_src_test_file, self.mkldnn_target_test_filename))
+        if status:
+            return status, output
+        (status, output) = self.target.run('cd /tmp; ./%s' % self.mkldnn_target_test_filename)
+        return status, output
+   
+    def test_mkldnn_benchdnn_package_available(self):
+        (status, output) = self.target.run('ls /usr/bin/mkl-dnn/tests/benchdnn')
+        return status, output
+    
+    def _run_mkldnn_benchdnn_test(self, cmd):
+        (status, output) = self.target.run('cd /usr/bin/mkl-dnn/tests/benchdnn; %s' % cmd)
+        return status, output
+    def test_mkldnn_conv_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --conv --batch=inputs/conv/test_conv_3d')        
+    def test_mkldnn_bnorm_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --bnorm --batch=inputs/bnorm/test_bnorm_regressions')
+        
+    def test_mkldnn_deconv_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --deconv --batch=inputs/deconv/test_deconv_bfloat16')
+        
+    def test_mkldnn_ip_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --ip --batch=inputs/ip/test_ip_bfloat16')
+        
+    def test_mkldnn_reorder_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --reorder --batch=inputs/reorder/test_reorder_bfloat16')
+        
+    def test_mkldnn_rnn_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_all')
+        
+    def test_mkldnn_shuffle_api(self):
+        return self._run_mkldnn_benchdnn_test('./benchdnn --shuffle --batch=inputs/shuffle/test_shuffle_bfloat16')
+\ No newline at end of file
diff --git a/lib/oeqa/runtime/miutils/tests/squeezenet_model_download_test.py b/lib/oeqa/runtime/miutils/tests/squeezenet_model_download_test.py
new file mode 100644
index 00000000..a3e46a0a
--- /dev/null
+++ b/lib/oeqa/runtime/miutils/tests/squeezenet_model_download_test.py
@@ -0,0 +1,25 @@
+class SqueezenetModelDownloadTest(object):
+    download_files = {'squeezenet1.1.prototxt': 'https://raw.githubusercontent.com/DeepScale/SqueezeNet/a47b6f13d30985279789d08053d37013d67d131b/SqueezeNet_v1.1/deploy.prototxt',
+                      'squeezenet1.1.caffemodel': 'https://github.com/DeepScale/SqueezeNet/raw/a47b6f13d30985279789d08053d37013d67d131b/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel'}
+    def __init__(self, target, work_dir):
+        self.target = target
+        self.work_dir = work_dir
+    def setup(self):
+        self.target.run('mkdir -p %s' % self.work_dir)
+    def tear_down(self):
+        self.target.run('rm -rf %s' % self.work_dir)
+    def test_can_download_squeezenet_model(self, proxy_port):
+        return self.target.run('cd %s; wget %s -e https_proxy=%s' %
+                               (self.work_dir,
+                                self.download_files['squeezenet1.1.caffemodel'],
+                                proxy_port))
+    def test_can_download_squeezenet_prototxt(self, proxy_port):
+        return self.target.run('cd %s; wget %s -e https_proxy=%s' %
+                               (self.work_dir,
+                                self.download_files['squeezenet1.1.prototxt'],
+                                proxy_port))
diff --git a/recipes-bsp/amt/files/atnetworktool-printf-fix.patch b/recipes-bsp/amt/files/atnetworktool-printf-fix.patch
deleted file mode 100644
index 6bb03e3a..00000000
--- a/recipes-bsp/amt/files/atnetworktool-printf-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Add a missing debug ifdef causing compilation problems.
-Upstream-Status: Submitted
-Signed-off-by: Tom Zanussi <tom.zanussi (a] intel.com>
-Index: lms-7.1.20/src/tools/ATNetworkTool.cpp
-===================================================================
--- lms-7.1.20.orig/src/tools/ATNetworkTool.cpp 2012-04-30 23:24:56.693879920 -0500
-+++ lms-7.1.20/src/tools/ATNetworkTool.cpp      2012-04-30 23:25:32.363473948 -0500
-@@ -302,7 +302,9 @@
-                        close(s);
-                        return -1;
-                }
-+#ifdef LMS_NET_DEBUG
-                printf("successfully binded local\n");
-+#endif
-          
-        }
-        if (bind(s, addr, addrlen) == -1) {
diff --git a/recipes-bsp/amt/files/readlink-declaration.patch b/recipes-bsp/amt/files/readlink-declaration.patch
deleted file mode 100644
index 0246d501..00000000
--- a/recipes-bsp/amt/files/readlink-declaration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add a missing include causing compilation (missing declaration) problems.
-Upstream-Status: Submitted
-Signed-off-by: Tom Zanussi <tom.zanussi (a] intel.com>
-Index: lms-7.1.20/src/tools/ATVersion.cpp
-===================================================================
--- lms-7.1.20.orig/src/tools/ATVersion.cpp     2012-05-29 20:34:34.061997035 -0500
-+++ lms-7.1.20/src/tools/ATVersion.cpp  2012-05-29 20:35:22.671412948 -0500
-@@ -40,6 +40,7 @@
- #include <cerrno>
- #include <fstream>
- #include <dirent.h>
-+#include <unistd.h>
- 
- #define AT_VERSION_ARGUMENT "--version"
- #define AT_VERSION_MAXSIZE 40
diff --git a/recipes-bsp/amt/lms/0001-Include-sys-select.h-for-fd_set.patch b/recipes-bsp/amt/lms/0001-Include-sys-select.h-for-fd_set.patch
deleted file mode 100644
index e28d45ac..00000000
--- a/recipes-bsp/amt/lms/0001-Include-sys-select.h-for-fd_set.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 518a3a277c89a3d6b0a9d3ee552cfa33a1dbd5c6 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Mon, 23 Jan 2017 20:45:08 +0200
-Subject: [PATCH 1/2] Include sys/select.h for fd_set()
-This is needed at least on musl.
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
- src/mei/MEILinux.cpp | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/src/mei/MEILinux.cpp b/src/mei/MEILinux.cpp
-index 1e9d28f..631270e 100755
--- a/src/mei/MEILinux.cpp
-+++ b/src/mei/MEILinux.cpp
-@@ -37,6 +37,7 @@
- #include <cerrno>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/select.h>
- #include <unistd.h>
- #include <stdint.h>
- #include <aio.h>
-- 
-2.1.4
diff --git a/recipes-bsp/amt/lms/0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch b/recipes-bsp/amt/lms/0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch
deleted file mode 100644
index 17b206e2..00000000
--- a/recipes-bsp/amt/lms/0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8d737ba9745bef223c3d3b96899f11c26102ea04 Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Mon, 16 May 2016 09:01:05 -0700
-Subject: [PATCH] Protocol.cpp: Add whitespace for gcc6 compile error
-When moving from C++-3 -> C++11 additiona white space is required between
-User-defined literals.
-Upstream-Status: Pending
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
- src/Protocol.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/Protocol.cpp b/src/Protocol.cpp
-index 1c21a0f..3a4a9bb 100755
--- a/src/Protocol.cpp
-+++ b/src/Protocol.cpp
-@@ -1428,7 +1428,7 @@ int Protocol::_handleFQDNChange(const char *fqdn)
-        char host[FQDN_MAX_SIZE + 1];
- #define LMS_MAX_LINE_LEN 1023
-        char line[LMS_MAX_LINE_LEN + 1];
-#define LMS_LINE_SIG_FIRST_WORDS(a) "# LMS GENERATED "a" "
-+#define LMS_LINE_SIG_FIRST_WORDS(a) "# LMS GENERATED " a " "
- #define LMS_LINE_SIG_LAST_WORD "LINE"
- #define LMS_LINE_SIG_LAST_WORD_LEN 4
- #define LMS_LINE_SIG(a) LMS_LINE_SIG_FIRST_WORDS(a) LMS_LINE_SIG_LAST_WORD
-- 
-2.5.0
diff --git a/recipes-bsp/amt/lms/0002-Use-proper-netinet-in.h-API.patch b/recipes-bsp/amt/lms/0002-Use-proper-netinet-in.h-API.patch
deleted file mode 100644
index fa2e29a5..00000000
--- a/recipes-bsp/amt/lms/0002-Use-proper-netinet-in.h-API.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0adc925ca9e005f93d77f373ccda2a6c6cc3ff2f Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Mon, 23 Jan 2017 20:46:50 +0200
-Subject: [PATCH 2/2] Use proper netinet/in.h API
-in6addr is only guaranteed to contain this member:
-    uint8_t s6_addr[16]
-Use that instead of the glibc implementation detail __in6_u.
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
- src/tools/ATNetworkTool.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/tools/ATNetworkTool.cpp b/src/tools/ATNetworkTool.cpp
-index 66e27df..0789c79 100755
--- a/src/tools/ATNetworkTool.cpp
-+++ b/src/tools/ATNetworkTool.cpp
-@@ -207,7 +207,7 @@ int ATNetworkTool::GetSockPeerIP(int sock, ATAddressList & peerAddresses, int &e
-        if(sa->sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&addr)) //if(IN6_IS_ADDR_V4COMPAT(&addr))
-        {
-                struct in_addr demapped_addr;
-               memcpy(&demapped_addr.s_addr, &addr.__in6_u.__u6_addr8[12], 4);
-+               memcpy(&demapped_addr.s_addr, &addr.s6_addr[12], 4);
- 
-                struct sockaddr_in sa_in;
-                sa_in.sin_family = AF_INET;
-- 
-2.1.4
diff --git a/recipes-bsp/amt/lms/0003-Fix-device-file-referance-to-dev-mei0-remove-select.patch b/recipes-bsp/amt/lms/0003-Fix-device-file-referance-to-dev-mei0-remove-select.patch
deleted file mode 100644
index 433d3016..00000000
--- a/recipes-bsp/amt/lms/0003-Fix-device-file-referance-to-dev-mei0-remove-select.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Fix device file referance to /dev/mei0, remove select post write.
-LMS uses /dev/mei character device which is absent on current kernel versions causing LMS fail to initialize. LMS sends messages to MEI with a post select timeout. Select timeout causes SendMessage to fail causing LMS to not to communicate properly with MEI.
-Adding /dev/mei0 device file reference to check first and then /dev/mei sucessfully initializes LMS. Rely on write return length and remove select with timeout to fix communication with MEI.
-Upstream-Status: Pending
-Signed-off-by: Anand Vastrad <anand.vastrad@intel.com>
---
- src/mei/MEILinux.cpp | 43 +++++++------------------------------------
- 1 file changed, 7 insertions(+), 36 deletions(-)
-diff --git a/src/mei/MEILinux.cpp b/src/mei/MEILinux.cpp
-index 1e9d28f..6d23f54 100755
--- a/src/mei/MEILinux.cpp
-+++ b/src/mei/MEILinux.cpp
-@@ -94,13 +94,17 @@ bool MEILinux::Init(unsigned char reqProtocolVersion)
-                Deinit();
-        }
- 
-       _fd = open("/dev/mei", O_RDWR);
-+       _fd = open("/dev/mei0", O_RDWR);
- 
-        if (_fd == -1 ) {
-                if (_verbose) {
-                       fprintf(stderr, "Error: Cannot establish a handle to the MEI driver\n");
-+                       fprintf(stderr, "Warning: Cannot establish a handle to the MEI driver mei0, retrying with mei \n");
-+               }
-+               _fd = open("/dev/mei", O_RDWR);
-+               if (_fd == -1 ) {
-+                       fprintf(stderr, "Error: Cannot establish a handle to the MEI driver mei\n");
-+                       return false;
-                }
-               return false;
-        }
-        _initialized = true;
- 
-@@ -181,13 +185,7 @@ int MEILinux::ReceiveMessage(unsigned char *buffer, int len, unsigned long timeo
- int MEILinux::SendMessage(const unsigned char *buffer, int len, unsigned long timeout)
- {
-        int rv = 0;
-       int return_length =0;
-        int error = 0;
-       fd_set set;
-       struct timeval tv;
-
-       tv.tv_sec =  timeout / 1000;
-       tv.tv_usec =(timeout % 1000) * 1000000;
- 
-        if (_verbose) {
-                fprintf(stdout, "call write length = %d\n", len);
-@@ -198,35 +196,8 @@ int MEILinux::SendMessage(const unsigned char *buffer, int len, unsigned long ti
-                if (_verbose) {
-                        fprintf(stderr,"write failed with status %d %d\n", rv, error);
-                }
-               goto out;
-       }
-
-       return_length = rv;
-
-       FD_ZERO(&set);
-       FD_SET(_fd, &set);
-       rv = select(_fd+1 ,&set, NULL, NULL, &tv);
-       if (rv > 0 && FD_ISSET(_fd, &set)) {
-               if (_verbose) {
-                       fprintf(stderr, "write success\n");
-               }
-        }
-       else if (rv == 0) {
-               if (_verbose) {
-                       fprintf(stderr, "write failed on timeout with status\n");
-               }
-               goto out;
-       }
-       else { //rv<0
-               if (_verbose) {
-                       fprintf(stderr, "write failed on select with status %d\n", rv);
-               }
-               goto out;
-       }
-
-       rv = return_length;
- 
-out:
-        if (rv < 0) {
-                Deinit();
-        }
-- 
-2.7.4
diff --git a/recipes-bsp/amt/lms/0004-Intel-AMT-ME-real-time-notification-infra.patch b/recipes-bsp/amt/lms/0004-Intel-AMT-ME-real-time-notification-infra.patch
deleted file mode 100644
index 04f584ae..00000000
--- a/recipes-bsp/amt/lms/0004-Intel-AMT-ME-real-time-notification-infra.patch
+++ /dev/null
@@ -1,2647 +0,0 @@
-Added Intel AMT ME real time notification infra to LMS.
-Notification support now actively captures all the INTEL AMT ME events by plugging in to APF infra.
-These events message are in the WsMan XML format. WsMan XML is parsed to get the AlertID and Message arguments.
-A map is initialized initially by reading AMTAlerts.xml which provides alertid,messageArguements and verbose description.
-From AlertID, verbose description is obtained and then using d-bus infra verbose description is notified to the user.
-src/tools/utils.cpp Utils class provides static methods for string manipulation and desktop notification.
-src/tools/miniXmlParser.cpp MiniXmlParser class provide methods for parsing the xmlBuffer, validation and retreving tag/value.
-src/tools/httpParser.cpp HttpParser class provides method to parse http response buffer and populate header,body,headerfields properties.
-src/alertDescription.cpp AlertDescription class parses AMTAlerts.xml like xml to populate map of alertId-Arguments and verbose desctiption.
-src/alertIndication.cpp AlertIndication class provides binding to some xmlTags. It uses MiniXmlParse to parse xmlBuffer and provides access methods to some of the fields.
-src/defaultAlerts.cpp provides default AlertID-Description paris. This is used in absence of AMTAlerts.xml.
-src/notifyDesktop.sh is script which uses d-bus infra to pop up desktop notification. The following script can be modified based on device environment and libraries installed.
-src/LMEConnection.cpp has modified the buffer 4x times because of the size of AMT ME Xml data.
-src/Protocol.cpp [ _UNSHandler(char *data, int dataLength) ] has changes to recieve AMT ME event data, gracefully process the data and close the channel.
-src/tools/miniXmlParser.cpp has derived work from http://info.meshcentral.com/downloads/MeshAgentFullSource.rar microstack. Author: Bryan Y Roe <bryan.y.roe@intel.com>/Intel Corporation.
-Upstream-Status: Pending
-Signed-off-by: AnandVastrad <anand.vastrad@intel.com>
---
- Makefile.in                 |   2 +
- src/AMTAlerts.xml           | 464 ++++++++++++++++++++++++++++++++++++++++++++
- src/LMEConnection.cpp       |   2 +-
- src/Makefile.am             |   3 +
- src/Makefile.in             | 172 ++++++++++++++--
- src/Makefile.inc            |  20 +-
- src/Protocol.cpp            | 191 +++++++++++++++---
- src/Protocol.h              |   8 +-
- src/alertDescription.cpp    | 144 ++++++++++++++
- src/alertDescription.h      |  45 +++++
- src/alertIndication.cpp     |  90 +++++++++
- src/alertIndication.h       |  54 ++++++
- src/defaultAlerts.h         |  43 ++++
- src/notifyDesktop.sh        |  10 +
- src/tools/httpParser.cpp    | 101 ++++++++++
- src/tools/httpParser.h      |  49 +++++
- src/tools/miniXmlParser.cpp | 375 +++++++++++++++++++++++++++++++++++
- src/tools/miniXmlParser.h   |  51 +++++
- src/tools/utils.cpp         | 185 ++++++++++++++++++
- src/tools/utils.h           |  57 ++++++
- src/tools/xmlNode.cpp       |  45 +++++
- src/tools/xmlNode.h         |  49 +++++
- 22 files changed, 2105 insertions(+), 55 deletions(-)
- mode change 100755 => 100644 Makefile.in
- create mode 100755 src/AMTAlerts.xml
- mode change 100755 => 100644 src/Makefile.in
- create mode 100644 src/alertDescription.cpp
- create mode 100644 src/alertDescription.h
- create mode 100644 src/alertIndication.cpp
- create mode 100644 src/alertIndication.h
- create mode 100644 src/defaultAlerts.h
- create mode 100644 src/notifyDesktop.sh
- create mode 100644 src/tools/httpParser.cpp
- create mode 100644 src/tools/httpParser.h
- create mode 100644 src/tools/miniXmlParser.cpp
- create mode 100644 src/tools/miniXmlParser.h
- create mode 100644 src/tools/utils.cpp
- create mode 100644 src/tools/utils.h
- create mode 100644 src/tools/xmlNode.cpp
- create mode 100644 src/tools/xmlNode.h
-diff --git a/Makefile.in b/Makefile.in
-old mode 100755
-new mode 100644
-index f90be60..e1a248b
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -133,6 +133,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- RANLIB = @RANLIB@
-@@ -185,6 +186,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/src/AMTAlerts.xml b/src/AMTAlerts.xml
-new file mode 100755
-index 0000000..ddb3383
--- /dev/null
-+++ b/src/AMTAlerts.xml
-@@ -0,0 +1,464 @@
-+<?xml version="1.0" encoding="utf-8" standalone="no"?>
-+<!-- Copyright (c) Intel Corporation, 2010 All Rights Reserved. -->
-+<Alerts>
-+<Alert>
-+<Id>iAMT0001</Id>
-+<Arg></Arg>
-+<Message>System Defense Policy triggered.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0002</Id>
-+<Arg></Arg>
-+<Message>Agent Presence Agent not started.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0003</Id>
-+<Arg></Arg>
-+<Message>Agent Presence Agent stopped.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0004</Id>
-+<Arg></Arg>
-+<Message>Agent Presence: running.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0005</Id>
-+<Arg></Arg>
-+<Message>Agent Presence: expired.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0006</Id>
-+<Arg></Arg>
-+<Message>Agent Presence: suspended.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0007</Id>
-+<Arg></Arg>
-+<Message>Host software attempt to disable AMT Network link detected.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0008</Id>
-+<Arg></Arg>
-+<Message>Host software attempt to disable AMT Network link detected -- Host Network link blocked.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0009</Id>
-+<Arg></Arg>
-+<Message>AMT clock or FLASH wear-out protection disabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0010</Id>
-+<Arg></Arg>
-+<Message>Intel(R) AMT Network Interface: Heuristics defense slow threshold trespassed.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0011</Id>
-+<Arg></Arg>
-+<Message>Intel(R) AMT Network Interface: Heuristics defense fast threshold trespassed.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0012</Id>
-+<Arg></Arg>
-+<Message>Intel(R) AMT Network Interface: Heuristics defense factory defined threshold trespassed.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0013</Id>
-+<Arg></Arg>
-+<Message>Intel(R) AMT Network Interface: Heuristics defense Encounter timeout expired.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0014</Id>
-+<Arg></Arg>
-+<Message>General certificate error.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0015</Id>
-+<Arg></Arg>
-+<Message>Certificate expired.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0016</Id>
-+<Arg></Arg>
-+<Message>No trusted root certificate.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0017</Id>
-+<Arg></Arg>
-+<Message>Not configured to work with server certificate.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0018</Id>
-+<Arg></Arg>
-+<Message>Certificate revoked.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0019</Id>
-+<Arg></Arg>
-+<Message>RSA exponent too large.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0020</Id>
-+<Arg></Arg>
-+<Message>RSA modulus too large.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0021</Id>
-+<Arg></Arg>
-+<Message>Unsupported digest.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0022</Id>
-+<Arg></Arg>
-+<Message>Distinguished name too long.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0023</Id>
-+<Arg></Arg>
-+<Message>Key usage missing.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0024</Id>
-+<Arg></Arg>
-+<Message>General SSL handshake error.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0025</Id>
-+<Arg></Arg>
-+<Message>General 802.1x error.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0026</Id>
-+<Arg></Arg>
-+<Message>AMT Diagnostic AlertEAC error - General NAC error.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0027</Id>
-+<Arg></Arg>
-+<Message>AMT Diagnostic AlertEAC error - attempt to get a NAC posture while AMT NAC is disabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0028</Id>
-+<Arg></Arg>
-+<Message>AMT Diagnostic AlertEAC error - attempt to get a posture of an unsupported type.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0029</Id>
-+<Arg></Arg>
-+<Message>Audit log storage is 50% full.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0030</Id>
-+<Arg></Arg>
-+<Message>Audit log storage is 75% full.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0031</Id>
-+<Arg></Arg>
-+<Message>Audit log storage is 85% full.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0032</Id>
-+<Arg></Arg>
-+<Message>Audit log storage is 95% full.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0033</Id>
-+<Arg></Arg>
-+<Message>Audit log storage is full.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0034</Id>
-+<Arg></Arg>
-+<Message>Firmware Update Event - Partial.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0035</Id>
-+<Arg></Arg>
-+<Message>Firmware Update Event - Failure.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0036</Id>
-+<Arg></Arg>
-+<Message>Remote connectivity initiated.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0037</Id>
-+<Arg></Arg>
-+<Message>ME Presence event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0038</Id>
-+<Arg>0</Arg>
-+<Message>AMT is being unprovisioned using BIOS command.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0038</Id>
-+<Arg>1</Arg>
-+<Message>AMT is being unprovisioned using Local MEI command.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0038</Id>
-+<Arg>2</Arg>
-+<Message>AMT is being unprovisioned using Local WS-MAN/SOAP command.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0038</Id>
-+<Arg>3</Arg>
-+<Message>AMT is being unprovisioned using Remote WS-MAN/SOAP command.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - General Notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>16</Arg>
-+<Message>User Notification Alert - Circuit Breaker notification (CB Drop TX filter hit.).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>17</Arg>
-+<Message>User Notification Alert - Circuit Breaker notification (CB Rate Limit TX filter hit.).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>18</Arg>
-+<Message>User Notification Alert - Circuit Breaker notification (CB Drop RX filter hit.).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>19</Arg>
-+<Message>User Notification Alert - Circuit Breaker notification (CB Rate Limit RX filter hit.).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>32</Arg>
-+<Message>User Notification Alert - EAC notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>48</Arg>
-+<Message>User Notification Alert - Remote diagnostics - (Remote Redirection session started - SOL).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>49</Arg>
-+<Message>User Notification Alert - Remote diagnostics - (Remote Redirection session stopped - SOL).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>50</Arg>
-+<Message>User Notification Alert - Remote diagnostics. (Remote Redirection session started - IDE-R).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>51</Arg>
-+<Message>User Notification Alert - Remote diagnostics. (Remote Redirection session stopped - IDE-R).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>66</Arg>
-+<Message>User Notification Alert - WLAN notification (Host profile mismatch - Management Interface ignored).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>67</Arg>
-+<Message>User Notification Alert - WLAN notification (Management device overrides host radio).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>68</Arg>
-+<Message>User Notification Alert - WLAN notification (Host profile security mismatch).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0050</Id>
-+<Arg>69</Arg>
-+<Message>User Notification Alert - WLAN notification (Management device relinquishes control over host Radio).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0051</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - SecIo event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0051</Id>
-+<Arg>0</Arg>
-+<Message>User Notification Alert - SecIo event semaphore at host.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0051</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - semaphore at ME.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0051</Id>
-+<Arg>2</Arg>
-+<Message>User Notification Alert - SecIo event - semaphore timeout.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0052</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - KVM session event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0052</Id>
-+<Arg>0</Arg>
-+<Message>User Notification Alert - KVM session requested.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0052</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - KVM session started.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0052</Id>
-+<Arg>2</Arg>
-+<Message>User Notification Alert - KVM session stopped.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0053</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - RCS notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0053</Id>
-+<Arg>50</Arg>
-+<Message>User Notification Alert - RCS notification (HW button pressed. Connection initiated automatically).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0053</Id>
-+<Arg>52</Arg>
-+<Message>User Notification Alert - RCS notification (HW button pressed. Connection wasn't initiated automatically).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0053</Id>
-+<Arg>53</Arg>
-+<Message>User Notification Alert - RCS notification (Contracts updated).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0054</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - WLAN notification. Wireless Profile sync enablement state changed.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0055</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - Provisioning state change notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0055</Id>
-+<Arg>0</Arg>
-+<Message>User Notification Alert - Provisioning state change notification - Pre-configuration.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0055</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - Provisioning state change notification - In configuration.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0055</Id>
-+<Arg>2</Arg>
-+<Message>User Notification Alert - Provisioning state change notification - Post-configuration.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0055</Id>
-+<Arg>3</Arg>
-+<Message>User Notification Alert - Provisioning state change notification - unprovision process has started.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0056</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - System Defense change notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0057</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - Network State change notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0058</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - Remote Access change notification.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0058</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - Remote Access change notification - tunnel is closed.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0058</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - Remote Access change notification - tunnel is open.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0059</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - KVM enabled event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0059</Id>
-+<Arg>0</Arg>
-+<Message>User Notification Alert - KVM enabled event - KVM disabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0059</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - KVM enabled event - KVM enabled (both from MEBx and PTNI).</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0060</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - SecIO configuration event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0061</Id>
-+<Arg></Arg>
-+<Message>ME FW reset occurred.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0062</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - IpSyncEnabled event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0062</Id>
-+<Arg>0</Arg>
-+<Message>User Notification Alert - IpSyncEnabled event - IpSync disabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0062</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - IpSyncEnabled event - IpSync enabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0063</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - HTTP Proxy sync enabled event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0063</Id>
-+<Arg>0</Arg>
-+<Message>User Notification Alert - HTTP Proxy sync enabled event - HTTP Proxy Sync disabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0063</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - HTTP Proxy sync enabled event - HTTP Proxy Sync enabled.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0064</Id>
-+<Arg></Arg>
-+<Message>User Notification Alert - User Consent event.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0064</Id>
-+<Arg>1</Arg>
-+<Message>User Notification Alert - User Consent event - User Consent granted.</Message>
-+</Alert>
-+<Alert>
-+<Id>iAMT0064</Id>
-+<Arg>2</Arg>
-+<Message>User Notification Alert - User Consent event - User Consent ended.</Message>
-+</Alert>
-+</Alerts>
-diff --git a/src/LMEConnection.cpp b/src/LMEConnection.cpp
-index f3e7a2b..d192626 100755
--- a/src/LMEConnection.cpp
-+++ b/src/LMEConnection.cpp
-@@ -48,7 +48,7 @@ extern glue plugin;
- 
- const GUID LMEConnection::_guid = {0x6733a4db, 0x0476, 0x4e7b, {0xb3, 0xaf, 0xbc, 0xfc, 0x29, 0xbe, 0xe7, 0xa7}};
- 
-const UINT32 LMEConnection::RX_WINDOW_SIZE = 1024;
-+const UINT32 LMEConnection::RX_WINDOW_SIZE = 4096;
- 
- LMEConnection::LMEConnection(bool verbose) :
- _reqID(0),
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 42d9f47..364427b 100755
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,7 @@
- sbin_PROGRAMS=lms
-+dist_bin_SCRIPTS=notifyDesktop.sh
-+xml_dir=$(datadir)/xml
-+xml__DATA=AMTAlerts.xml
- 
- SYNCLIB_SRCDIR=SyncLib/src
- SYNCLIB_HDRDIR=SyncLib/Include
-diff --git a/src/Makefile.in b/src/Makefile.in
-old mode 100755
-new mode 100644
-index c6fe1ba..7b6cafd
--- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -14,6 +14,8 @@
- 
- @SET_MAKE@
- 
-+
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -37,9 +39,9 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- sbin_PROGRAMS = lms$(EXEEXT)
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/Makefile.inc $(srcdir)/iatshareddata.h.in \
-       $(srcdir)/plugin.h.in
-+DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
-+       $(srcdir)/Makefile.in $(srcdir)/Makefile.inc \
-+       $(srcdir)/iatshareddata.h.in $(srcdir)/plugin.h.in
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -48,14 +50,17 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = plugin.h iatshareddata.h
-am__installdirs = "$(DESTDIR)$(sbindir)"
-+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
-+       "$(DESTDIR)$(xml_dir)"
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(sbin_PROGRAMS)
- am__objects_1 = main.$(OBJEXT) LMEConnection.$(OBJEXT) \
-        ConfigConnection.$(OBJEXT) Protocol.$(OBJEXT) glue.$(OBJEXT) \
-       ChannelGenerator.$(OBJEXT)
-+       ChannelGenerator.$(OBJEXT) alertIndication.$(OBJEXT) \
-+       alertDescription.$(OBJEXT)
- am__objects_2 = ATVersion.$(OBJEXT) ATNetworkTool.$(OBJEXT) \
-       daemonize.$(OBJEXT)
-+       daemonize.$(OBJEXT) utils.$(OBJEXT) miniXmlParser.$(OBJEXT) \
-+       xmlNode.$(OBJEXT) httpParser.$(OBJEXT)
- am__objects_3 = MEILinux.$(OBJEXT) MNGCommand.$(OBJEXT) \
-        FWULCommand.$(OBJEXT) PTHICommand.$(OBJEXT)
- am__objects_4 = EventLinux.$(OBJEXT) SemaphoreLinux.$(OBJEXT) \
-@@ -68,6 +73,8 @@ am__objects_7 = $(am__objects_6) $(am__objects_6) $(am__objects_6) \
- am_lms_OBJECTS = $(am__objects_5) $(am__objects_7)
- lms_OBJECTS = $(am_lms_OBJECTS)
- lms_LDADD = $(LDADD)
-+dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+SCRIPTS = $(dist_bin_SCRIPTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -89,6 +96,14 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(lms_SOURCES)
- DIST_SOURCES = $(lms_SOURCES)
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+xml_DATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(xml__DATA)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -150,6 +165,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- RANLIB = @RANLIB@
-@@ -202,10 +218,14 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+dist_bin_SCRIPTS = notifyDesktop.sh
-+xml_dir = $(datadir)/xml
-+xml__DATA = AMTAlerts.xml
- SYNCLIB_SRCDIR = SyncLib/src
- SYNCLIB_HDRDIR = SyncLib/Include
- MEI_DIR = mei
-@@ -238,11 +258,19 @@ $(MEI_DIR)/PTHICommand.cpp
- 
- TOOLS_HDRS = $(TOOLS_DIR)/ATVersion.h \
- $(TOOLS_DIR)/ATNetworkTool.h \
-$(TOOLS_DIR)/daemonize.h
-+$(TOOLS_DIR)/daemonize.h \
-+$(TOOLS_DIR)/utils.h \
-+$(TOOLS_DIR)/miniXmlParser.h \
-+$(TOOLS_DIR)/xmlNode.h \
-+$(TOOLS_DIR)/httpParser.h
- 
- TOOLS_SRCS = $(TOOLS_DIR)/ATVersion.cpp \
- $(TOOLS_DIR)/ATNetworkTool.cpp \
-$(TOOLS_DIR)/daemonize.cpp
-+$(TOOLS_DIR)/daemonize.cpp \
-+$(TOOLS_DIR)/utils.cpp \
-+$(TOOLS_DIR)/miniXmlParser.cpp \
-+$(TOOLS_DIR)/xmlNode.cpp \
-+$(TOOLS_DIR)/httpParser.cpp
- 
- MAIN_HDRS = types.h \
- Channel.h \
-@@ -254,14 +282,18 @@ ConfigConnection.h \
- Protocol.h \
- glue.h \
- version.h \
-ChannelGenerator.h
-+ChannelGenerator.h \
-+alertIndication.h \
-+alertDescription.h
- 
- MAIN_SRCS = main.cpp \
- LMEConnection.cpp \
- ConfigConnection.cpp \
- Protocol.cpp \
- glue.cpp \
-ChannelGenerator.cpp
-+ChannelGenerator.cpp \
-+alertIndication.cpp \
-+alertDescription.cpp
- 
- SRCS = $(MAIN_SRCS) \
- $(TOOLS_SRCS) \
-@@ -342,6 +374,25 @@ clean-sbinPROGRAMS:
- lms$(EXEEXT): $(lms_OBJECTS) $(lms_DEPENDENCIES) 
-        @rm -f lms$(EXEEXT)
-        $(CXXLINK) $(lms_LDFLAGS) $(lms_OBJECTS) $(lms_LDADD) $(LIBS)
-+install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
-+       @$(NORMAL_INSTALL)
-+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+       @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \
-+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+         if test -f $$d$$p; then \
-+           f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+           echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+           $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-+         else :; fi; \
-+       done
-+
-+uninstall-dist_binSCRIPTS:
-+       @$(NORMAL_UNINSTALL)
-+       @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \
-+         f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+       done
- 
- mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-@@ -355,17 +406,23 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigConnection.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EventLinux.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FWULCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MEILinux.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LMEConnection.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MEILinux.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MNGCommand.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PTHICommand.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Protocol.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RWLock.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SemaphoreLinux.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreadLinux.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alertDescription.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alertIndication.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemonize.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glue.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpParser.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miniXmlParser.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlNode.Po@am__quote@
- 
- .cpp.o:
- @am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -430,6 +487,62 @@ daemonize.obj: $(TOOLS_DIR)/daemonize.cpp
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o daemonize.obj `if test -f '$(TOOLS_DIR)/daemonize.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/daemonize.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/daemonize.cpp'; fi`
- 
-+utils.o: $(TOOLS_DIR)/utils.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utils.o -MD -MP -MF "$(DEPDIR)/utils.Tpo" -c -o utils.o `test -f '$(TOOLS_DIR)/utils.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/utils.cpp; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/utils.Tpo" "$(DEPDIR)/utils.Po"; else rm -f "$(DEPDIR)/utils.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/utils.cpp' object='utils.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utils.o `test -f '$(TOOLS_DIR)/utils.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/utils.cpp
-+
-+utils.obj: $(TOOLS_DIR)/utils.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utils.obj -MD -MP -MF "$(DEPDIR)/utils.Tpo" -c -o utils.obj `if test -f '$(TOOLS_DIR)/utils.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/utils.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/utils.cpp'; fi`; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/utils.Tpo" "$(DEPDIR)/utils.Po"; else rm -f "$(DEPDIR)/utils.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/utils.cpp' object='utils.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utils.obj `if test -f '$(TOOLS_DIR)/utils.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/utils.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/utils.cpp'; fi`
-+
-+miniXmlParser.o: $(TOOLS_DIR)/miniXmlParser.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT miniXmlParser.o -MD -MP -MF "$(DEPDIR)/miniXmlParser.Tpo" -c -o miniXmlParser.o `test -f '$(TOOLS_DIR)/miniXmlParser.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/miniXmlParser.cpp; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/miniXmlParser.Tpo" "$(DEPDIR)/miniXmlParser.Po"; else rm -f "$(DEPDIR)/miniXmlParser.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/miniXmlParser.cpp' object='miniXmlParser.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o miniXmlParser.o `test -f '$(TOOLS_DIR)/miniXmlParser.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/miniXmlParser.cpp
-+
-+miniXmlParser.obj: $(TOOLS_DIR)/miniXmlParser.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT miniXmlParser.obj -MD -MP -MF "$(DEPDIR)/miniXmlParser.Tpo" -c -o miniXmlParser.obj `if test -f '$(TOOLS_DIR)/miniXmlParser.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/miniXmlParser.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/miniXmlParser.cpp'; fi`; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/miniXmlParser.Tpo" "$(DEPDIR)/miniXmlParser.Po"; else rm -f "$(DEPDIR)/miniXmlParser.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/miniXmlParser.cpp' object='miniXmlParser.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o miniXmlParser.obj `if test -f '$(TOOLS_DIR)/miniXmlParser.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/miniXmlParser.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/miniXmlParser.cpp'; fi`
-+
-+xmlNode.o: $(TOOLS_DIR)/xmlNode.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xmlNode.o -MD -MP -MF "$(DEPDIR)/xmlNode.Tpo" -c -o xmlNode.o `test -f '$(TOOLS_DIR)/xmlNode.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/xmlNode.cpp; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/xmlNode.Tpo" "$(DEPDIR)/xmlNode.Po"; else rm -f "$(DEPDIR)/xmlNode.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/xmlNode.cpp' object='xmlNode.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xmlNode.o `test -f '$(TOOLS_DIR)/xmlNode.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/xmlNode.cpp
-+
-+xmlNode.obj: $(TOOLS_DIR)/xmlNode.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xmlNode.obj -MD -MP -MF "$(DEPDIR)/xmlNode.Tpo" -c -o xmlNode.obj `if test -f '$(TOOLS_DIR)/xmlNode.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/xmlNode.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/xmlNode.cpp'; fi`; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/xmlNode.Tpo" "$(DEPDIR)/xmlNode.Po"; else rm -f "$(DEPDIR)/xmlNode.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/xmlNode.cpp' object='xmlNode.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xmlNode.obj `if test -f '$(TOOLS_DIR)/xmlNode.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/xmlNode.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/xmlNode.cpp'; fi`
-+
-+httpParser.o: $(TOOLS_DIR)/httpParser.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT httpParser.o -MD -MP -MF "$(DEPDIR)/httpParser.Tpo" -c -o httpParser.o `test -f '$(TOOLS_DIR)/httpParser.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/httpParser.cpp; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/httpParser.Tpo" "$(DEPDIR)/httpParser.Po"; else rm -f "$(DEPDIR)/httpParser.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/httpParser.cpp' object='httpParser.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o httpParser.o `test -f '$(TOOLS_DIR)/httpParser.cpp' || echo '$(srcdir)/'`$(TOOLS_DIR)/httpParser.cpp
-+
-+httpParser.obj: $(TOOLS_DIR)/httpParser.cpp
-+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT httpParser.obj -MD -MP -MF "$(DEPDIR)/httpParser.Tpo" -c -o httpParser.obj `if test -f '$(TOOLS_DIR)/httpParser.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/httpParser.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/httpParser.cpp'; fi`; \
-+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/httpParser.Tpo" "$(DEPDIR)/httpParser.Po"; else rm -f "$(DEPDIR)/httpParser.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$(TOOLS_DIR)/httpParser.cpp' object='httpParser.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o httpParser.obj `if test -f '$(TOOLS_DIR)/httpParser.cpp'; then $(CYGPATH_W) '$(TOOLS_DIR)/httpParser.cpp'; else $(CYGPATH_W) '$(srcdir)/$(TOOLS_DIR)/httpParser.cpp'; fi`
-+
- MEILinux.o: $(MEI_DIR)/MEILinux.cpp
- @am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MEILinux.o -MD -MP -MF "$(DEPDIR)/MEILinux.Tpo" -c -o MEILinux.o `test -f '$(MEI_DIR)/MEILinux.cpp' || echo '$(srcdir)/'`$(MEI_DIR)/MEILinux.cpp; \
- @am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/MEILinux.Tpo" "$(DEPDIR)/MEILinux.Po"; else rm -f "$(DEPDIR)/MEILinux.Tpo"; exit 1; fi
-@@ -551,6 +664,23 @@ clean-libtool:
- distclean-libtool:
-        -rm -f libtool
- uninstall-info-am:
-+install-xml_DATA: $(xml__DATA)
-+       @$(NORMAL_INSTALL)
-+       test -z "$(xml_dir)" || $(mkdir_p) "$(DESTDIR)$(xml_dir)"
-+       @list='$(xml__DATA)'; for p in $$list; do \
-+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+         f=$(am__strip_dir) \
-+         echo " $(xml_DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xml_dir)/$$f'"; \
-+         $(xml_DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xml_dir)/$$f"; \
-+       done
-+
-+uninstall-xml_DATA:
-+       @$(NORMAL_UNINSTALL)
-+       @list='$(xml__DATA)'; for p in $$list; do \
-+         f=$(am__strip_dir) \
-+         echo " rm -f '$(DESTDIR)$(xml_dir)/$$f'"; \
-+         rm -f "$(DESTDIR)$(xml_dir)/$$f"; \
-+       done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -629,9 +759,9 @@ distdir: $(DISTFILES)
-        done
- check-am: all-am
- check: check-am
-all-am: Makefile $(PROGRAMS)
-+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
- installdirs:
-       for dir in "$(DESTDIR)$(sbindir)"; do \
-+       for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(xml_dir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
- install: install-am
-@@ -679,11 +809,11 @@ info: info-am
- 
- info-am:
- 
-install-data-am:
-+install-data-am: install-xml_DATA
-        @$(NORMAL_INSTALL)
-        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
-install-exec-am: install-sbinPROGRAMS
-+install-exec-am: install-dist_binSCRIPTS install-sbinPROGRAMS
- 
- install-info: install-info-am
- 
-@@ -709,20 +839,22 @@ ps: ps-am
- 
- ps-am:
- 
-uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
-+uninstall-am: uninstall-dist_binSCRIPTS uninstall-info-am \
-+       uninstall-sbinPROGRAMS uninstall-xml_DATA
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-sbinPROGRAMS ctags distclean \
-        distclean-compile distclean-generic distclean-libtool \
-        distclean-tags distdir dvi dvi-am html html-am info info-am \
-        install install-am install-data install-data-am \
-       install-data-hook install-exec install-exec-am install-info \
-       install-info-am install-man install-sbinPROGRAMS install-strip \
-+       install-data-hook install-dist_binSCRIPTS install-exec \
-+       install-exec-am install-info install-info-am install-man \
-+       install-sbinPROGRAMS install-strip install-xml_DATA \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am uninstall-info-am \
-       uninstall-sbinPROGRAMS
-+       tags uninstall uninstall-am uninstall-dist_binSCRIPTS \
-+       uninstall-info-am uninstall-sbinPROGRAMS uninstall-xml_DATA
- 
- 
- install-data-hook:
-diff --git a/src/Makefile.inc b/src/Makefile.inc
-index 079503c..8d7e7ab 100755
--- a/src/Makefile.inc
-+++ b/src/Makefile.inc
-@@ -26,11 +26,19 @@ $(MEI_DIR)/PTHICommand.cpp
- 
- TOOLS_HDRS=$(TOOLS_DIR)/ATVersion.h \
- $(TOOLS_DIR)/ATNetworkTool.h \
-$(TOOLS_DIR)/daemonize.h
-+$(TOOLS_DIR)/daemonize.h \
-+$(TOOLS_DIR)/utils.h \
-+$(TOOLS_DIR)/miniXmlParser.h \
-+$(TOOLS_DIR)/xmlNode.h \
-+$(TOOLS_DIR)/httpParser.h
- 
- TOOLS_SRCS=$(TOOLS_DIR)/ATVersion.cpp \
- $(TOOLS_DIR)/ATNetworkTool.cpp \
-$(TOOLS_DIR)/daemonize.cpp
-+$(TOOLS_DIR)/daemonize.cpp \
-+$(TOOLS_DIR)/utils.cpp \
-+$(TOOLS_DIR)/miniXmlParser.cpp \
-+$(TOOLS_DIR)/xmlNode.cpp \
-+$(TOOLS_DIR)/httpParser.cpp
- 
- MAIN_HDRS=types.h \
- Channel.h \
-@@ -42,14 +50,18 @@ ConfigConnection.h \
- Protocol.h \
- glue.h \
- version.h \
-ChannelGenerator.h
-+ChannelGenerator.h \
-+alertIndication.h \
-+alertDescription.h
- 
- MAIN_SRCS=main.cpp \
- LMEConnection.cpp \
- ConfigConnection.cpp \
- Protocol.cpp \
- glue.cpp \
-ChannelGenerator.cpp
-+ChannelGenerator.cpp \
-+alertIndication.cpp \
-+alertDescription.cpp
- 
- SRCS=$(MAIN_SRCS) \
- $(TOOLS_SRCS) \
-diff --git a/src/Protocol.cpp b/src/Protocol.cpp
-index 3a4a9bb..c3de5cc 100755
--- a/src/Protocol.cpp
-+++ b/src/Protocol.cpp
-@@ -28,6 +28,7 @@
-  * POSSIBILITY OF SUCH DAMAGE.
-  *******************************************************************************/
- 
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -42,7 +43,8 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <syslog.h>
-#include "strings.h"
-+#include <vector>
-+#include <string.h>
- 
- #define _stprintf_s snprintf
- #define strnicmp strncasecmp
-@@ -53,6 +55,11 @@
- #include "LMS_if.h"
- #include "Lock.h"
- #include "ATNetworkTool.h"
-+#include "utils.h"
-+#include "httpParser.h"
-+#include "miniXmlParser.h"
-+#include "alertIndication.h"
-+#include "alertDescription.h"
- 
- 
- const LMEProtocolVersionMessage Protocol::MIN_PROT_VERSION(1, 0);
-@@ -99,9 +106,9 @@ bool Protocol::Init(EventLogCallback cb, void *param)
-   PRINT("Protocol::Init started\n");
-        _eventLog = cb;
-        _eventLogParam = param;
-+       _UNSSenderChannel = INVALID_CHANNEL;
- 
-        DeinitFull();
-
-        {
-                Lock dl(_deinitLock);
-                _deinitReq = false;
-@@ -1170,10 +1177,112 @@ void Protocol::_removeFromMaps(Channel *c)
-        _channelToSocket.erase(c->GetSenderChannel());
-        _socketToChannel.erase(s);
- }
-void Protocol::_UNSConnection()
-+
-+std::string Protocol::_PACKET_BODY_LENGTH="Content-Length";
-+std::string Protocol::_NOTIFICATION_HEADER="Intel Management Engine Notification";
-+int Protocol::_UNSHandler(char *data, int dataLength)
- {
-       PRINT("UNS event\n");
-+       PRINT("UNS event data\n");
-+       char                      *pBuffer            = NULL;
-+       static char               *sBuffer            = NULL;
-+       static int                 sBufferLength      = 0;
-+       int                        rc                 = -1;
-+       unsigned int               packetBodyLength   = 0;
-+       HttpParser                 httpParser;
-+       std::string                httpBody;
-+       AlertIndication            alertIndication;
-+
-+       //printf("Processing notification message %d\n", newNotification);
-+
-+       //Init if new notification. Append recieved notification bytes to existing buffer otherwise.
-+       if (_newNotification == true) 
-+       {       if (sBuffer != NULL) {
-+                       delete []sBuffer;
-+               }
-+               sBuffer = NULL;
-+               sBufferLength = 0;
-+       }
-+
-+       if (sBuffer == NULL) {
-+               sBufferLength = 0;
-+               sBuffer = new char[(dataLength+1) *sizeof(char)];
-+               memcpy(sBuffer, data, dataLength);
-+       } else {
-+               pBuffer = new char[(sBufferLength + dataLength + 1)*sizeof(char)];
-+               memcpy(pBuffer, sBuffer, sBufferLength);
-+               memcpy(pBuffer+sBufferLength, data, dataLength);
-+               delete []sBuffer;
-+               sBuffer = pBuffer;
-+       }
-+
-+       sBufferLength += dataLength;
-+       sBuffer[sBufferLength] = '\0';
-+
-+       do {
-+               
-+               if (httpParser.parse(sBuffer) != 0) {
-+                       break;
-+               }
-+               
-+               if (httpParser.getHeaderField(_PACKET_BODY_LENGTH).empty()) {
-+                       break;
-+               }
-+
-+               packetBodyLength = stoi(httpParser.getHeaderField(_PACKET_BODY_LENGTH));
-+
-+               if (packetBodyLength == 0) {
-+                       break;
-+               }
-+               
-+               httpBody = httpParser.getBody();
-+               if (httpBody.size() < packetBodyLength) {
-+                       break;
-+               }
-+
-+               if (alertIndication.initFromXml((char*)httpBody.c_str(), httpBody.size())) {
-+                       break;
-+               }
-+               
-+               std::string alertIDString(alertIndication.getMessageID().data, alertIndication.getMessageID().dataLength);
-+               if (alertIDString.empty()) {
-+                       break;
-+               }
-+
-+               /*Check if we have match only with ID, if fails then use MessageArguments and checkagain */
-+               std::string alertDescription;
-+               std::string _alertDescription;
-+               std::string notificationBody;
-+               std::string messageArguments;
-+               alertDescription =  AlertDescription::getAlertDescription(alertIDString);
-+               messageArguments = std::string(alertIndication.getMessageArguments().data, alertIndication.getMessageArguments().dataLength);
-+
-+               if (alertDescription.empty()) {
-+                       alertIDString += "-" + messageArguments;
-+                       alertDescription = AlertDescription::getAlertDescription(alertIDString);
-+               } else {
-+                       _alertDescription = messageArguments;
-+               }
-+
-+               notificationBody = std::string(alertIndication.getIndicationTime().data, alertIndication.getIndicationTime().dataLength);
-+               if (alertDescription.empty()) {
-+                       notificationBody += " " + alertIDString;
-+               } else {
-+                       if (_alertDescription.empty()) {
-+                               notificationBody += " " + alertDescription;
-+                       } else {  
-+                               notificationBody += " : " + _alertDescription + " : " +  alertDescription;
-+                       }
-+               }
-+               
-+               Utils::notifyDesktop(_NOTIFICATION_HEADER, notificationBody, true);
-+               rc = 0;
-+
-+       } while(0);
-+
-+       return rc;
-+
- }
-+
- int Protocol::_sendHostFQDN()
- {
-        char localName[FQDN_MAX_SIZE] = "\0";
-@@ -1195,12 +1304,15 @@ void Protocol::_apfChannelOpen(LMEChannelOpenRequestMessage *chOpenMsg, int *sta
-                " Recipient channel %d for address %s, port %d.\n",
-                chOpenMsg->SenderChannel,
-                chOpenMsg->Address.c_str(), chOpenMsg->Port);
-+
-        if(chOpenMsg->Port==0)
-        {
-                       _UNSConnection();
-                       _sendHostFQDN();
-                       return;
-+               _UNSSenderChannel = chOpenMsg->SenderChannel;
-+               _lme.ChannelOpenReplySuccess(_UNSSenderChannel, _UNSRecipientChannel);
-+               _newNotification = true;
-+               return;
-        }
-+
-        SOCKET s = ATNetworkTool::Connect(chOpenMsg->Address.c_str(),
-                                          chOpenMsg->Port, error, PF_UNSPEC);
-        if (s == INVALID_SOCKET) {
-@@ -1282,33 +1394,41 @@ PortForwardRequest *Protocol::_apfChannelClose(LMEChannelCloseMessage *chClMsg)
-        Lock l(_channelsLock);
-        PRINT("_apfChannelClose: RecipientChannel=%d\n",chClMsg->RecipientChannel);
- 
-
-       ChannelToSocketMap::iterator it = _channelToSocket.find(chClMsg->RecipientChannel);
-       if (it != _channelToSocket .end()) 
-       {
-               SOCKET s = it->second;
-               Channel *c = _socketToChannel[s];
-               switch(c->GetStatus()) {
-               case Channel::OPEN:
-                       c->SetStatus(Channel::CLOSED);
-                       
-                       _lme.ChannelClose(c->GetRecipientChannel(), c->GetSenderChannel());
-                       PRINT("Channel %d was closed by Intel AMT.\n", c->GetSenderChannel());
-+       do {
-+               if (chClMsg->RecipientChannel == _UNSRecipientChannel) 
-+               {
-+                       //UNS event channel close.
-+                       //We have not created a channel on LMS side, hence ignore
-                        break;
-+               }
- 
-               case Channel::WAITING_CLOSE:
-                       PRINT("Received reply by Intel AMT on closing channel %d.\n", c->GetSenderChannel());
-                       break;
-+               ChannelToSocketMap::iterator it = _channelToSocket.find(chClMsg->RecipientChannel);
-+               if (it != _channelToSocket .end()) 
-+               {
-+                       SOCKET s = it->second;
-+                       Channel *c = _socketToChannel[s];
-+                       switch(c->GetStatus()) {
-+                       case Channel::OPEN:
-+                               c->SetStatus(Channel::CLOSED);
-+                               
-+                               _lme.ChannelClose(c->GetRecipientChannel(), c->GetSenderChannel());
-+                               PRINT("Channel %d was closed by Intel AMT.\n", c->GetSenderChannel());
-+                               break;
- 
-               case Channel::CLOSED:
-               case Channel::NOT_OPENED:
-                       break;
-               }
-+                       case Channel::WAITING_CLOSE:
-+                               PRINT("Received reply by Intel AMT on closing channel %d.\n", c->GetSenderChannel());
-+                               break;
- 
-               _removeFromMaps(c);
-               clPFwdReq = _closeMChannel(c);
-+                       case Channel::CLOSED:
-+                       case Channel::NOT_OPENED:
-+                               break;
-+                       }
-+       
-+                       _removeFromMaps(c);
-+                       clPFwdReq = _closeMChannel(c);
- 
-       }
-+               }
-+       } while(0);
- 
-        _channelGenerator.FreeChannel(chClMsg->RecipientChannel);
-        
-@@ -1320,6 +1440,18 @@ PortForwardRequest *Protocol::_apfChannelData(LMEChannelDataMessage *chDMsg, int
-        PortForwardRequest *clPFwdReq = NULL;
- 
-        do {
-+               if (chDMsg->RecipientChannel == _UNSRecipientChannel) 
-+
-+               {
-+                       if (_UNSHandler((char*)chDMsg->Data, chDMsg->DataLength) == 0)
-+                       {
-+                               _lme.ChannelClose(_UNSSenderChannel, _UNSRecipientChannel);
-+                       }
-+                       _newNotification = false;
-+                       //UNS event data handle.
-+                       //We have not created a channel on LMS side, hence break  
-+                       break;
-+               }
-                Lock l(_channelsLock);
- 
-                ChannelToSocketMap::iterator it = _channelToSocket.find(chDMsg->RecipientChannel);
-@@ -1341,6 +1473,7 @@ PortForwardRequest *Protocol::_apfChannelData(LMEChannelDataMessage *chDMsg, int
-                int senderr = 0;
-                int count = _send(channel->GetSocket(), (char *)chDMsg->Data,
-                                chDMsg->DataLength, senderr);
-+
-                PRINT("Sent %d bytes of %d from Intel AMT to channel %d with socket %d.\n",
-                        count, chDMsg->DataLength, chDMsg->RecipientChannel,
-                        channel->GetSocket());
-diff --git a/src/Protocol.h b/src/Protocol.h
-index a4ef419..858cb78 100755
--- a/src/Protocol.h
-+++ b/src/Protocol.h
-@@ -46,6 +46,7 @@
- 
- #define SOCKET int
- #define INVALID_SOCKET  (SOCKET)(~0)
-+#define INVALID_CHANNEL -1
- #define SOCKET_ERROR            (-1)
- 
- 
-@@ -120,7 +121,7 @@ private:
-        PortForwardRequest *_apfChannelData(LMEChannelDataMessage *chDMsg, int *status);
-        void _LmeReceive(void *buffer, unsigned int len, int *status);
-        void _signalSelect();
-       void _UNSConnection();
-+       int _UNSHandler(char *buffer, int len);
-        bool _acceptConnection(SOCKET s, unsigned int port);
-        int _rxFromSocket(SOCKET s);
-        int _handleFQDNChange(const char *fqdn);
-@@ -192,6 +193,11 @@ private:
-        typedef std::set<unsigned int> listenPortSet;
-        listenPortSet _listenFailReported;
-        ChannelGenerator _channelGenerator;
-+       static const unsigned int _UNSRecipientChannel = 55555;
-+       unsigned int _UNSSenderChannel;
-+       bool _newNotification;
-+       static std::string _PACKET_BODY_LENGTH;
-+       static std::string _NOTIFICATION_HEADER;
- };
- 
- #endif
-diff --git a/src/alertDescription.cpp b/src/alertDescription.cpp
-new file mode 100644
-index 0000000..f05f940
--- /dev/null
-+++ b/src/alertDescription.cpp
-@@ -0,0 +1,144 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#include "alertDescription.h"
-+#include "miniXmlParser.h"
-+#include <sstream>
-+#include <fstream>
-+#include "defaultAlerts.h"
-+#include "types.h"
-+
-+bool AlertDescription::classInited = false;
-+std::string AlertDescription::alertXmlFile = "/usr/local/share/xml/AMTAlerts.xml";
-+std::string AlertDescription::alertXmlFile1 = "/usr/share/xml/AMTAlerts.xml";
-+std::map<std::string,std::string> AlertDescription::alertDescriptionMap;
-+
-+void AlertDescription::initAlertDescription() {
-+
-+       char               *value       = NULL;
-+       unsigned int       valueLength  = 0;
-+       bool               fromFile     = false;
-+       std::string        alertIdArg;
-+       std::stringstream  ss;
-+       std::string        xmlData;
-+       CDataLen           id;
-+       CDataLen           arg; 
-+       CDataLen           description;
-+       MiniXmlParser      xmlParser;
-+       std::list<CDataLen>defaultAlertsList;
-+       std::list<CDataLen>::iterator it;
-+
-+       do {
-+               if (classInited) {
-+                       break;
-+               }
-+
-+               std::ifstream is(alertXmlFile, std::ifstream::in);
-+               if (is.good()) {
-+                       ss << is.rdbuf();
-+                       xmlData = ss.str();
-+                       fromFile = true;
-+               } else {
-+                       std::ifstream _is(alertXmlFile1, std::ifstream::in);
-+                       if (_is.good()) { 
-+                               ss << _is.rdbuf();
-+                               xmlData = ss.str();
-+                               fromFile = true;
-+                       } 
-+                       _is.close();
-+               }
-+               is.close();
-+
-+               /* Parse alert descriptions from xml file, if file is absent use the default ones  */
-+               if (fromFile) {
-+                       /* From xml file */
-+                       if (xmlParser.parse((char*)xmlData.c_str(), xmlData.size()) == 0) {
-+                               /* Process alert xml of form
-+                                * <Alerts><Alert><Id>iAMT0052</Id><Arg>1</Arg></Alert> <Alert>...</Alert> ...<Alerts> 
-+                                */
-+                               if (xmlParser.getXmlTagValue(xmlParser.getRootNode(), "Alerts", 6, NULL, 0, &value, &valueLength) == 0 ) {
-+                                       while (xmlParser.getXmlTagValue(NULL, "Alert", 5, NULL, 0, &value, &valueLength) == 0) { 
-+                                               xmlParser.getXmlTagValue(NULL, "Id", 2, NULL, 0, &value, &valueLength);
-+                                               id.data = value;
-+                                               id.dataLength = valueLength;
-+       
-+                                               xmlParser.getXmlTagValue(NULL, "Arg", 3, NULL, 0, &value, &valueLength);
-+                                               arg.data = value;
-+                                               arg.dataLength = valueLength;
-+       
-+                                               alertIdArg = std::string(id.data, id.dataLength) + "-" + std::string(arg.data, arg.dataLength);
-+
-+                                               xmlParser.getXmlTagValue(NULL, "Message", 7, NULL, 0, &value, &valueLength);
-+                                               alertDescriptionMap.insert(std::pair<std::string, std::string>(alertIdArg, std::string(value, valueLength)));
-+                                       }
-+                                       classInited = true;
-+                               }
-+                       } else {
-+                               PRINT("Failed to parse XML\n");
-+                       }
-+               } else {
-+                       /* Using default XML alerts descriptions */
-+                       defaultAlertsList = Utils::split(DEFAULT_ALERTS , DEFAULT_ALERTS_LENGTH , ";", 1);
-+                       for (CDataLen alert: defaultAlertsList) {
-+                               std::list<CDataLen> alertIdDescription = Utils::split(alert.data, alert.dataLength, ":", 1);
-+                               if (alertIdDescription.size() >= 2) {
-+                                       it = alertIdDescription.begin();
-+                                       id.data = it->data;
-+                                       id.dataLength = it->dataLength;
-+                                       it++;
-+                                       description.data = it->data;
-+                                       description.dataLength = it->dataLength;
-+                                       /* Add to std::map for faster retreival */ 
-+                                       alertDescriptionMap.insert(std::pair<std::string, std::string>(std::string(id.data, id.dataLength), 
-+                                                                                       std::string(description.data, description.dataLength)));
-+                               }
-+                       }
-+                       classInited = true;
-+               }
-+       } while(0);
-+}
-+       
-+
-+std::string AlertDescription::getAlertDescription(std::string alert) { 
-+       CDataLen alertDescription;
-+       std::map<std::string, std::string>::iterator it;
-+       
-+       if (classInited == false) {
-+               initAlertDescription();
-+       }
-+       
-+       if (classInited && alertDescriptionMap.empty() == false) {
-+               it = alertDescriptionMap.find(alert);
-+               if (it != alertDescriptionMap.end()) {
-+                       return it->second;
-+               }
-+       }
-+
-+       return "";
-+};
-diff --git a/src/alertDescription.h b/src/alertDescription.h
-new file mode 100644
-index 0000000..6413f2a
--- /dev/null
-+++ b/src/alertDescription.h
-@@ -0,0 +1,45 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#ifndef _ALERTDESCRIPTION_H
-+#define _AlERTDESCRIPTION_H
-+#include "utils.h"
-+#include <string>
-+#include <map>
-+class AlertDescription {
-+       protected:
-+       static bool classInited;
-+       static std::string alertXmlFile;
-+       static std::string alertXmlFile1;
-+       static void initAlertDescription();
-+       static std::map<std::string, std::string> alertDescriptionMap;
-+       public:
-+       static std::string getAlertDescription(std::string alert);
-+};
-+#endif
-diff --git a/src/alertIndication.cpp b/src/alertIndication.cpp
-new file mode 100644
-index 0000000..ed14abd
--- /dev/null
-+++ b/src/alertIndication.cpp
-@@ -0,0 +1,90 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#include "miniXmlParser.h"
-+#include "alertIndication.h"
-+#include <string.h>
-+
-+const char* AlertIndication::CLASS_URI = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_AlertIndication";
-+void AlertIndication::initAlertIndication(char *ns, unsigned int nsLen) {
-+       
-+       char *value          = NULL;
-+       unsigned int valueLen= 0;
-+
-+       if (xmlParser.getXmlTagValue(xmlParser.getRootNode(), "MessageID", strlen("MessageID"), ns, nsLen, &value, &valueLen) == 0) {
-+               messageID.data = value;
-+               messageID.dataLength = valueLen;
-+       }
-+
-+       if (xmlParser.getXmlTagValue(xmlParser.getRootNode(), "MessageArguments", strlen("MessageArguments"), ns, nsLen, &value, &valueLen) == 0) {
-+               messageArguments.data = value;
-+               messageArguments.dataLength = valueLen;
-+       }
-+
-+       if (xmlParser.getXmlTagValue(xmlParser.getRootNode(), "IndicationTime", strlen("IndicationTime"), ns, nsLen, &value, &valueLen) == 0) {
-+               if (xmlParser.getXmlTagValue(NULL, "Datetime", strlen("Datetime"), NULL, 0, &value, &valueLen) == 0) {
-+                       indicationTime.data = value;
-+                       indicationTime.dataLength = valueLen;
-+               }
-+       }
-+}
-+
-+int AlertIndication::initFromXml(char *buffer, unsigned int bufferLen) {
-+
-+       char *nsPrefix    = NULL;
-+       int   rc          = 0;
-+       unsigned int nsPrefixLen = 0;
-+
-+       do {
-+               if (buffer == NULL || bufferLen == 0) {
-+                       rc = -1;
-+                       break;
-+               }
-+
-+               if (xmlParser.parse(buffer, bufferLen)) {
-+                       rc = -1;
-+                       break;
-+               }
-+
-+               if (xmlParser.getNSPrefix(xmlParser.getRootNode(), (char*)CLASS_URI, CLASS_URI_LEN, &nsPrefix, &nsPrefixLen)) {
-+                       rc = -1;
-+                       break;
-+               }
-+       
-+               initAlertIndication(nsPrefix, nsPrefixLen);
-+               
-+       } while(0);
-+
-+       return rc;
-+}
-+
-+CDataLen AlertIndication::getMessageArguments() { return messageArguments; };
-+CDataLen AlertIndication::getIndicationTime() { return indicationTime; };
-+CDataLen AlertIndication::getMessageID() { return messageID; };
-+
-diff --git a/src/alertIndication.h b/src/alertIndication.h
-new file mode 100644
-index 0000000..cf6dc51
--- /dev/null
-+++ b/src/alertIndication.h
-@@ -0,0 +1,54 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#ifndef __ALERTINDICATION_H
-+#define __ALERTINDICATION_H
-+
-+#include "utils.h"
-+#include <map>
-+
-+class AlertIndication {
-+       private:
-+       MiniXmlParser xmlParser;
-+        CDataLen messageArguments;
-+       CDataLen indicationTime;
-+       CDataLen messageID;
-+       void initAlertIndication(char *ns, unsigned int nsLen);
-+
-+       public:
-+       static const char* CLASS_URI;
-+       static const int CLASS_URI_LEN = 69;
-+       int initFromXml(char *buffer, unsigned int bufferLen);
-+       CDataLen getMessageArguments();
-+       CDataLen getMessageID();
-+       CDataLen getIndicationTime();
-+
-+};
-+
-+#endif
-diff --git a/src/defaultAlerts.h b/src/defaultAlerts.h
-new file mode 100644
-index 0000000..23283f8
--- /dev/null
-+++ b/src/defaultAlerts.h
-@@ -0,0 +1,43 @@
-+#ifndef _DEFAULTALERTS_H
-+#define _DEFAULTALERTS_H
-+#define DEFAULT_ALERTS_LENGTH 6257
-+#define DEFAULT_ALERTS "iAMT0001-:System Defense Policy triggered.;iAMT0002-:Agent Presence Agent not started.;iAMT0003-:Agent Presence Agent stopped.;iAMT0004-:Agent Presence: running.;\
-+iAMT0005-:Agent Presence: expired.;iAMT0006-:Agent Presence: suspended.;iAMT0007-:Host software attempt to disable AMT Network link detected.;\
-+iAMT0008-:Host software attempt to disable AMT Network link detected -- Host Network link blocked.;iAMT0009-:AMT clock or FLASH wear-out protection disabled.;\
-+iAMT0010-:Intel(R) AMT Network Interface: Heuristics defense slow threshold trespassed.;iAMT0011-:Intel(R) AMT Network Interface: Heuristics defense fast threshold trespassed.;\
-+iAMT0012-:Intel(R) AMT Network Interface: Heuristics defense factory defined threshold trespassed.;iAMT0013-:Intel(R) AMT Network Interface: Heuristics defense Encounter timeout expired.;\
-+iAMT0014-:General certificate error.;iAMT0015-:Certificate expired.;iAMT0016-:No trusted root certificate.;iAMT0017-:Not configured to work with server certificate.;iAMT0018-:Certificate revoked.;\
-+iAMT0019-:RSA exponent too large.;iAMT0020-:RSA modulus too large.;iAMT0021-:Unsupported digest.;iAMT0022-:Distinguished name too long.;iAMT0023-:Key usage missing.;\
-+iAMT0024-:General SSL handshake error.;iAMT0025-:General 802.1x error.;iAMT0026-:AMT Diagnostic AlertEAC error - General NAC error.;\
-+iAMT0027-:AMT Diagnostic AlertEAC error - attempt to get a NAC posture while AMT NAC is disabled.;iAMT0028-:AMT Diagnostic AlertEAC error - attempt to get a posture of an unsupported type.;\
-+iAMT0029-:Audit log storage is 50% full.;iAMT0030-:Audit log storage is 75% full.;iAMT0031-:Audit log storage is 85% full.;iAMT0032-:Audit log storage is 95% full.;\
-+iAMT0033-:Audit log storage is full.;iAMT0034-:Firmware Update Event - Partial.;iAMT0035-:Firmware Update Event - Failure.;iAMT0036-:Remote connectivity initiated.;\
-+iAMT0037-:ME Presence event.;iAMT0038-0:AMT is being unprovisioned using BIOS command.;iAMT0038-1:AMT is being unprovisioned using Local MEI command.;\
-+iAMT0038-2:AMT is being unprovisioned using Local WS-MAN/SOAP command.;iAMT0038-3:AMT is being unprovisioned using Remote WS-MAN/SOAP command.;\
-+iAMT0050-:User Notification Alert - General Notification.;iAMT0050-16:User Notification Alert - Circuit Breaker notification (CB Drop TX filter hit.).;\
-+iAMT0050-17:User Notification Alert - Circuit Breaker notification (CB Rate Limit TX filter hit.).;iAMT0050-18:User Notification Alert - Circuit Breaker notification (CB Drop RX filter hit.).;\
-+iAMT0050-19:User Notification Alert - Circuit Breaker notification (CB Rate Limit RX filter hit.).;iAMT0050-32:User Notification Alert - EAC notification.;\
-+iAMT0050-48:User Notification Alert - Remote diagnostics - (Remote Redirection session started - SOL).;iAMT0050-49:User Notification Alert - Remote diagnostics - (Remote Redirection session stopped - SOL).;\
-+iAMT0050-50:User Notification Alert - Remote diagnostics. (Remote Redirection session started - IDE-R).;iAMT0050-51:User Notification Alert - Remote diagnostics. (Remote Redirection session stopped - IDE-R).;\
-+iAMT0050-66:User Notification Alert - WLAN notification (Host profile mismatch - Management Interface ignored).;\
-+iAMT0050-67:User Notification Alert - WLAN notification (Management device overrides host radio).;iAMT0050-68:User Notification Alert - WLAN notification (Host profile security mismatch).;\
-+iAMT0050-69:User Notification Alert - WLAN notification (Management device relinquishes control over host Radio).;iAMT0051-:User Notification Alert - SecIo event.;\
-+iAMT0051-0:User Notification Alert - SecIo event semaphore at host.;iAMT0051-1:User Notification Alert - semaphore at ME.;iAMT0051-2:User Notification Alert - SecIo event - semaphore timeout.;\
-+iAMT0052-:User Notification Alert - KVM session event.;iAMT0052-0:User Notification Alert - KVM session requested.;iAMT0052-1:User Notification Alert - KVM session started.;\
-+iAMT0052-2:User Notification Alert - KVM session stopped.;iAMT0053-:User Notification Alert - RCS notification.;\
-+iAMT0053-50:User Notification Alert - RCS notification (HW button pressed. Connection initiated automatically).;\
-+iAMT0053-52:User Notification Alert - RCS notification (HW button pressed. Connection wasn't initiated automatically).;iAMT0053-53:User Notification Alert - RCS notification (Contracts updated).;\
-+iAMT0054-:User Notification Alert - WLAN notification. Wireless Profile sync enablement state changed.;iAMT0055-:User Notification Alert - Provisioning state change notification.;\
-+iAMT0055-0:User Notification Alert - Provisioning state change notification - Pre-configuration.;iAMT0055-1:User Notification Alert - Provisioning state change notification - In configuration.;\
-+iAMT0055-2:User Notification Alert - Provisioning state change notification - Post-configuration.;\
-+iAMT0055-3:User Notification Alert - Provisioning state change notification - unprovision process has started.;iAMT0056-:User Notification Alert - System Defense change notification.;\
-+iAMT0057-:User Notification Alert - Network State change notification.;iAMT0058-:User Notification Alert - Remote Access change notification.;\
-+iAMT0058-1:User Notification Alert - Remote Access change notification - tunnel is closed.;iAMT0058-1:User Notification Alert - Remote Access change notification - tunnel is open.;\
-+iAMT0059-:User Notification Alert - KVM enabled event.;iAMT0059-0:User Notification Alert - KVM enabled event - KVM disabled.;\
-+iAMT0059-1:User Notification Alert - KVM enabled event - KVM enabled (both from MEBx and PTNI).;iAMT0060-:User Notification Alert - SecIO configuration event.;iAMT0061-:ME FW reset occurred.;\
-+iAMT0062-:User Notification Alert - IpSyncEnabled event.;iAMT0062-0:User Notification Alert - IpSyncEnabled event - IpSync disabled.;\
-+iAMT0062-1:User Notification Alert - IpSyncEnabled event - IpSync enabled.;iAMT0063-:User Notification Alert - HTTP Proxy sync enabled event.;\
-+iAMT0063-0:User Notification Alert - HTTP Proxy sync enabled event - HTTP Proxy Sync disabled.;iAMT0063-1:User Notification Alert - HTTP Proxy sync enabled event - HTTP Proxy Sync enabled.;\
-+iAMT0064-:User Notification Alert - User Consent event.;iAMT0064-1:User Notification Alert - User Consent event - User Consent granted.;\
-+iAMT0064-2:User Notification Alert - User Consent event - User Consent ended.;"
-+#endif
-diff --git a/src/notifyDesktop.sh b/src/notifyDesktop.sh
-new file mode 100644
-index 0000000..06bfd97
--- /dev/null
-+++ b/src/notifyDesktop.sh
-@@ -0,0 +1,10 @@
-+#!/bin/sh
-+# get list of current users
-+for x in $(who | sort -u -k1,1 | awk '{print $1}'); do
-+  # send message to anyone on display 0
-+  dbus_session_file=$(eval echo "~$x")/.dbus/session-bus/$(cat /var/lib/dbus/machine-id)-0
-+  if [ -e "$dbus_session_file" ]; then
-+    su -l "$x" -c "source '$dbus_session_file'; export DISPLAY=:0; notify-send -u critical -t 2000 '$1' '$2'"
-+  fi
-+done
-+
-diff --git a/src/tools/httpParser.cpp b/src/tools/httpParser.cpp
-new file mode 100644
-index 0000000..38d2901
--- /dev/null
-+++ b/src/tools/httpParser.cpp
-@@ -0,0 +1,101 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#include "httpParser.h"
-+#include "utils.h"
-+#include "types.h"
-+
-+int HttpParser::parse(char *buffer) {
-+
-+       std::vector<std::string> headerBody;
-+       std::vector<std::string> header;
-+       int rc = 0;
-+       do {
-+               if (buffer == NULL) {
-+                       rc = -1;
-+                       break;
-+               }
-+
-+               headerBody = Utils::split(buffer, "\r\n\r\n"); 
-+               if (headerBody.size() < 2)
-+               {
-+                       PRINT("Failed to process httpHeader\n");
-+                       rc = -1;
-+                       break;
-+               }
-+
-+               /* Entries in Header are seperated by \r\n */
-+               header = Utils::split((char*)headerBody[0].c_str(), "\r\n");
-+
-+               /* First line in header is the the header line
-+                * e.g. POST <path> HTTP/1.1
-+                * e.g  GET <path> HTTP/1.1
-+                */
-+               headerLine = header[0];
-+
-+               /* After headerline are the Fields
-+                * e.g Content-Length:2204
-+                */
-+               for (unsigned int i=1; i< header.size(); i++) {
-+                       std::vector<std::string> field = Utils::split((char*)header[i].c_str(), ":");
-+                       if (field.size() < 2) {
-+                               rc = -1;
-+                               break;
-+                       }
-+                       headerFields.insert(std::pair<std::string, std::string>(field[0], field[1]));
-+               }
-+
-+               if (rc) break;  
-+
-+               body = headerBody[1];
-+       } while(0);
-+
-+       return rc;
-+}
-+
-+std::string HttpParser::getHeaderLine() {
-+       return headerLine;
-+}
-+
-+std::string HttpParser::getHeaderField(std::string field) {
-+       std::map<std::string,std::string>::iterator it;
-+       std::string fieldValue = ""; 
-+ 
-+       it = headerFields.find(field);
-+       if (it != headerFields.end())
-+       {
-+               fieldValue = it->second;
-+       }
-+
-+       return fieldValue;
-+}
-+
-+std::string HttpParser::getBody() {
-+       return body;
-+}
-diff --git a/src/tools/httpParser.h b/src/tools/httpParser.h
-new file mode 100644
-index 0000000..a82d82a
--- /dev/null
-+++ b/src/tools/httpParser.h
-@@ -0,0 +1,49 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#ifndef _HTTPPARSER_H
-+#define _HTTPPARSER_H
-+#include <vector>
-+#include <map>
-+#include <string>
-+
-+class HttpParser {
-+       
-+       public:
-+       int parse(char *buffer);
-+       std::string getHeaderLine();
-+       std::string getHeaderField(std::string field);
-+       std::string getBody();
-+       private:
-+       std::string headerLine;
-+       std::map<std::string, std::string> headerFields;
-+       std::string body;
-+
-+};
-+#endif
-diff --git a/src/tools/miniXmlParser.cpp b/src/tools/miniXmlParser.cpp
-new file mode 100644
-index 0000000..f1f0503
--- /dev/null
-+++ b/src/tools/miniXmlParser.cpp
-@@ -0,0 +1,375 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#include "miniXmlParser.h"
-+#include "utils.h"
-+#include <string.h>
-+#include <list>
-+#include <stack>
-+#include "types.h"
-+
-+MiniXmlParser::MiniXmlParser() {
-+       rootNode = NULL;
-+}
-+
-+MiniXmlParser::~MiniXmlParser() {
-+       if (rootNode) {
-+               deleteXmlTree(rootNode);
-+               rootNode = NULL;        
-+       }
-+}
-+
-+void MiniXmlParser::deleteXmlTree(XMLNode* rootNode) {
-+       XMLNode* node     = rootNode;
-+       XMLNode* tempNode = NULL;
-+
-+       while (node != NULL) {
-+               tempNode = node->childNode;
-+               delete node;
-+               node = tempNode;
-+       }
-+}
-+
-+int MiniXmlParser::validateXML(XMLNode const* rootNode) {
-+       int rc = 0;
-+       XMLNode* current = (XMLNode *)rootNode;
-+       XMLNode* temp    = NULL;
-+       std::stack<XMLNode*> tagStack;
-+
-+       while (current != NULL) {
-+               if (current->tagName == NULL) { 
-+                       PRINT("ValidateXML failed, foung a empty tag\n");
-+                       rc = -1;
-+                       break;
-+               }
-+
-+               if (memcmp(current->tagName, "!", 1) == 0) {
-+                       temp = current;
-+                       current = tagStack.empty()?NULL:tagStack.top();
-+                       if (current != NULL) {
-+                               current->childNode = temp->childNode;
-+                       } else {
-+                               current = temp;
-+                       }
-+               } else if (current->startTag) {
-+                       current->parentNode = tagStack.empty()?NULL:tagStack.top();
-+                       tagStack.push(current);
-+               } else {
-+                       if (tagStack.empty() == false) {
-+                               temp = tagStack.top(); 
-+                               tagStack.pop(); 
-+                       } else {
-+                               temp = NULL;
-+                       }
-+                       if (temp != NULL) {
-+                               if (temp->tagLength == current->tagLength && memcmp(temp->tagName, current->tagName, current->tagLength) == 0) {
-+                                       if (current->childNode != NULL) {
-+                                               if (current->childNode->startTag != 0) {
-+                                                       temp->siblingNode = current->childNode;
-+                                               }
-+                                       }
-+                                       temp->closingTag = current;
-+                                       current->startingTag = temp;
-+                               } else {
-+                                       PRINT("ValidateXML failed, Illegal tag\n");
-+                                       rc = -1;
-+                                       break;
-+                               }
-+                       } else {
-+                               PRINT("ValidateXML failed, Illegal closing tag\n");
-+                               rc = -1;
-+                               break;
-+                       }
-+               }
-+               current = current->childNode;
-+       }
-+
-+       if (tagStack.empty() == false) {
-+               PRINT("ValidateXML failed, Incomplete XML\n");
-+               rc = -1;
-+       }
-+
-+       return rc;
-+}
-+
-+int MiniXmlParser::parse(char* buffer, unsigned int bufferLength) {
-+       int      validXml  = -1;
-+       XMLNode* node      = NULL;
-+
-+       node = _parse(buffer, bufferLength);
-+       if (node) {
-+               validXml = validateXML(node);
-+       }
-+       rootNode = node;
-+       return validXml;
-+}
-+
-+XMLNode* MiniXmlParser::_parse(char const* buffer, unsigned int bufferLength) {
-+
-+       char* tagName      = NULL;
-+       char* nsTag        = NULL;
-+       char* CommentEnd   = NULL;
-+
-+       int   tagLength    = 0;
-+       int   startTag     = 0;
-+       int   emptyTag     = 0;
-+       int   nsLength     = 0;
-+       int   i            = 0;
-+       int   CommentIndex = 0;
-+
-+       std::list<CDataLen> xmlFields;
-+       std::list<CDataLen> temp2;
-+       std::list<CDataLen> tagValue;
-+
-+       XMLNode *rootNode = NULL;;
-+       XMLNode *current  = NULL;
-+       XMLNode *newNode  = NULL;
-+       std::list<CDataLen>::iterator it;
-+
-+       if (buffer == NULL || bufferLength == 0) {
-+               return NULL; 
-+       }
-+
-+       xmlFields = Utils::split(buffer, bufferLength, "<", 1);
-+       for (CDataLen xmlField: xmlFields) {
-+               if (xmlField.dataLength != 0 && memcmp(xmlField.data, "?", 1) != 0 && (xmlField.data > CommentEnd)) {
-+                       /*Parse XML comments and ignore it.*/
-+                       if (xmlField.dataLength > 3 && memcmp(xmlField.data, "!--", 3)==0) {
-+                               CommentIndex = 3;
-+                               while (((xmlField.data + CommentIndex) < (buffer + bufferLength)) && memcmp(xmlField.data + CommentIndex, "-->", 3) != 0) {
-+                                       CommentIndex++;
-+                               }
-+                               CommentEnd = xmlField.data + CommentIndex;
-+                               continue;
-+                       } else {
-+                               emptyTag = 0;
-+                               /*if the first char is / after < then its ending tag, otherwise starting tag. ("</....") */
-+                               if (memcmp(xmlField.data, "/", 1) == 0) {
-+                                       startTag = 0;
-+                                       xmlField.data = xmlField.data + 1;
-+                                       xmlField.dataLength -= 1;
-+                                       temp2 = Utils::split(xmlField.data, xmlField.dataLength, ">", 1);
-+                               } else {
-+                                       
-+                                       startTag = 1;
-+                                       temp2 = Utils::split(xmlField.data, xmlField.dataLength, ">", 1);
-+                                       if (temp2.front().dataLength > 0 && *(char*)(temp2.front().data-1) == '/') {
-+                                               //".../>"  are empty tags
-+                                               emptyTag = 1;
-+                                       }
-+                               }
-+                       }
-+                       /*split on ":" to get namespace:tagName*/
-+                       tagValue = Utils::split(temp2.front().data, temp2.front().dataLength, ":", 1);
-+                       if (tagValue.size() == 1) {
-+                               nsTag = NULL;
-+                               nsLength = 0;
-+                               tagName = tagValue.front().data;
-+                               tagLength = tagValue.front().dataLength;
-+                       } else {
-+                               it = tagValue.begin();
-+                               nsTag = it->data;
-+                               nsLength = it->dataLength;
-+                               it++;
-+                               tagName = it->data;
-+                               tagLength = it->dataLength;
-+                       }
-+                       tagValue.clear();
-+                       temp2.clear();
-+
-+                       /*Parse for multiple ns:tags and recompute the first tagLength*/
-+                       for(i=0; i<tagLength; i++) {
-+                               if ((tagName[i] == ' ')||(tagName[i] == '/')||(tagName[i] == '>')||(tagName[i] == '\t')||(tagName[i] == '\r')||(tagName[i] == '\n')) {
-+                                       if (i != 0) {
-+                                               if (tagName[i]=='/') {
-+                                                       emptyTag = 1;
-+                                               }
-+                                               tagLength = i;
-+                                               break;
-+                                       }
-+                               }
-+                       }
-+
-+                       /*Create XML Node, populate properties and add it to the list*/
-+                       if (tagLength != 0) {
-+                               newNode = new XMLNode();        
-+                               newNode->tagName = tagName;
-+                               newNode->tagLength = tagLength;
-+                               newNode->startTag = startTag;
-+                               newNode->nsTag = nsTag;
-+                               newNode->nsLength = nsLength;                           
-+
-+
-+                               if (rootNode == NULL) {
-+                                       rootNode = newNode;
-+                               }
-+                               else {
-+                                       current->childNode = newNode;
-+                               }
-+                               current = newNode;
-+
-+                               if (emptyTag) {
-+                                       newNode = new XMLNode();        
-+                                       newNode->tagName = tagName;
-+                                       newNode->tagLength = tagLength;
-+                                       newNode->nsTag = nsTag;
-+                                       newNode->nsLength = nsLength;
-+
-+                                       current->emptyTag = 1;
-+                                       current->childNode = newNode;
-+                                       current = newNode;
-+                               }
-+                       }
-+
-+               }
-+       }
-+
-+       xmlFields.clear();
-+       return rootNode;
-+}
-+
-+/*
-+ * Parse the XML Tree from rootNode and retrive value of a given key.
-+ * If rootNode is passed as NULL, parsing resumes from last key retrieved node.
-+ * Return 0 on Success , -1 otherwise.
-+ * Inputs : XMLNode *rootNode, char *tag, unsigned int tagLen, char *ns, unsigned int nsLen
-+ * Outputs: char** value, unsigned int *valueLen 
-+ */
-+int MiniXmlParser::getXmlTagValue(XMLNode const* rootNode, char const* tag, unsigned int tagLen, char const* ns, unsigned int nsLen, char** value, unsigned int *valueLen)
-+{
-+
-+       static XMLNode *cur    = (XMLNode*) rootNode;
-+       static XMLNode *pcur   = cur;
-+       char           *pValue = NULL;
-+       bool           found   = false;
-+
-+       if (tag == NULL) {
-+               return -1;
-+       }
-+
-+       if (rootNode != NULL) {
-+               cur  = (XMLNode *) rootNode;
-+               pcur = cur;
-+       }
-+
-+       while (cur != NULL) {
-+               while (pcur != NULL) {
-+                       if (pcur->closingTag && memcmp((pcur->tagName), tag, tagLen) == 0) {
-+                               if (ns) {
-+                                       if (memcmp(pcur->nsTag, ns, pcur->nsLength) == 0) {
-+                                               found = true;
-+                                       }
-+                               } else {
-+                                       found = true;
-+                               }
-+
-+                               if (found) {
-+                                       pValue = strstr(pcur->tagName, ">") + 1;
-+                                       if (pcur->closingTag->nsLength) {
-+                                               *valueLen = pcur->closingTag->nsTag - pValue - 2;
-+                                       } else {
-+                                               *valueLen = pcur->closingTag->tagName - pValue - 2;
-+                                       }
-+                                       *value = pValue;
-+                                       pcur = pcur->childNode;
-+                                       return 0;
-+                               }
-+                       }
-+                       pcur = pcur->childNode;
-+               }
-+               cur = cur->siblingNode;
-+               pcur = cur;
-+       }
-+
-+       return -1;
-+}
-+
-+/* Returns Namespace prefix of given URI namespace
-+ * Inputs : XMLNode *node, char *uri, unsigned int uriLen
-+ * Outputs: char **nsPrefix, unsigned int *nsPrefixLen
-+ */
-+int MiniXmlParser::getNSPrefix(XMLNode const* node, char const* uri, unsigned int uriLen, char **nsPrefix, unsigned int *nsPrefixLen) {
-+
-+       bool foundNS = false;;
-+       char *tagEnd = NULL;
-+       int  rc      = 0;
-+       CDataLen tempNS;
-+       CDataLen tempURI;
-+       std::list<CDataLen> tags;
-+       std::list<CDataLen> temp;
-+       std::list<CDataLen> temp2;
-+       std::list<CDataLen>::iterator it;
-+
-+       if (node == NULL || uri == NULL) {
-+               rc = -1;
-+               return rc;
-+       }
-+
-+       tagEnd = strstr(node->tagName, ">");
-+       if (tagEnd && nsPrefix != NULL && nsPrefixLen != NULL) {
-+               tags = Utils::split(node->tagName, tagEnd - node->tagName, " ", 1);
-+               for (CDataLen tag: tags) {
-+                       temp = Utils::split(tag.data, tag.dataLength, ":", 1);
-+                       if (temp.size() >= 2) {
-+                               it = temp.begin();
-+                               tempNS.data = it->data;
-+                               tempNS.dataLength = it->dataLength;
-+                               it++;
-+                               
-+                               if (memcmp(tempNS.data, "xmlns", 5) == 0) {
-+                                       temp2 = Utils::split(it->data, it->dataLength, "=", 1);
-+                                       if (temp2.size() >= 2) {
-+                                               it = temp2.begin();
-+                                               tempNS.data = it->data;
-+                                               tempNS.dataLength = it->dataLength;
-+                                               it++;
-+                                       }
-+                               }
-+                               //Ignore if first character is " or ' 
-+                               if (it->data[0] == 34 || it->data[0] == 39) {
-+                                       it->data = it->data + 1;
-+                               }
-+
-+                               if (memcmp(it->data, uri, uriLen) == 0) {
-+                                       foundNS = true;
-+                                       break;
-+                               }
-+                       }
-+               }
-+       } else {
-+               rc = -1;
-+       }
-+       
-+       if (rc == 0 && foundNS) {
-+               *nsPrefix = tempNS.data;
-+               *nsPrefixLen = tempNS.dataLength;
-+       }
-+       
-+       return rc;
-+}
-diff --git a/src/tools/miniXmlParser.h b/src/tools/miniXmlParser.h
-new file mode 100644
-index 0000000..ae0d234
--- /dev/null
-+++ b/src/tools/miniXmlParser.h
-@@ -0,0 +1,51 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#ifndef _MINIXMLPARSER_H
-+#define _MINIXMLPARSER_H
-+#include <iostream>
-+#include "xmlNode.h"
-+
-+class MiniXmlParser {
-+       public:
-+       MiniXmlParser();
-+       ~MiniXmlParser();
-+       int parse(char* buffer, unsigned int bufferLength);
-+       XMLNode* getRootNode() { return rootNode; };
-+       int getXmlTagValue(XMLNode const* rootNode, char const *tag, unsigned int tagLen, char const* ns, unsigned int nsLen, char** value, unsigned int *valueLen);
-+       int getNSPrefix(XMLNode const* nonde, char const* uri, unsigned int uriLen, char **nsPrefix, unsigned int *nsPrefixLen);
-+
-+       private:
-+       XMLNode* rootNode;
-+       XMLNode* _parse(char const* buffer, unsigned int bufferLength);
-+       /* Validates if the XML is well formed and sets up parent sibling pointers */
-+       int validateXML(XMLNode const* rootNode);
-+       void deleteXmlTree(XMLNode *root);
-+};
-+#endif
-diff --git a/src/tools/utils.cpp b/src/tools/utils.cpp
-new file mode 100644
-index 0000000..ec20b28
--- /dev/null
-+++ b/src/tools/utils.cpp
-@@ -0,0 +1,185 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#include <string.h>
-+#include "utils.h"
-+#include <syslog.h>
-+#include <unistd.h>
-+
-+std::vector<std::string> Utils::split(char const * str, char const * delim) {
-+       char* tok = (char*)str;
-+       char* ptok = tok;
-+       int delimLength = 0;
-+       std::vector<std::string> splittedStrings;
-+       
-+       do {
-+               if (str == NULL) {
-+                       break;
-+               }
-+
-+               if (delim == NULL) {
-+                       splittedStrings.push_back(std::string(str));
-+                       break;
-+               }
-+
-+               delimLength = strlen(delim);
-+               tok = strstr(ptok, delim);
-+               while (tok) {
-+                       if (ptok != tok) {
-+                               splittedStrings.push_back(std::string(ptok, tok-ptok));
-+                       }
-+                       ptok = tok + delimLength;
-+                       tok = strstr(ptok, delim);
-+               }
-+
-+               if (ptok != str+strlen(str)) {
-+                       splittedStrings.push_back(std::string(ptok, strlen(ptok)));
-+               }
-+       } while(0);
-+       return splittedStrings;
-+}
-+
-+
-+char* Utils::strnstr(char const* haystack, unsigned int haystackLength, char const* needle, unsigned int needleLength) {
-+
-+       char* needleInHaystack = NULL;
-+       unsigned int  j;
-+       do {
-+               if (haystack == NULL || needle == NULL) {
-+                       break;
-+               }
-+
-+               for (unsigned int i = 0; i < haystackLength; i++) {
-+                       if (haystack[i] == '\0' || ((haystackLength - i) < needleLength)) {
-+                               break;
-+                       }
-+               
-+                       for (j = 0; j < needleLength; j++) {
-+                               if (haystack[i + j] != needle[j]) {
-+                                       break;
-+                               }
-+                       }
-+
-+                       if (j == needleLength) {
-+                               //Found needle in haystack
-+                               needleInHaystack = (char*)&haystack[i];
-+                               break;
-+                       }
-+               }
-+       } while(0);
-+       return needleInHaystack;
-+}
-+
-+std::list<CDataLen> Utils::split(char const* str, unsigned int strLength, char const* delim, unsigned int delimLength) {
-+        char* tok = (char*)str;
-+        char* ptok = tok;
-+        std::list<CDataLen> splittedStrings;
-+       CDataLen dataLen;
-+
-+       do {
-+               if (str == NULL) {
-+                       break;
-+               }
-+
-+               if (delim == NULL) {
-+                       dataLen.data = (char*)str;
-+                       dataLen.dataLength = strLength;
-+                       splittedStrings.push_back(dataLen);
-+                       break;
-+               }
-+
-+               tok = Utils::strnstr(str, strLength, delim, delimLength);
-+               while (tok) {
-+                       dataLen.data = ptok;    
-+                       dataLen.dataLength = tok-ptok;
-+                       if (ptok!=tok) {
-+                               splittedStrings.push_back(dataLen);
-+                       }
-+                       ptok = tok + delimLength;
-+                       tok = Utils::strnstr(ptok, (str + strLength - ptok), delim, delimLength);
-+               }
-+
-+               if (ptok != (str + strLength)) {
-+                       dataLen.data = ptok;    
-+                       dataLen.dataLength = str + strLength - ptok;
-+                       splittedStrings.push_back(dataLen);
-+               }
-+       } while (0);
-+       return splittedStrings;
-+}
-+
-+std::string Utils::DEFAULT_NOTIFY_CMD="export DISPLAY=:0; notify-send -u critical -t 2000 ";
-+std::string Utils::NOTIFY_DESKTOP_SCRIPT="/usr/local/bin/notifyDesktop.sh";
-+std::string Utils::NOTIFY_DESKTOP_SCRIPT1="/usr/bin/notifyDesktop.sh";
-+
-+void Utils::notifyDesktop(std::string header, std::string body, bool logInSyslog) {
-+
-+       std::string notifyCMD;
-+       
-+       if (! access (NOTIFY_DESKTOP_SCRIPT.c_str(), X_OK)) {
-+               notifyCMD = NOTIFY_DESKTOP_SCRIPT + " '" + header + "' '" + body + "'";
-+       } else if (! access (NOTIFY_DESKTOP_SCRIPT1.c_str(), X_OK)) {
-+               notifyCMD = NOTIFY_DESKTOP_SCRIPT1 + " '" + header + "' '" + body + "'";
-+       } else {
-+               notifyCMD = DEFAULT_NOTIFY_CMD + " '" + header + "' '" + body + "'"; 
-+       }
-+
-+       if (logInSyslog) {
-+               syslog(LOG_INFO, "%s %s\n", header.c_str(), body.c_str());
-+       }
-+
-+       system(notifyCMD.c_str());
-+}
-+
-+
-+std::string Utils::format(const char *format , ...) {
-+       char*   buffer        = NULL;
-+       int     bufferLength  = 512;
-+       int     _bufferLength = 0;
-+       va_list vl;
-+       std::string formattedString("");
-+
-+       buffer = new char[bufferLength];
-+       if (buffer) {
-+               va_start(vl, format);
-+
-+               _bufferLength = vsnprintf(buffer, bufferLength, format, vl);
-+               if (bufferLength <= _bufferLength) { 
-+                       delete[] buffer;
-+                       buffer = new char[_bufferLength + 1];
-+                       _bufferLength = vsnprintf(buffer, _bufferLength, format, vl);
-+               }
-+
-+               formattedString = std::string(buffer);
-+               va_end(vl);
-+               delete[] buffer;
-+       }
-+
-+       return formattedString;
-+}
-diff --git a/src/tools/utils.h b/src/tools/utils.h
-new file mode 100644
-index 0000000..a7568fa
--- /dev/null
-+++ b/src/tools/utils.h
-@@ -0,0 +1,57 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+
-+#ifndef __UTILS_H
-+#define __UTILS_H
-+#include <iostream>
-+#include <vector>
-+#include <list>
-+#include <string>
-+#include <cstdarg>
-+
-+class CDataLen {
-+       public:
-+       char* data;
-+       int dataLength;
-+       CDataLen() { data = NULL; dataLength = 0; };
-+};
-+
-+class Utils {
-+       public:
-+       static std::string NOTIFY_DESKTOP_SCRIPT;
-+       static std::string NOTIFY_DESKTOP_SCRIPT1;
-+       static std::string DEFAULT_NOTIFY_CMD;
-+       static std::vector<std::string> split(char const* str, char const * delim);
-+       static std::list<CDataLen> split(char const* str, unsigned int strLength, char const* delim, unsigned int delimLength);
-+       static char* strnstr(char const* haystack, unsigned int haystackLength, char const* needle, unsigned int needleLength);
-+       static void notifyDesktop(std::string header, std::string body, bool logInSyslog); 
-+       static std::string format(const char *format , ...);
-+};
-+#endif
-diff --git a/src/tools/xmlNode.cpp b/src/tools/xmlNode.cpp
-new file mode 100644
-index 0000000..827cd3f
--- /dev/null
-+++ b/src/tools/xmlNode.cpp
-@@ -0,0 +1,45 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#include "xmlNode.h"
-+#include <iostream>
-+XMLNode::XMLNode() {
-+       tagName = NULL; 
-+       nsTag = NULL;
-+       tagLength = 0;
-+       nsLength = 0;
-+       startTag = 0;
-+       emptyTag = 0;
-+
-+       closingTag = NULL;              
-+       startingTag = NULL;
-+       parentNode = NULL;
-+       childNode = NULL;
-+       siblingNode = NULL;
-+}
-diff --git a/src/tools/xmlNode.h b/src/tools/xmlNode.h
-new file mode 100644
-index 0000000..4a6c91e
--- /dev/null
-+++ b/src/tools/xmlNode.h
-@@ -0,0 +1,49 @@
-+/*******************************************************************************
-+ * Copyright (C) 2017 Intel Corporation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *
-+ *  - Redistributions of source code must retain the above copyright notice,
-+ *    this list of conditions and the following disclaimer.
-+ *
-+ *  - Redistributions in binary form must reproduce the above copyright notice,
-+ *    this list of conditions and the following disclaimer in the documentation
-+ *    and/or other materials provided with the distribution.
-+ *
-+ *  - Neither the name of Intel Corporation. nor the names of its
-+ *    contributors may be used to endorse or promote products derived from this
-+ *    software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL Intel Corporation. OR THE CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *******************************************************************************/
-+#ifndef __XMLNODE_H
-+#define __XMLNODE_H
-+class XMLNode {
-+
-+       public:
-+       char* tagName;  
-+       char* nsTag;
-+       int tagLength;
-+       int nsLength;
-+       int startTag;
-+       int emptyTag;
-+
-+       XMLNode* closingTag;            
-+       XMLNode* startingTag;
-+       XMLNode* parentNode;
-+       XMLNode* childNode;
-+       XMLNode* siblingNode;
-+       XMLNode();
-+};
-+#endif
-- 
-2.9.3
diff --git a/recipes-bsp/amt/lms7_7.1.20.bb b/recipes-bsp/amt/lms7_7.1.20.bb
deleted file mode 100644
index eca36811..00000000
--- a/recipes-bsp/amt/lms7_7.1.20.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-DESCRIPTION = "Intel Local Manageability Service allows applications \
-to access the Intel Active Management Technology (AMT) firmware via \
-the Intel Management Engine Interface (MEI)."
-HOMEPAGE = "http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers"
-LICENSE = "BSD_LMS"
-PR = "r0"
-BPN="lms"
-PV_SUB = "25"
-SRC_URI = "http://software.intel.com/sites/default/files/m/4/e/a/9/b/37962-${BPN}_${PV}.${PV_SUB}.zip \
-           file://atnetworktool-printf-fix.patch \
-           file://readlink-declaration.patch \
-           file://0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch \
-           file://0001-Include-sys-select.h-for-fd_set.patch \
-           file://0002-Use-proper-netinet-in.h-API.patch \
-           "
-LOCALSRC = "file://${WORKDIR}/outputdir/${BPN}-${PV}-${PV_SUB}.tar.gz"
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-LIC_FILES_CHKSUM = "file://COPYING;md5=7264184cf88d9f27b719a9656255b47b"
-SRC_URI[md5sum] = "687b76e78bfdbcf567c0e842c1fe240a"
-SRC_URI[sha256sum] = "cc0457f0044e924794bb1aeae9a72c28666a525cd8a963d0d92970222946e75b"
-inherit autotools update-rc.d
-INITSCRIPT_NAME = "lms7"
-INITSCRIPT_PARAMS = "defaults"
-python do_unpack() {
-    s = d.getVar('S', True)
-    d.setVar('S', '${WORKDIR}/outputdir')
-    bb.build.exec_func('base_do_unpack', d)
-    # temorarily change SRC_URI for unpack
-    src_uri = d.getVar('SRC_URI', True)
-    d.setVar('SRC_URI', '${LOCALSRC}')
-    d.setVar('S', s)
-    bb.build.exec_func('base_do_unpack', d)
-    d.setVar('SRC_URI', src_uri)
-}
-do_install_append () {
-        mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms7
-        install -d ${D}${sysconfdir}/init.d
-        # The configure script looks at the host to decide where to put init
-        # scripts, so move it at the same time as renaming it.
-        if test -f ${D}${sysconfdir}/rc.d/init.d/lms ; then
-                mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        else
-                mv ${D}${sysconfdir}/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        fi
-        sed -i 's/^NAME=lms/NAME=lms7/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        rmdir ${D}${datadir} || :
-}
diff --git a/recipes-bsp/amt/lms8_8.0.0-7.bb b/recipes-bsp/amt/lms8_8.0.0-7.bb
deleted file mode 100644
index 9b37b9b4..00000000
--- a/recipes-bsp/amt/lms8_8.0.0-7.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "Intel Local Manageability Service allows applications \
-to access the Intel Active Management Technology (AMT) firmware via \
-the Intel Management Engine Interface (MEI)."
-HOMEPAGE = "http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers"
-LICENSE = "BSD_LMS"
-PR = "r0"
-BPN="lms"
-SRC_URI = "http://software.intel.com/sites/default/files/${BPN}-${PV}.tar.gz \
-           file://readlink-declaration.patch \
-           file://0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch \
-           file://0001-Include-sys-select.h-for-fd_set.patch \
-           file://0002-Use-proper-netinet-in.h-API.patch \
-           file://0003-Fix-device-file-referance-to-dev-mei0-remove-select.patch \
-           file://0004-Intel-AMT-ME-real-time-notification-infra.patch \
-           "
-FILES_${PN} += "${datadir}/xml/AMTAlerts.xml"
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-LIC_FILES_CHKSUM = "file://COPYING;md5=ec77c894e8a1a89fa07aed2c76680ab8"
-SRC_URI[md5sum] = "3cbd027a0e6e9ced8238478b24cde3c6"
-SRC_URI[sha256sum] = "7077db6f2f381e67cb37565b20c40ff0c7d3f98f014e65622a4b4b66c2b1d637"
-inherit autotools update-rc.d
-INITSCRIPT_NAME = "lms8"
-INITSCRIPT_PARAMS = "defaults"
-do_install_append () {
-        mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms8
-        install -d ${D}${sysconfdir}/init.d
-        # The configure script looks at the host to decide where to put init
-        # scripts, so move it at the same time as renaming it.
-        if test -f ${D}${sysconfdir}/rc.d/init.d/lms ; then
-                mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        else
-                mv ${D}${sysconfdir}/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        fi
-        sed -i 's/^NAME=lms/NAME=lms8/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        rmdir ${D}${datadir} || :
-}
diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 6dd422ae..d21c3bee 100644
--- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/${PN}:"
diff --git a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf b/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
deleted file mode 100644
index 74d33c87..00000000
--- a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Mimic modprobe's install funcitonality with busybox's modprobe
-install gma500_gfx dmesg | grep gma500_gfx_checked || { /etc/modprobe.d/gma500-gfx-check.sh || modprobe gma500_gfx; }
diff --git a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh b/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
deleted file mode 100644
index 75cda99f..00000000
--- a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Check for devices we wish to avoid gma500_gfx for
-DEVICES="0x8119 0x4108"
-# Checked flag to avoid infinite modprobe
-echo "gma500_gfx_checked" >> /dev/kmsg;
-for DEVICE in $DEVICES; do
-    if udevadm trigger --subsystem-match=pci --verbose --attr-match=device=$DEVICE | grep "pci" >> /dev/null ; then
-        echo "Found $DEVICE, avoiding gma500_gfx module" >> /dev/kmsg;
-        exit 0
-    fi
-done
-exit 1
diff --git a/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
deleted file mode 100644
index 7b08064b..00000000
--- a/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Intel gma500_gfx fix for certain hardware"
-DESCRIPTION = "Avoid inserting gma500_gfx module for certain hardware devices."
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI = "file://gma500-gfx-check.conf \
-        file://gma500-gfx-check.sh "
-do_install(){
-    install -d ${D}${sysconfdir}/modprobe.d/
-    install -m 755 ${WORKDIR}/gma500-gfx-check.sh ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.sh
-    install -m 644 ${WORKDIR}/gma500-gfx-check.conf ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.conf
-}
-FILES_${PN}="${sysconfdir}/modprobe.d/gma500-gfx-check.conf \
-             ${sysconfdir}/modprobe.d/gma500-gfx-check.sh"
-COMPATIBLE_MACHINE = "intel-core2-32"
diff --git a/recipes-bsp/intel-cmt-cat/intel-cmt-cat_23.11.1.bb b/recipes-bsp/intel-cmt-cat/intel-cmt-cat_23.11.1.bb
new file mode 100644
index 00000000..60d0dfd2
--- /dev/null
+++ b/recipes-bsp/intel-cmt-cat/intel-cmt-cat_23.11.1.bb
@@ -0,0 +1,29 @@
+SUMMARY = "intel-cmt-cat"
+DESCRIPTION = "Software package which provides basic support for Intel(R) \
+Resource Director Technology (Intel(R) RDT)"
+HOMEPAGE = "https://github.com/intel/intel-cmt-cat"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4b63c65942e1c16fd897f8cd20abebf8"
+SRC_URI = "git://github.com/intel/intel-cmt-cat;protocol=https;branch=master"
+SRCREV = "b26b31b0ae6980c5939a421cefe0316cae884626"
+S = "${WORKDIR}/git"
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+do_install() {
+    oe_runmake install PREFIX=${D}${prefix} NOLDCONFIG=y
+}
+FILES:${PN} += "${nonarch_libdir}/libpqos*"
+FILES:${PN}-doc = "/usr/man*"
+INSANE_SKIP:${PN} += "ldflags"
+INSANE_SKIP:${PN} += "dev-so"
+INSANE_SKIP:${PN} += "libdir"
+INSANE_SKIP:${PN} += "already-stripped"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/recipes-bsp/metee/metee_3.2.4.bb b/recipes-bsp/metee/metee_3.2.4.bb
new file mode 100644
index 00000000..da8220b9
--- /dev/null
+++ b/recipes-bsp/metee/metee_3.2.4.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Intel(R) METEE Library"
+DESCRIPTION = "MEETEE library provides a cross-platform simple \
+ programing interface for accessing Intel HECI interfaces on devices \
+ found in BigCore and Atom based products."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93"
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+inherit cmake
+SRC_URI = "git://github.com/intel/metee.git;branch=master;protocol=https \
+"
+SRCREV = "db45e37e146fd9c06907a15ade55eba06ad1f951"
+S = "${WORKDIR}/git"
diff --git a/recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM b/recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM
deleted file mode 100644
index 476b1fbe..00000000
--- a/recipes-bsp/rmc/boards/MinnowboardTurbot/KBOOTPARAM
+++ /dev/null
@@ -1 +0,0 @@
-console=ttyS0,115200
diff --git a/recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp b/recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp
deleted file mode 100644
index 9aa145f3..00000000
--- a/recipes-bsp/rmc/boards/MinnowboardTurbot/minnowboardturbot.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/NUC5i5RYB/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG
deleted file mode 100644
index ca5f04b9..00000000
--- a/recipes-bsp/rmc/boards/NUC5i5RYB/INSTALLER.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-efi_entry_dir:root:disk:770:/boot/loader/entries/
-boot.conf:root:disk:770:/boot/loader/entries/rmcboot.conf
diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh b/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh
deleted file mode 100644
index 6694261b..00000000
--- a/recipes-bsp/rmc/boards/NUC5i5RYB/POSTINSTALL.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# There is no tty device on this board.
-sed -i '/start_getty.\+ttyS.*/d' /tgt_root/etc/inittab
diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf b/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf
deleted file mode 100644
index b29fa45e..00000000
--- a/recipes-bsp/rmc/boards/NUC5i5RYB/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title NUC5i5RYB boot
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot rootwait
diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf b/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf
deleted file mode 100644
index 0dca3cae..00000000
--- a/recipes-bsp/rmc/boards/NUC5i5RYB/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title NUC5i5RYB install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi rootwait
diff --git a/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp b/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp
deleted file mode 100644
index 57374779..00000000
--- a/recipes-bsp/rmc/boards/NUC5i5RYB/nuc5i5.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/T100-32bit/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp b/recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp
deleted file mode 100644
index 86ecea73..00000000
--- a/recipes-bsp/rmc/boards/T100-32bit/T100-32bit.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/T100-32bit/boot.conf b/recipes-bsp/rmc/boards/T100-32bit/boot.conf
deleted file mode 100644
index f1578e0f..00000000
--- a/recipes-bsp/rmc/boards/T100-32bit/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title T100T(32bit) boot
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot loglevel=8
diff --git a/recipes-bsp/rmc/boards/T100-32bit/install.conf b/recipes-bsp/rmc/boards/T100-32bit/install.conf
deleted file mode 100644
index 67e7eb18..00000000
--- a/recipes-bsp/rmc/boards/T100-32bit/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title T100T(32bit) install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi
diff --git a/recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG
deleted file mode 100644
index ecd20609..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/INSTALLER.CONFIG
+++ /dev/null
@@ -1,3 +0,0 @@
-# Keep rmc Joule boot.conf instead of meta-intel default
-efi_entry_dir:root:disk:770:/boot/loader/entries/
-boot.conf:root:disk:770:/boot/loader/entries/boot.conf
diff --git a/recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM b/recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM
deleted file mode 100644
index 08be5dfb..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/KBOOTPARAM
+++ /dev/null
@@ -1 +0,0 @@
-video=efifb maxcpus=4 reboot=efi kmemleak=off console=tty0 console=ttyS2,115200
diff --git a/recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh b/recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh
deleted file mode 100644
index 30bbd28e..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/POSTINSTALL.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Joule uses only S2 for serial, so remove S0
-sed -i '/start_getty.\+ttyS0/d' /tgt_root/etc/inittab
diff --git a/recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp b/recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp
deleted file mode 100755
index 1a150280..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/bm-1F1.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/broxton-m/bm.fp b/recipes-bsp/rmc/boards/broxton-m/bm.fp
deleted file mode 100755
index 135a7a5d..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/bm.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/broxton-m/boot.conf b/recipes-bsp/rmc/boards/broxton-m/boot.conf
deleted file mode 100644
index caa00c50..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Joule / Broxton-m
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot
diff --git a/recipes-bsp/rmc/boards/broxton-m/install.conf b/recipes-bsp/rmc/boards/broxton-m/install.conf
deleted file mode 100644
index 9cdd86b7..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Joule / Broxton-m Install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi rootwait
diff --git a/recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp b/recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp
deleted file mode 100644
index d757614f..00000000
--- a/recipes-bsp/rmc/boards/broxton-m/joule-1F1.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/minnowmax/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/minnowmax/boot.conf b/recipes-bsp/rmc/boards/minnowmax/boot.conf
deleted file mode 100644
index 6e789cd8..00000000
--- a/recipes-bsp/rmc/boards/minnowmax/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Minnow Max boot
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot console=ttyS0,115200n8
diff --git a/recipes-bsp/rmc/boards/minnowmax/install.conf b/recipes-bsp/rmc/boards/minnowmax/install.conf
deleted file mode 100644
index 1a493aec..00000000
--- a/recipes-bsp/rmc/boards/minnowmax/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Minnow Max install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi console=ttyS0,115200n8
diff --git a/recipes-bsp/rmc/boards/minnowmax/minnowmax.fp b/recipes-bsp/rmc/boards/minnowmax/minnowmax.fp
deleted file mode 100644
index 3c5a286f..00000000
--- a/recipes-bsp/rmc/boards/minnowmax/minnowmax.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/minnowmaxB3/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/boot.conf b/recipes-bsp/rmc/boards/minnowmaxB3/boot.conf
deleted file mode 100644
index 577e5d6a..00000000
--- a/recipes-bsp/rmc/boards/minnowmaxB3/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Minnow Max B3 boot
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot console=ttyS0,115200n8
diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/install.conf b/recipes-bsp/rmc/boards/minnowmaxB3/install.conf
deleted file mode 100644
index cf500d6c..00000000
--- a/recipes-bsp/rmc/boards/minnowmaxB3/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Minnow Max B3 install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi console=ttyS0,115200n8
diff --git a/recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp b/recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp
deleted file mode 100644
index ad3f0d6d..00000000
--- a/recipes-bsp/rmc/boards/minnowmaxB3/minnowmaxB3.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG
deleted file mode 100644
index 8c5a7678..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/INSTALLER.CONFIG
+++ /dev/null
@@ -1,3 +0,0 @@
-# Keep rmc Mohonpeak boot.conf instead of meta-intel default
-efi_entry_dir:root:disk:770:/boot/loader/entries/
-boot.conf:root:disk:770:/boot/loader/entries/boot.conf
diff --git a/recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM b/recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM
deleted file mode 100644
index 169056ee..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/KBOOTPARAM
+++ /dev/null
@@ -1 +0,0 @@
-console=ttyS1,115200 console=tty1 
diff --git a/recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh b/recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh
deleted file mode 100644
index 5f440c38..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/POSTINSTALL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Mohonpeak uses only S1 for serial, so remove S0 and S2
-sed -i '/start_getty.\+ttyS0/d' /tgt_root/etc/inittab
-sed -i '/start_getty.\+ttyS2/d' /tgt_root/etc/inittab
diff --git a/recipes-bsp/rmc/boards/mohonpeak/boot.conf b/recipes-bsp/rmc/boards/mohonpeak/boot.conf
deleted file mode 100644
index 5b7a0f63..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Mohon Peak boot
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot 
diff --git a/recipes-bsp/rmc/boards/mohonpeak/install.conf b/recipes-bsp/rmc/boards/mohonpeak/install.conf
deleted file mode 100644
index dde3497d..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Mohon Peak Install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi rootwait
diff --git a/recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp b/recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp
deleted file mode 100644
index bc4bdae4..00000000
--- a/recipes-bsp/rmc/boards/mohonpeak/mohonpeak.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG b/recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG
deleted file mode 100644
index b2fabe82..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/BOOTENTRY.CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.conf
-install.conf
diff --git a/recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG b/recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG
deleted file mode 100644
index 7d5378b2..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/INSTALLER.CONFIG
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file specifies which file or dir RMC will  install onto target.
-# Note the absolute path is referred from mount points in installation.
-efi_entry_dir:root:disk:770:/boot/loader/entries/
-boot.conf:root:disk:770:/boot/loader/entries/rmcboot.conf
-mylibdir:root:root:770:/tgt_root/etc/mylib/
-mylib.conf:root:root:660:/tgt_root/etc/mylib/mylib.conf
diff --git a/recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM b/recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM
deleted file mode 100644
index 27943b49..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/KBOOTPARAM
+++ /dev/null
@@ -1 +0,0 @@
-i915.preliminary_hw_support=1
diff --git a/recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh b/recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh
deleted file mode 100644
index bec3be42..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/POSTINSTALL.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# NUC Gen 6 specific retouch after RMC deployment
-# The generated inittab from OE build causes error messages:
-# "auth.err getty[615]: tcgetattr: Input/output error"
-# in /var/log/messages because NUC Gen 6 doesn't have any
-# serial tty. We delete line(s) here on target.
-sed -i '/start_getty.\+ttyS.*/d' /tgt_root/etc/inittab
diff --git a/recipes-bsp/rmc/boards/nucgen6/boot.conf b/recipes-bsp/rmc/boards/nucgen6/boot.conf
deleted file mode 100644
index e6ecb029..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title NUC Gen6 boot
-linux /vmlinuz
-initrd /initrd
-options LABEL=boot
diff --git a/recipes-bsp/rmc/boards/nucgen6/install.conf b/recipes-bsp/rmc/boards/nucgen6/install.conf
deleted file mode 100644
index 916bb04b..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title NUC Gen6 install
-linux /vmlinuz
-initrd /initrd
-options LABEL=install-efi
diff --git a/recipes-bsp/rmc/boards/nucgen6/mylib.conf b/recipes-bsp/rmc/boards/nucgen6/mylib.conf
deleted file mode 100644
index fd8357c2..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/mylib.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is a demo conf file read by an imagined program or library
-# which reads this file at runtime to customize its behavior.
-# rmc will deploy it to the location specified in INSTALLER.CONFIG.
-lib.info = "V1.0 for rmc demo"
-lib.board = "NUC gen 6"
-prog.ui.layout = "minimal"
diff --git a/recipes-bsp/rmc/boards/nucgen6/nuc6.fp b/recipes-bsp/rmc/boards/nucgen6/nuc6.fp
deleted file mode 100644
index 834f800b..00000000
--- a/recipes-bsp/rmc/boards/nucgen6/nuc6.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM b/recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM
deleted file mode 100644
index 476b1fbe..00000000
--- a/recipes-bsp/rmc/boards/qemu-2.6/KBOOTPARAM
+++ /dev/null
@@ -1 +0,0 @@
-console=ttyS0,115200
diff --git a/recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp b/recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp
deleted file mode 100644
index e4c41657..00000000
--- a/recipes-bsp/rmc/boards/qemu-2.6/qemu-2.6.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM b/recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM
deleted file mode 100644
index 476b1fbe..00000000
--- a/recipes-bsp/rmc/boards/qemu-2.8/KBOOTPARAM
+++ /dev/null
@@ -1 +0,0 @@
-console=ttyS0,115200
diff --git a/recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp b/recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp
deleted file mode 100644
index 7f28f37c..00000000
--- a/recipes-bsp/rmc/boards/qemu-2.8/qemu-2.8.fp
+++ /dev/null
Binary files differ
diff --git a/recipes-bsp/rmc/rmc-db.bb b/recipes-bsp/rmc/rmc-db.bb
deleted file mode 100644
index 7ec824a8..00000000
--- a/recipes-bsp/rmc/rmc-db.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "Central RMC Database"
-DESCRIPTION = "Generate a centralized RMC database for RMC feature. \
-Fingerprints and data for all boards supported are specified by variable \
-RMC_BOARD_DATA_DIRS which is a list of top directories that contains \
-subdirectories for boards. Developers can add their top directories by appending \
-them to this variable in a rmc-db.bbappend.Refer to rmc-db bbclass for more \
-information."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-S = "${WORKDIR}"
-inherit rmc-db
-RMC_BOARD_DATA_DIRS ?= "${THISDIR}/boards/"
-RMC_DB_DIR = "${WORKDIR}/db"
-FILES_${PN} = "/boot/rmc.db"
-# Let sstate be aware of change in any added board directories
-do_generate_rmc_db[file-checksums] = "${@get_rmc_top_dirs_list(d)}"
-# derived from get_lic_checksum_file_list(d) in base.bbclass in OE
-def get_rmc_top_dirs_list(d):
-    dirlist = []
-    dirs = d.getVar("RMC_BOARD_DATA_DIRS", True) or ''
-    topdirs = dirs.split()
-    for each in topdirs:
-        dirlist.append(each + ":" + str(os.path.exists(each)))
-    return " ".join(dirlist)
-do_generate_rmc_db () {
-        rmc_generate_db "${RMC_BOARD_DATA_DIRS}" "${RMC_DB_DIR}"/rmc.db
-}
-addtask generate_rmc_db  after do_compile
-inherit deploy
-do_deploy () {
-        if [ -f ${RMC_DB_DIR}/rmc.db ]; then
-                install -m 0400 ${RMC_DB_DIR}/rmc.db ${DEPLOYDIR}
-        else
-                rm -f ${DEPLOYDIR}/rmc.db
-                echo "Warning: no RMC central database found, skip deployment."
-        fi
-}
-do_install () {
-        install -d ${D}/boot
-        if [ -f ${RMC_DB_DIR}/rmc.db ]; then
-                install -m 0400 ${RMC_DB_DIR}/rmc.db ${D}/boot/
-        else
-                rm -f ${D}/rmc.db
-                echo "Warning: no RMC central database found, skip installation."
-        fi
-}
-do_install[depends] += "${PN}:do_generate_rmc_db"
-addtask deploy after do_generate_rmc_db
diff --git a/recipes-bsp/rmc/rmc-efi.bb b/recipes-bsp/rmc/rmc-efi.bb
deleted file mode 100644
index 2a1c9a98..00000000
--- a/recipes-bsp/rmc/rmc-efi.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "RMC (Runtime Machine Configuration) EFI library"
-DESCRIPTION = "The RMC EFI library adds RMC support to existing EFI bootloaders"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ade413c694d3aaefc9554b24a8814ee8"
-SRC_URI = "git://git.yoctoproject.org/rmc"
-SRCREV = "027ac76f642dcab1a9f237a00f03a3a714bd04b9"
-S = "${WORKDIR}/git"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux*"
-TARGET_CFLAGS +="-Wl,--hash-style=both"
-EXTRA_OEMAKE = "RMC_INSTALL_PREFIX=${D}/${prefix} \
-                RMC_INSTALL_LIB_PATH=${D}${libdir} \
-                RMC_INSTALL_HEADER_PATH=${D}${includedir}/rmc"
-SECURITY_CFLAGS_remove_class-target = "-fstack-protector-strong"
-SECURITY_CFLAGS_append_class-target = " -fno-stack-protector"
-python () {
-        ccargs = d.getVar('TUNE_CCARGS').split()
-        if '-mx32' in ccargs:
-                ccargs.remove('-mx32')
-                ccargs.append('-m64')
-                d.setVar('TUNE_CCARGS', ' '.join(ccargs))
-}
-do_compile() {
-        oe_runmake -f Makefile.efi
-}
-do_install() {
-        oe_runmake -f Makefile.efi install
-}
diff --git a/recipes-bsp/rmc/rmc.bb b/recipes-bsp/rmc/rmc.bb
deleted file mode 100644
index 8797644b..00000000
--- a/recipes-bsp/rmc/rmc.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "RMC (Runtime Machine Configuration)"
-DESCRIPTION = "RMC project provides a tool and libraries to identify types \
-of hardware boards and access any file-based data specific to the board's \
-type at runtime in a centralized way. Software (clients) can have a generic \
-logic to query board-specific data from RMC without knowing the type of board. \
-This make it possible to have a generic software work running on boards which \
-require any quirks or customizations at a board or product level. \
-"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ade413c694d3aaefc9554b24a8814ee8"
-SRC_URI = "git://git.yoctoproject.org/rmc"
-SRCREV = "027ac76f642dcab1a9f237a00f03a3a714bd04b9"
-S = "${WORKDIR}/git"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux*"
-TARGET_CFLAGS +="-Wl,--hash-style=both"
-EXTRA_OEMAKE = "RMC_INSTALL_PREFIX=${D}/${prefix} \
-                RMC_INSTALL_BIN_PATH=${D}${bindir} \
-                RMC_INSTALL_LIB_PATH=${D}${libdir} \
-                RMC_INSTALL_HEADER_PATH=${D}${includedir}/rmc"
-SECURITY_CFLAGS_remove_class-target = "-fstack-protector-strong"
-SECURITY_CFLAGS_append_class-target = " -fno-stack-protector"
-do_compile_class-target() {
-        oe_runmake
-}
-do_install() {
-        oe_runmake install
-}
-do_install_class-native() {
-        install -d ${D}${STAGING_BINDIR_NATIVE}
-        install -m 0755 ${S}/src/rmc ${D}${STAGING_BINDIR_NATIVE}
-}
-BBCLASSEXTEND = "native"
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch b/recipes-bsp/systemd-boot/systemd-boot/0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch
deleted file mode 100644
index 8d0b6149..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 58669ad764767afea4de53f8a97357773b1855ef Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Tue, 25 Oct 2016 12:54:08 -0700
-Subject: [PATCH] efi/boot.c: workaround for Joule BIOS hang
-This patch should be removed when the BIOS is fixed
-Authored-by: Steve Sakoman <steve@sakoman.com>
-Upstream-Status: Inappropriate [machine specific workaround]
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
- src/boot/efi/boot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
-index 3dcd9a5..3c6ed8c 100644
--- a/src/boot/efi/boot.c
-+++ b/src/boot/efi/boot.c
-@@ -649,7 +649,7 @@ static BOOLEAN menu_run(Config *config, ConfigEntry **chosen_entry, CHAR16 *load
-                         }
- 
-                         /* timeout disabled, wait for next key */
-                        wait = TRUE;
-+                        wait = FALSE;
-                         continue;
-                 }
- 
-- 
-2.7.4
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch b/recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch
deleted file mode 100644
index 6d7b144d..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From beb095f41d458b7d684c0cd6cac1749e2fc3f29b Mon Sep 17 00:00:00 2001
-From: California Sullivan <california.l.sullivan@intel.com>
-Date: Wed, 21 Mar 2018 13:01:26 -0700
-Subject: [PATCH 1/5] partially revert "sd-boot: stub: Obtain PE section
- offsets from RAM, not disk (#6250)"
-Only revert the section for finding the root_dir, as RMC needs this to
-find its database file.
-Upstream-Status: Inappropriate [upstream doesn't need the root_dir].
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- src/boot/efi/stub.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
-index ff45cebd4..540ca5985 100644
--- a/src/boot/efi/stub.c
-+++ b/src/boot/efi/stub.c
-@@ -30,6 +30,8 @@ static const EFI_GUID global_guid = EFI_GLOBAL_VARIABLE;
- 
- EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-         EFI_LOADED_IMAGE *loaded_image;
-+        EFI_FILE *root_dir;
-+        CHAR16 *loaded_image_path;
-         CHAR8 *b;
-         UINTN size;
-         BOOLEAN secure = FALSE;
-@@ -58,6 +60,13 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-                 return err;
-         }
- 
-+        root_dir = LibOpenRoot(loaded_image->DeviceHandle);
-+        if (!root_dir) {
-+                Print(L"Unable to open root directory: %r ", err);
-+                uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
-+                return EFI_LOAD_ERROR;
-+        }
-+
-         if (efivar_get_raw(&global_guid, L"SecureBoot", &b, &size) == EFI_SUCCESS) {
-                 if (*b > 0)
-                         secure = TRUE;
-- 
-2.14.3
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch b/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch
deleted file mode 100644
index a3e496f5..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From af977853ab722194c4754e6693f430f50a42190f Mon Sep 17 00:00:00 2001
-From: California Sullivan <california.l.sullivan@intel.com>
-Date: Tue, 20 Mar 2018 10:08:14 -0700
-Subject: [PATCH 2/5] sd-boot: fix RMC compatibility with systemd-boot and
- meson
-With autotools swapped out for meson a number of things need to be
-changed.
-Upstream-Status: Pending
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- meson_options.txt        | 2 ++
- src/boot/efi/meson.build | 4 +++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-diff --git a/meson_options.txt b/meson_options.txt
-index 39822d6cd..d8a480401 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -279,6 +279,8 @@ option('efi-ldsdir', type : 'string',
-        description : 'path to the EFI lds directory')
- option('efi-includedir', type : 'string', value : '/usr/include/efi',
-        description : 'path to the EFI header directory')
-+option('rmc-includedir', type : 'string', value : '/usr/include/rmc',
-+       description : 'path to the RMC header directory')
- option('tpm-pcrindex', type : 'string', value : '8',
-        description : 'TPM PCR register number to use')
- 
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
-index 9f9ec4911..266ff928f 100644
--- a/src/boot/efi/meson.build
-+++ b/src/boot/efi/meson.build
-@@ -83,6 +83,7 @@ if have_gnu_efi
-         efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-         efi_conf.set10('ENABLE_TPM', get_option('tpm'))
-         efi_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex'))
-+        efi_conf.set('RMC_EFI', 'true')
- 
-         efi_config_h = configure_file(
-                 output : 'efi_config.h',
-@@ -121,6 +122,7 @@ if have_gnu_efi
-                         '-Wsign-compare',
-                         '-Wno-missing-field-initializers',
-                         '-isystem', efi_incdir,
-+                        '-isystem', get_option('rmc-includedir'),
-                         '-isystem', join_paths(efi_incdir, gnu_efi_arch),
-                         '-include', efi_config_h]
-         if efi_arch == 'x86_64'
-@@ -191,7 +193,7 @@ if have_gnu_efi
-                         output : tuple[0],
-                         command : efi_ld.split() + ['-o', '@OUTPUT@'] +
-                                   efi_ldflags + tuple[2] +
-                                  ['-lefi', '-lgnuefi', libgcc_file_name])
-+                                  ['-lefi', '-lgnuefi', '-lrmcefi', libgcc_file_name])
- 
-                 test('no-undefined-symbols-' + tuple[0],
-                      no_undefined_symbols,
-- 
-2.14.3
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch b/recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch
deleted file mode 100644
index cef934ce..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From b780c67c780bae2f834d73017044680fabca4268 Mon Sep 17 00:00:00 2001
-From: Jianxun Zhang <jianxun.zhang@linux.intel.com>
-Date: Wed, 1 Jun 2016 16:32:22 -0700
-Subject: [PATCH 3/5] sd-boot: Load board-specific boot entries from RMC
- database
-RMC provides a centralized database file on ESP. The DB contains
-fingerprints and any file blobs associated to physical boards.
-Callers can fetch board-specific data with fingerprint info
-collected from board at runtime if there is any record matched
-board's fingerprint.
-To let bootloader know which file blob in RMC should be queried,
-a special config file BOOTENTRY.CONFIG is defined as:
-boot.conf
-install.conf
-Bootloader calls RMC APIs and other functions to perform these
-tasks before it shows boot menu to user:
-(1) Load RMC database file from ESP
-(2) Collect fingerprint data from board
-(3) Query BOOTENTRY.CONFIG from RMC DB with fingerprint
-(4) Parse BOOTENTRY.CONFIG to know names of boot entry files
-(5) Query boot entry files one by one from RMC DB, and add
-    them into sd-boot config data.
-The final effect is that bootloader will show board-specific
-boot entries in boot menu to user. User then can choose one
-of them to boot system with the selected configuration.
-If any of these steps fails, bootloader simply skips loading
-RMC configs or any entry file not successfully fetched from
-RMC DB. Once any entry is loaded successfully from RMC DB,
-bootloader skips loading any boot entries from ESP.
-Upstream-Status: Pending
-Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- src/boot/efi/boot.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 146 insertions(+), 2 deletions(-)
-diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
-index b9c7c8394..93cfaf193 100644
--- a/src/boot/efi/boot.c
-+++ b/src/boot/efi/boot.c
-@@ -16,6 +16,7 @@
- 
- #include <efi.h>
- #include <efilib.h>
-+#include <rmc_api.h>
- 
- #include "console.h"
- #include "disk.h"
-@@ -35,6 +36,9 @@ static const char __attribute__((used)) magic[] = "#### LoaderInfo: systemd-boot
- 
- static const EFI_GUID global_guid = EFI_GLOBAL_VARIABLE;
- 
-+static CHAR8* rmc_db;
-+static rmc_fingerprint_t *rmc_fp;
-+
- enum loader_type {
-         LOADER_UNDEFINED,
-         LOADER_EFI,
-@@ -1684,6 +1688,136 @@ static VOID config_free(Config *config) {
-         FreePool(config->entry_oneshot);
- }
- 
-+/* Derived from line_get_key_value(), we could consolidate two functions later */
-+static CHAR8 *get_line(CHAR8 *content, UINT64 *pos) {
-+        CHAR8 *line;
-+        UINT64 linelen;
-+
-+skip:
-+        line = content + *pos;
-+        if (*line == '\0')
-+                return NULL;
-+
-+        linelen = 0;
-+        while (line[linelen] && !strchra((CHAR8 *)"\n\r", line[linelen]))
-+               linelen++;
-+
-+        /* move pos to next line */
-+        *pos += linelen;
-+        if (content[*pos])
-+                (*pos)++;
-+
-+        /* empty line */
-+        if (linelen == 0)
-+                goto skip;
-+
-+        /* terminate line */
-+        line[linelen] = '\0';
-+
-+        /* remove leading whitespace */
-+        while (strchra((CHAR8 *)" \t", *line)) {
-+                line++;
-+                linelen--;
-+        }
-+
-+        /* remove trailing whitespace */
-+        while (linelen > 0 && strchra((CHAR8 *)" \t", line[linelen-1]))
-+                linelen--;
-+        line[linelen] = '\0';
-+
-+        if (*line == '#')
-+                goto skip;
-+
-+        return line;
-+}
-+
-+/* load rmc database file from ESP and try to get fingerprint. These
-+ * are essential information indicating we could query rmc data for
-+ * this board at least
-+ * return 0 if both database file and fingerprint can be obtained, otherwise
-+ * non-zero value is returned.
-+ *
-+ * Note: db and fp hold valid values only when this function returns 0.
-+ * Caller is responsible to free allocated memory pointed by *db and *fp when
-+ * this function returns 0.
-+ */
-+
-+static UINTN rmc_initialize(EFI_FILE *root_dir, EFI_SYSTEM_TABLE *sys_table, CHAR8 **db, rmc_fingerprint_t **fp) {
-+        UINTN len;
-+        UINTN ret = 1;
-+
-+        if (!db || !fp)
-+                return ret;
-+
-+        *db = NULL;
-+        *fp = NULL;
-+
-+        /* load rmc database */
-+        len = file_read(root_dir, L"\\rmc.db", 0, 0, db);
-+
-+        if (len <= 0)
-+                goto done;
-+
-+        *fp = AllocateZeroPool(sizeof(rmc_fingerprint_t));
-+        /* call rmc to get fingerprint. We will use single-action rmc APIs to query multiple files.
-+         * This should bring a better performance than calling double-action rmc API every time.
-+         */
-+        if (rmc_get_fingerprint(sys_table, *fp))
-+                goto done;
-+
-+        ret = 0;
-+done:
-+        if (ret) {
-+                FreePool(*db);
-+                FreePool(*fp);
-+        }
-+
-+        return ret;
-+}
-+
-+/* load RMC entries
-+ * return TRUE when at least one entry is loaded, otherwise, return FALSE
-+ */
-+static BOOLEAN config_load_rmc_entries(Config *config, EFI_HANDLE *device, CHAR16 *loaded_image_path, CHAR8 *db, rmc_fingerprint_t *fp) {
-+        CHAR8 *boot_entry = NULL;
-+        CHAR8 *boot_config = NULL;
-+        rmc_file_t rp;
-+        CHAR8 *line;
-+        UINT64 pos = 0;
-+        BOOLEAN ret = FALSE;
-+
-+        if (!db || !fp)
-+                return ret;
-+
-+        /* query boot entry config file */
-+        if (rmc_query_file_by_fp(fp, db, "BOOTENTRY.CONFIG", &rp))
-+                return ret;
-+
-+        /* file blob read from rmc db is not necessarily null-terminated, and we
-+         * should keep mem where rmc db lives from change during parsing
-+         */
-+        boot_config = AllocatePool(rp.blob_len * sizeof(CHAR8) + 1);
-+        CopyMem(boot_config, rp.blob, rp.blob_len);
-+        boot_config[rp.blob_len] = '\0';
-+        /* parse boot entry config */
-+        while ((line = get_line(boot_config, &pos))) {
-+                if (rmc_query_file_by_fp(fp, db, (char *)line, &rp))
-+                        continue;
-+                if (rp.blob_len > 0) {
-+                        boot_entry = AllocatePool(rp.blob_len * sizeof(CHAR8) + 1);
-+                        CopyMem(boot_entry, rp.blob, rp.blob_len);
-+                        boot_entry[rp.blob_len] = '\0';
-+                        config_entry_add_from_file(config, device,
-+                                        stra_to_str(line), boot_entry,
-+                                        loaded_image_path);
-+                        /* tell caller success when a RMC entry is loaded */
-+                        ret = TRUE;
-+                }
-+        }
-+
-+        return ret;
-+}
-+
- EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-         CHAR16 *s;
-         CHAR8 *b;
-@@ -1696,6 +1830,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-         UINT64 init_usec;
-         BOOLEAN menu = FALSE;
-         CHAR16 uuid[37];
-+        BOOLEAN rmc_entry = FALSE;
- 
-         InitializeLib(image, sys_table);
-         init_usec = time_usec();
-@@ -1736,6 +1871,9 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-                 }
-         }
- 
-+        /* Initialize rmc before loading any config */
-+        rmc_initialize(root_dir, sys_table, &rmc_db, &rmc_fp);
-+
-         /* the filesystem path to this image, to prevent adding ourselves to the menu */
-         loaded_image_path = DevicePathToStr(loaded_image->FilePath);
-         efivar_set(L"LoaderImageIdentifier", loaded_image_path, FALSE);
-@@ -1743,11 +1881,15 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-         ZeroMem(&config, sizeof(Config));
-         config_load_defaults(&config, root_dir);
- 
-+        if (rmc_db && rmc_fp)
-+                rmc_entry = config_load_rmc_entries(&config, loaded_image->DeviceHandle, loaded_image_path, rmc_db, rmc_fp);
-+
-         /* scan /EFI/Linux/ directory */
-         config_entry_add_linux(&config, loaded_image, root_dir);
- 
-        /* scan /loader/entries/\*.conf files */
-        config_load_entries(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path);
-+        /* scan /loader/entries/\*.conf files only when no RMC entry is loaded */
-+        if (rmc_entry == FALSE)
-+                config_load_entries(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path);
- 
-         /* sort entries after version number */
-         config_sort_entries(&config);
-@@ -1841,6 +1983,8 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
- out:
-         FreePool(loaded_image_path);
-         config_free(&config);
-+        FreePool(rmc_db);
-+        FreePool(rmc_fp);
-         uefi_call_wrapper(root_dir->Close, 1, root_dir);
-         uefi_call_wrapper(BS->CloseProtocol, 4, image, &LoadedImageProtocol, image, NULL);
-         return err;
-- 
-2.14.3
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch b/recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch
deleted file mode 100644
index b4dd9c42..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/0004-sd-boot-Support-global-kernel-command-line-fragment.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 159c8c54f92fb44d8abd2919fa83ad1cb640fac3 Mon Sep 17 00:00:00 2001
-From: Jianxun Zhang <jianxun.zhang@linux.intel.com>
-Date: Mon, 20 Jun 2016 13:08:20 -0700
-Subject: [PATCH 4/5] sd-boot: Support global kernel command line fragment
-Query file blob KBOOTPARAM from RMC. If it exists, we append
-it to the new linux boot entry's cmdline. A boot entry could
-be read from a .conf file on ESP, RMC database, or embedded
-linux image. content in KBOOTPARAM is effective in all of
-these cases.
-Upstream-Status: Pending
-Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- src/boot/efi/boot.c | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
-index 93cfaf193..2f400db3c 100644
--- a/src/boot/efi/boot.c
-+++ b/src/boot/efi/boot.c
-@@ -851,6 +851,40 @@ static VOID config_add_entry(Config *config, ConfigEntry *entry) {
-                         config->entries = ReallocatePool(config->entries,
-                                                          sizeof(VOID *) * config->entry_count, sizeof(VOID *) * i);
-         }
-+
-+        /* rmc: a linux entry could be added from .conf file or an embedded linux image
-+         * we put appending global command line here to cover both of two cases.
-+         */
-+        if (entry->type == LOADER_LINUX && rmc_db && rmc_fp) {
-+                rmc_file_t rmc_kp;
-+
-+                if (!rmc_query_file_by_fp(rmc_fp, rmc_db, "KBOOTPARAM", &rmc_kp)) {
-+                        CHAR8 *cmdline;
-+                        CHAR16 *s;
-+                        CHAR16 *t;
-+                        CHAR16 *p;
-+
-+                        cmdline = AllocatePool(rmc_kp.blob_len * sizeof(CHAR8) + 1);
-+                        CopyMem(cmdline, rmc_kp.blob, rmc_kp.blob_len);
-+                        cmdline[rmc_kp.blob_len] = '\0';
-+                        p = stra_to_str(cmdline);
-+                        t = p;
-+
-+                        while (*t) {
-+                                if (*t == '\n')
-+                                        *t = '\0';
-+                                t++;
-+                        }
-+
-+                        s = PoolPrint(L"%s %s", entry->options, p);
-+                        FreePool(entry->options);
-+                        FreePool(p);
-+                        FreePool(cmdline);
-+
-+                        entry->options = s;
-+                }
-+        }
-+
-         config->entries[config->entry_count++] = entry;
- }
- 
-- 
-2.14.3
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch b/recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch
deleted file mode 100644
index 60e93ca8..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 405a77233dde990fa7815d1546dc5a6b5a608479 Mon Sep 17 00:00:00 2001
-From: Mikko Ylinen <mikko.ylinen@intel.com>
-Date: Fri, 27 Jan 2017 13:31:45 +0200
-Subject: [PATCH 5/5] sd-boot: support global kernel command line in EFI stub
-This change integrates rmc into EFI stub and supports a
-global fragment (RMC KBOOTPARAM) that is appended to the
-cmdline at boot.
-The fragment is board-specific and read from the database.
-Implements [YOCTO #10924].
-Upstream-status: Pending
-Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- src/boot/efi/stub.c | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
-index 540ca5985..11047477b 100644
--- a/src/boot/efi/stub.c
-+++ b/src/boot/efi/stub.c
-@@ -14,6 +14,7 @@
- 
- #include <efi.h>
- #include <efilib.h>
-+#include <rmc_api.h>
- 
- #include "disk.h"
- #include "graphics.h"
-@@ -49,6 +50,9 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
-         UINTN cmdline_len;
-         CHAR16 uuid[37];
-         EFI_STATUS err;
-+        INTN len;
-+        CHAR8 *rmc_db = NULL;
-+        rmc_file_t rmc_file;
- 
-         InitializeLib(image, sys_table);
- 
-@@ -109,6 +113,35 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
- #endif
-         }
- 
-+        len = file_read(root_dir, L"\\rmc.db", 0, 0, &rmc_db);
-+        if (len <= 0)
-+                rmc_db = NULL;
-+
-+        /* If the board has a fragment in rmc database, append it to the cmdline */
-+        if (rmc_db && !rmc_gimme_file(sys_table, rmc_db, "KBOOTPARAM", &rmc_file)) {
-+                CHAR8 *line;
-+                UINTN i = 0;
-+                UINTN j;
-+
-+                line = AllocatePool(rmc_file.blob_len + cmdline_len + 2);
-+
-+                while (i < cmdline_len && cmdline[i] != '\0') {
-+                        line[i] = cmdline[i];
-+                        i++;
-+                }
-+
-+                line[i++] = ' ';
-+
-+                for (j=0; j < rmc_file.blob_len; j++)
-+                        line[i+j] = rmc_file.blob[j];
-+                line[i+j] = '\0';
-+
-+                cmdline = line;
-+                cmdline_len = i + j;
-+
-+                FreePool(rmc_db);
-+        }
-+
-         /* export the device path this image is started from */
-         if (disk_get_part_uuid(loaded_image->DeviceHandle, uuid) == EFI_SUCCESS)
-                 efivar_set(L"LoaderDevicePartUUID", uuid, FALSE);
-- 
-2.14.3
diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
deleted file mode 100644
index bbe3aea2..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-# This patchset contains hooks that allows systemd-boot to use RMC capablilities.
-python __anonymous () {
-    import re
-    target = d.getVar('TARGET_ARCH')
-    prefix = "" if d.getVar('EFI_PROVIDER') == "rmc-boot" else "systemd-"
-    if target == "x86_64":
-        systemdimage = prefix + "bootx64.efi"
-    else:
-        systemdimage = prefix + "bootia32.efi"
-    d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage)
-    prefix = "systemd-" if prefix == "" else ""
-    d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix)
-}
-DEPENDS_append_intel-x86-common = " rmc rmc-efi"
-RDEPENDS_${PN}_append_intel-x86-common = " rmc-db"
-EXTRA_OEMESON_append_intel-x86-common = ' \
-                  -Drmc-includedir="${STAGING_INCDIR}/rmc" \
-                  '
-SRC_URI_append_intel-x86-common = " \
-            file://0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch \
-            file://0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch \
-            file://0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \
-            file://0004-sd-boot-Support-global-kernel-command-line-fragment.patch \
-            file://0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch \
-            "
-RPROVIDES_${PN} += "rmc-boot"
diff --git a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
deleted file mode 100644
index 46dd8a44..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/systemd-boot:"
-SRC_URI_append_intel-x86-common = " \
-            file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
-            "
-PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
-do_compile_append_intel-x86-common() {
-        ninja src/boot/efi/linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
-}
-do_deploy_append_intel-x86-common() {
-        install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR}
-}
-# includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER
-include systemd-boot/${EFI_PROVIDER}.inc
diff --git a/recipes-bsp/thermald/files/0001-Include-poll.h-instead-of-sys-poll.h.patch b/recipes-bsp/thermald/files/0001-Include-poll.h-instead-of-sys-poll.h.patch
deleted file mode 100644
index 16d2ff10..00000000
--- a/recipes-bsp/thermald/files/0001-Include-poll.h-instead-of-sys-poll.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b3de44c28cd930d68c17638575d46e590679f9fe Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 18 Jan 2018 10:10:40 +0800
-Subject: [PATCH] Include poll.h instead of sys/poll.h
-POSIX specifies poll.h to be the correct header name [1]. Also fixes
-a warning when built with musl.
- | <sysroot>/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Werror=cpp]
- | #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
-[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/poll.h.html
-Upstream-Status: Submitted [https://github.com/intel/thermal_daemon/pull/147]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- src/thd_kobj_uevent.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/thd_kobj_uevent.h b/src/thd_kobj_uevent.h
-index d30ea5c..aa8e33f 100644
--- a/src/thd_kobj_uevent.h
-+++ b/src/thd_kobj_uevent.h
-@@ -28,7 +28,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
-#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <unistd.h>
-- 
-2.7.4
diff --git a/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch b/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch
deleted file mode 100644
index 893b343a..00000000
--- a/recipes-bsp/thermald/files/0002-Use-correct-format-specifier-for-X32.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From fa6cfd59e52be6a45a067cc770adc62437295085 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 18 Jan 2018 14:29:09 +0800
-Subject: [PATCH 2/2] Use correct format specifier for X32
-time_t in x32 is of long long type. Using %ld specifier leads
-to errors like:
-| ../git/src/thd_model.cpp: In member function 'unsigned int cthd_model::update_set_point(unsigned int)':
-| ../git/src/thermald.h:74:68: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t {aka long long int}' [-Werror=format=]
-|  #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__)
-|                                                                     ^
-| ../git/src/thd_model.cpp:112:3: note: in expansion of macro 'thd_log_info'
-|    thd_log_info("update_pid %ld %ld %d %g %d\n", now, last_time, error,
-|    ^~~~~~~~~~~~
-Use the correct format specifier based on the address model.
-Upstream-Status: Submitted [https://github.com/intel/thermal_daemon/pull/147]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- src/thd_model.cpp      | 14 ++++++++++++++
- src/thd_trip_point.cpp |  6 ++++++
- 2 files changed, 20 insertions(+)
-diff --git a/src/thd_model.cpp b/src/thd_model.cpp
-index 5f1d0d7..46b95dc 100644
--- a/src/thd_model.cpp
-+++ b/src/thd_model.cpp
-@@ -109,8 +109,14 @@ unsigned int cthd_model::update_set_point(unsigned int curr_temp) {
-                /*Compute PID Output*/
-                output = kp * error + ki * err_sum + kd * d_err;
-                _setpoint = max_temp - (unsigned int) output;
-+
-+#if defined __x86_64__ && defined __ILP32__
-+               thd_log_info("update_pid %lld %lld %d %g %d\n", now, last_time, error,
-+                               output, _setpoint);
-+#else
-                thd_log_info("update_pid %ld %ld %d %g %d\n", now, last_time, error,
-                                output, _setpoint);
-+#endif
-                if ((_setpoint < 0) || (abs(set_point - _setpoint) > max_compensation))
-                        set_point -= max_compensation;
-                else
-@@ -134,10 +140,18 @@ void cthd_model::add_sample(int temperature) {
-        updated_set_point = false;
-        if (trend_increase_start == 0 && temperature > hot_zone) {
-                trend_increase_start = tm;
-+#if defined __x86_64__ && defined __ILP32__
-+               thd_log_debug("Trend increase start %lld\n", trend_increase_start);
-+#else
-                thd_log_debug("Trend increase start %ld\n", trend_increase_start);
-+#endif
-        } else if (trend_increase_start && temperature < hot_zone) {
-                int _set_point;
-+#if defined __x86_64__ && defined __ILP32__
-+               thd_log_debug("Trend increase stopped %lld\n", trend_increase_start);
-+#else
-                thd_log_debug("Trend increase stopped %ld\n", trend_increase_start);
-+#endif
-                trend_increase_start = 0;
-                _set_point = read_set_point(); // Restore set point to a calculated max
-                if (_set_point > set_point) {
-diff --git a/src/thd_trip_point.cpp b/src/thd_trip_point.cpp
-index dd1b881..170adcf 100644
--- a/src/thd_trip_point.cpp
-+++ b/src/thd_trip_point.cpp
-@@ -132,9 +132,15 @@ bool cthd_trip_point::thd_trip_point_check(int id, unsigned int read_temp,
-                                time_t tm;
-                                time(&tm);
-                                if ((tm - cdevs[i].last_op_time) < cdevs[i].sampling_priod) {
-+#if defined __x86_64__ && defined __ILP32__
-+                                       thd_log_info("Too early to act index %d tm %lld\n",
-+                                                       cdev->thd_cdev_get_index(),
-+                                                       tm - cdevs[i].last_op_time);
-+#else
-                                        thd_log_info("Too early to act index %d tm %ld\n",
-                                                        cdev->thd_cdev_get_index(),
-                                                        tm - cdevs[i].last_op_time);
-+#endif
-                                        break;
-                                }
-                                cdevs[i].last_op_time = tm;
-- 
-2.7.4
diff --git a/recipes-core/images/core-image-minimal-initramfs.bbappend b/recipes-core/images/core-image-minimal-initramfs.bbappend
index b3d5836a..90ac28fd 100644
--- a/recipes-core/images/core-image-minimal-initramfs.bbappend
+++ b/recipes-core/images/core-image-minimal-initramfs.bbappend
@@ -1,6 +1,2 @@
-# Use initramfs-framework instead of initramfs-live*
-PACKAGE_INSTALL_remove_intel-x86-common = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi"
-PACKAGE_INSTALL_append_intel-x86-common = " initramfs-framework-base initramfs-module-udev initramfs-module-setup-live initramfs-module-install initramfs-module-install-efi"
 # Add i915 graphics firmware
-PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915"
+PACKAGE_INSTALL:append:intel-x86-common = " linux-firmware-i915"
diff --git a/recipes-core/images/core-image-tiny.bb b/recipes-core/images/core-image-tiny.bb
index 6b09b0c2..f521f668 100644
--- a/recipes-core/images/core-image-tiny.bb
+++ b/recipes-core/images/core-image-tiny.bb
@@ -32,5 +32,5 @@ python() {
        d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i)
 }
-WKS_FILE_intel-corei7-64 = "core-image-tiny.wks.in"
+WKS_FILE:intel-corei7-64 = "core-image-tiny.wks.in"
-WKS_FILE_intel-core2-32 = "core-image-tiny.wks.in"
+WKS_FILE:intel-core2-32 = "core-image-tiny.wks.in"
diff --git a/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh b/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh
deleted file mode 100644
index a7a2ad4c..00000000
--- a/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh
+++ /dev/null
@@ -1,342 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (c) 2016, Intel Corporation.
-# All rights reserved.
-#
-# install.sh [device_name] [rootfs_name]
-#
-# This file is a copy of file with same name in OE:
-# meta/recipes-core/initrdscripts/files/. We modify
-# it for RMC feature to deploy file blobs from RMC
-# database file to target.
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-# We need 20 Mb for the boot partition
-boot_size=20
-# 5% for swap
-swap_ratio=5
-# Get a list of hard drives
-hdnamelist=""
-live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'`
-live_dev_name=${live_dev_name#\/dev/}
-# Only strip the digit identifier if the device is not an mmc
-case $live_dev_name in
-    mmcblk*)
-    ;;
-    nvme*)
-    ;;
-    *)
-        live_dev_name=${live_dev_name%%[0-9]*}
-    ;;
-esac
-echo "Searching for hard drives ..."
-for device in `ls /sys/block/`; do
-    case $device in
-        loop*)
-            # skip loop device
-            ;;
-        sr*)
-            # skip CDROM device
-            ;;
-        ram*)
-            # skip ram device
-            ;;
-        *)
-            # skip the device LiveOS is on
-            # Add valid hard drive name to the list
-            case $device in
-                $live_dev_name*)
-                # skip the device we are running from
-                ;;
-                *)
-                    hdnamelist="$hdnamelist $device"
-                ;;
-            esac
-            ;;
-    esac
-done
-if [ -z "${hdnamelist}" ]; then
-    echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted."
-    exit 1
-fi
-TARGET_DEVICE_NAME=""
-for hdname in $hdnamelist; do
-    # Display found hard drives and their basic info
-    echo "-------------------------------"
-    echo /dev/$hdname
-    if [ -r /sys/block/$hdname/device/vendor ]; then
-        echo -n "VENDOR="
-        cat /sys/block/$hdname/device/vendor
-    fi
-    if [ -r /sys/block/$hdname/device/model ]; then
-        echo -n "MODEL="
-        cat /sys/block/$hdname/device/model
-    fi
-    if [ -r /sys/block/$hdname/device/uevent ]; then
-        echo -n "UEVENT="
-        cat /sys/block/$hdname/device/uevent
-    fi
-    echo
-done
-# Get user choice
-while true; do
-    echo "Please select an install target or press n to exit ($hdnamelist ): "
-    read answer
-    if [ "$answer" = "n" ]; then
-        echo "Installation manually aborted."
-        exit 1
-    fi
-    for hdname in $hdnamelist; do
-        if [ "$answer" = "$hdname" ]; then
-            TARGET_DEVICE_NAME=$answer
-            break
-        fi
-    done
-    if [ -n "$TARGET_DEVICE_NAME" ]; then
-        break
-    fi
-done
-if [ -n "$TARGET_DEVICE_NAME" ]; then
-    echo "Installing image on /dev/$TARGET_DEVICE_NAME ..."
-else
-    echo "No hard drive selected. Installation aborted."
-    exit 1
-fi
-device=/dev/$TARGET_DEVICE_NAME
-#
-# The udev automounter can cause pain here, kill it
-#
-rm -f /etc/udev/rules.d/automount.rules
-rm -f /etc/udev/scripts/mount*
-#
-# Unmount anything the automounter had mounted
-#
-umount ${device}* 2> /dev/null || /bin/true
-mkdir -p /tmp
-# Create /etc/mtab if not present
-if [ ! -e /etc/mtab ]; then
-    cat /proc/mounts > /etc/mtab
-fi
-disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
-swap_size=$((disk_size*swap_ratio/100))
-rootfs_size=$((disk_size-boot_size-swap_size))
-rootfs_start=$((boot_size))
-rootfs_end=$((rootfs_start+rootfs_size))
-swap_start=$((rootfs_end))
-# MMC devices are special in a couple of ways
-# 1) they use a partition prefix character 'p'
-# 2) they are detected asynchronously (need rootwait)
-rootwait=""
-part_prefix=""
-if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
-[ ! "${device#/dev/nvme}" = "${device}" ]; then
-    part_prefix="p"
-    rootwait="rootwait"
-fi
-bootfs=${device}${part_prefix}1
-rootfs=${device}${part_prefix}2
-swap=${device}${part_prefix}3
-echo "*****************"
-echo "Boot partition size:   $boot_size MB ($bootfs)"
-echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
-echo "Swap partition size:   $swap_size MB ($swap)"
-echo "*****************"
-echo "Deleting partition table on ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=35
-echo "Creating new partition table on ${device} ..."
-parted ${device} mklabel gpt
-echo "Creating boot partition on $bootfs"
-parted ${device} mkpart boot fat32 0% $boot_size
-parted ${device} set 1 boot on
-echo "Creating rootfs partition on $rootfs"
-parted ${device} mkpart root ext3 $rootfs_start $rootfs_end
-echo "Creating swap partition on $swap"
-parted ${device} mkpart swap linux-swap $swap_start 100%
-parted ${device} print
-echo "Formatting $bootfs to vfat..."
-mkfs.vfat $bootfs
-echo "Formatting $rootfs to ext3..."
-mkfs.ext3 $rootfs
-echo "Formatting swap partition...($swap)"
-mkswap $swap
-mkdir /tgt_root
-mkdir /src_root
-mkdir -p /boot
-# Handling of the target root partition
-mount $rootfs /tgt_root
-mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
-echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
-if [ -d /tgt_root/etc/ ] ; then
-    boot_uuid=$(blkid -o value -s UUID ${bootfs})
-    swap_part_uuid=$(blkid -o value -s PARTUUID ${swap})
-    echo "/dev/disk/by-partuuid/$swap_part_uuid                swap             swap       defaults              0  0" >> /tgt_root/etc/fstab
-    echo "UUID=$boot_uuid              /boot            vfat       defaults              1  2" >> /tgt_root/etc/fstab
-    # We dont want udev to mount our root device while we're booting...
-    if [ -d /tgt_root/etc/udev/ ] ; then
-        echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
-    fi
-fi
-# Handling of the target boot partition
-mount $bootfs /boot
-echo "Preparing boot partition..."
-EFIDIR="/boot/EFI/BOOT"
-mkdir -p $EFIDIR
-# Copy the efi loader
-cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
-# RMC deployment
-RMC_CMD=/src_root/usr/bin/rmc
-RMC_DB=/run/media/$1/rmc.db
-# We don't want to quit when a step failed. For example,
-# a file system could not support some operations.
-set +e
-if [ -f "${RMC_DB}" ] && [ -f "${RMC_CMD}" ]; then
-    echo "Found RMC database and tool, start RMC deployment"
-    # query INSTALLER.CONFIG from RMC DB
-    if ${RMC_CMD} -B INSTALLER.CONFIG -d "${RMC_DB}" -o /tmp/installer.config; then
-        while IFS=':' read -r NAME TGT_UID TGT_GID TGT_MODE TGT_PATH; do
-            # skip comment
-            # The regexp in grep works with busybox grep which doesn't
-            # seem to have a -P to recognize '\t'. But this expression could not
-            # work with gnu grep...
-            if echo "$NAME"|grep -q $'^[ \t]*#'; then
-                continue
-            fi
-            # check if we should create a directory (last char in target path is '/')
-            # or deploy a file
-            LAST_CHAR=$(echo "${TGT_PATH:$((${#TGT_PATH}-1)):1}")
-            # Do not bail out for failures but user should get stderr message
-            if [ ${LAST_CHAR} = "/" ]; then
-                # name field is skipped for directory
-                echo "DIR:  ${TGT_UID}:${TGT_GID}:${TGT_MODE} => ${TGT_PATH}"
-                mkdir -p "$TGT_PATH"
-                chown "${TGT_UID}:${TGT_GID}" "$TGT_PATH"
-                chmod "${TGT_MODE}" "$TGT_PATH"
-            else
-                ${RMC_CMD} -B "${NAME}" -d "${RMC_DB}" -o "${TGT_PATH}"
-                echo "FILE: ${NAME}:${TGT_UID}:${TGT_GID}:${TGT_MODE} => ${TGT_PATH}"
-                chown "${TGT_UID}:${TGT_GID}" "$TGT_PATH"
-                chmod "${TGT_MODE}" "$TGT_PATH"
-            fi
-        done < /tmp/installer.config
-        rm -rf /tmp/installer.config
-        # remove rmc from target since we don't think it is a valid
-        # case to run rmc after installation.
-        rm -rf /tgt_root/usr/bin/rmc
-        echo "RMC deployment finished"
-    else
-        echo "INSTALLER.CONFIG is not found, skip RMC deployment"
-    fi
-    # Final retouching by calling post-install hook
-    if ${RMC_CMD} -B POSTINSTALL.sh -d "${RMC_DB}" -o /tmp/POSTINSTALL.sh; then
-        echo "Found POSTINSTALL.sh execute it..."
-        chmod 500 /tmp/POSTINSTALL.sh
-        /tmp/POSTINSTALL.sh
-        rm -rf /tmp/POSTINSTALL.sh
-    fi
-fi
-set -e
-if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
-    root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
-    GRUBCFG="$EFIDIR/grub.cfg"
-    cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
-    # Update grub config for the installed image
-    # Delete the install entry
-    sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
-    # Delete the initrd lines
-    sed -i "/initrd /d" $GRUBCFG
-    # Delete any LABEL= strings
-    sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
-    # Delete any root= strings
-    sed -i "s/ root=[^ ]*/ /g" $GRUBCFG
-    # Add the root= and other standard boot options
-    sed -i "s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @" $GRUBCFG
-fi
-if [ -d /run/media/$1/loader ]; then
-    rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
-    GUMMIBOOT_CFGS="/boot/loader/entries/*.conf"
-    if [ -d /boot/loader ]; then
-        # Don't override loader.conf RMC already deployed
-        if [ ! -f /boot/loader/loader.conf ]; then
-            cp /run/media/$1/loader/loader.conf /boot/loader/
-        fi
-        # only copy built OE entries when RMC entries don't exist.
-        if [ ! -d /boot/loader/entries ] || [ ! ls /boot/loader/entries/*.conf &>/dev/null ]; then
-            cp -dr /run/media/$1/loader/entries /boot/loader
-        fi
-    else
-        # copy config files for gummiboot
-        cp -dr /run/media/$1/loader /boot
-        # delete the install entry
-        rm -f /boot/loader/entries/install.conf
-    fi
-    # delete the initrd lines
-    sed -i "/initrd /d" $GUMMIBOOT_CFGS
-    # delete any LABEL= strings
-    sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS
-    # delete any root= strings
-    sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS
-    # add the root= and other standard boot options
-    sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $GUMMIBOOT_CFGS
-    # if RMC feature presents, append global kernel command line fragment when it exists.
-    if [ -f "${RMC_DB}" ] && [ -f "${RMC_CMD}" ]; then
-        if ${RMC_CMD} -B KBOOTPARAM -d "${RMC_DB}" -o /tmp/kbootparam; then
-            sed -i "/^[ \t]*options/ s/$/ $(cat /tmp/kbootparam)/" $GUMMIBOOT_CFGS
-            rm /tmp/kbootparam
-        fi
-    fi
-fi
-cp /run/media/$1/vmlinuz /boot
-umount /src_root
-umount /tgt_root
-umount /boot
-sync
-echo "Remove your installation media, and press ENTER"
-read enter
-echo "Rebooting..."
-reboot -f
diff --git a/recipes-core/initrdscripts/initramfs-live-install-efi_%.bbappend b/recipes-core/initrdscripts/initramfs-live-install-efi_%.bbappend
deleted file mode 100644
index 0b3a1d3d..00000000
--- a/recipes-core/initrdscripts/initramfs-live-install-efi_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:"
-PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
diff --git a/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch b/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch
new file mode 100644
index 00000000..f15d5cc7
--- /dev/null
+++ b/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch
@@ -0,0 +1,94 @@
+From d4c97b50b577ea16b9ff6d9a352ab474a119310e Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Wed, 18 May 2022 15:41:24 +0800
+Subject: [PATCH] fake_v4l2_device.h: fix narrowing warning
+Use uint32_t instead of int for IOCTLs commands.
+Warning log:
+| ../../../git/xcore/fake_v4l2_device.h: In member function 'virtual int XCam::FakeV4l2Device::io_control(int, void*)':
+| ../../../git/xcore/fake_v4l2_device.h:42:14: error: narrowing conversion of '3225441794' from 'long unsigned int' to 'int' [-Wnarrowing]
+|    42 |         case VIDIOC_ENUM_FMT:
+|       |              ^~~~~~~~~~~~~~~
+| make[4]: *** [Makefile:685: libgstxcamsrc_la-gstxcamsrc.lo] Error 1
+Issue: https://github.com/intel/libxcam/issues/801
+Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/802]
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ xcore/base/xcam_common.h | 2 +-
+ xcore/fake_v4l2_device.h | 2 +-
+ xcore/v4l2_device.cpp    | 2 +-
+ xcore/v4l2_device.h      | 2 +-
+ xcore/xcam_common.cpp    | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+diff --git a/xcore/base/xcam_common.h b/xcore/base/xcam_common.h
+index 1f16e1e..4aa6cb9 100644
+--- a/xcore/base/xcam_common.h
+++ b/xcore/base/xcam_common.h
+@@ -75,7 +75,7 @@ void xcam_free (void *ptr);
+   * return, 0 successfully
+   *            else, check errno
+   */
+-int xcam_device_ioctl (int fd, int cmd, void *arg);
+int xcam_device_ioctl (int fd, uint32_t cmd, void *arg);
+ const char *xcam_fourcc_to_string (uint32_t fourcc);
+ 
+ void xcam_set_log (const char* file_name);
+diff --git a/xcore/fake_v4l2_device.h b/xcore/fake_v4l2_device.h
+index f679c19..e29787d 100644
+--- a/xcore/fake_v4l2_device.h
+++ b/xcore/fake_v4l2_device.h
+@@ -33,7 +33,7 @@ public:
+         : V4l2Device ("/dev/null")
+     {}
+ 
+-    int io_control (int cmd, void *arg)
+    int io_control (uint32_t cmd, void *arg)
+     {
+         XCAM_UNUSED (arg);
+ 
+diff --git a/xcore/v4l2_device.cpp b/xcore/v4l2_device.cpp
+index 395461e..66a8ac6 100644
+--- a/xcore/v4l2_device.cpp
+++ b/xcore/v4l2_device.cpp
+@@ -185,7 +185,7 @@ V4l2Device::close ()
+ }
+ 
+ int
+-V4l2Device::io_control (int cmd, void *arg)
+V4l2Device::io_control (uint32_t cmd, void *arg)
+ 
+ {
+     if (_fd <= 0)
+diff --git a/xcore/v4l2_device.h b/xcore/v4l2_device.h
+index b4ad7ad..2551a92 100644
+--- a/xcore/v4l2_device.h
+++ b/xcore/v4l2_device.h
+@@ -104,7 +104,7 @@ public:
+     XCamReturn queue_buffer (SmartPtr<V4l2Buffer> &buf);
+ 
+     // use as less as possible
+-    virtual int io_control (int cmd, void *arg);
+    virtual int io_control (uint32_t cmd, void *arg);
+ 
+ protected:
+ 
+diff --git a/xcore/xcam_common.cpp b/xcore/xcam_common.cpp
+index 848884d..d4d5093 100644
+--- a/xcore/xcam_common.cpp
+++ b/xcore/xcam_common.cpp
+@@ -53,7 +53,7 @@ void xcam_free(void *ptr)
+         free (ptr);
+ }
+ 
+-int xcam_device_ioctl (int fd, int cmd, void *arg)
+int xcam_device_ioctl (int fd, uint32_t cmd, void *arg)
+ {
+     int ret = 0;
+     int tried_time = 0;
+-- 
+2.25.1
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb
new file mode 100644
index 00000000..31e9344b
--- /dev/null
+++ b/recipes-core/libxcam/libxcam_1.5.0.bb
@@ -0,0 +1,39 @@
+SUMMARY  = "libXCam is a project for extended camera(not limited in camera) \
+features and focus on image quality improvement and video analysis"
+LICENSE  = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c911f084a3e5f46b21582a6cc9973e6"
+SECTION = "lib"
+inherit autotools pkgconfig
+S = "${WORKDIR}/git"
+SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8"
+SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0;protocol=https \
+            file://0001-fake_v4l2_device.h-fix-narrowing-warning.patch \
+"
+COMPATIBLE_HOST:libc-musl = "null"
+PACKAGECONFIG ??= " gst \
+                    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \
+                    ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan", "", d)} \
+                    "
+PACKAGECONFIG[gst]    = "--enable-gst, --disable-gst, gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[aiq]    = "--enable-aiq, --disable-aiq,"
+PACKAGECONFIG[libcl]  = "--enable-libcl, --disable-libcl,"
+PACKAGECONFIG[opencv] = "--enable-opencv, --disable-opencv, opencv"
+PACKAGECONFIG[render] = "--enable-render, --disable-render,"
+PACKAGECONFIG[gles]   = "--enable-gles, --disable-gles, virtual/mesa"
+PACKAGECONFIG[vulkan] = "--enable-vulkan, --disable-vulkan, vulkan-loader virtual/mesa"
+PACKAGECONFIG[dnn]    = "--enable-dnn, --disable-dnn,"
+do_install:append () {
+    install -d ${D}${bindir}/libxcam
+    cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/
+}
+FILES:${PN} += "${libdir}/gstreamer-*/*.so"
+FILES:${PN}-test = "${bindir}/libxcam/*"
+PACKAGES =+ "${PN}-test"
+RDEPENDS:${PN}-test =+ "bash"
diff --git a/recipes-core/meta/icx-environment.inc b/recipes-core/meta/icx-environment.inc
new file mode 100644
index 00000000..65322a91
--- /dev/null
+++ b/recipes-core/meta/icx-environment.inc
@@ -0,0 +1,15 @@
+export ICX_LDFLAGS_OPTION = " -Wl,-dynamic-linker,/lib/ld-linux-x86-64.so.2"
+export ICXSDK_PREFIX_OPTION = "-B ${TARGET_PREFIX}"
+export ICXQSDK_PREFIX_OPTION = "-qgnu-prefix=${TARGET_PREFIX}"
+create_sdk_files:append() {
+        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
+        if ${@bb.utils.contains('ICXSDK', '1', 'true', 'false', d)}; then
+            echo 'export ICX="icx ${ICXSDK_PREFIX_OPTION} --target=${TARGET_SYS} ${TARGET_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICX_LDFLAGS_OPTION}"' >> $script
+            echo 'export ICXCXX="icpx ${ICXSDK_PREFIX_OPTION} --target=${TARGET_SYS} ${TARGET_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICX_LDFLAGS_OPTION}"' >> $script
+            echo 'export ICXCPP="icx ${ICXSDK_PREFIX_OPTION} -E --target=${TARGET_SYS} ${TARGET_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICX_LDFLAGS_OPTION}"' >> $script
+            echo 'export ICXLD="xild  --sysroot=$SDKTARGETSYSROOT "' >> $script
+            echo 'export ICXCCLD="icx ${ICXSDK_PREFIX_OPTION} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export ICXAR="xiar ${ICXQSDK_PREFIX_OPTION}"' >> $script
+        fi
+}
diff --git a/recipes-core/meta/meta-environment-extsdk.bbappend b/recipes-core/meta/meta-environment-extsdk.bbappend
new file mode 100644
index 00000000..2cff6fc4
--- /dev/null
+++ b/recipes-core/meta/meta-environment-extsdk.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+require ${@bb.utils.contains('ICXSDK', '1', 'icx-environment.inc', '', d)}
diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend
new file mode 100644
index 00000000..2cff6fc4
--- /dev/null
+++ b/recipes-core/meta/meta-environment.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+require ${@bb.utils.contains('ICXSDK', '1', 'icx-environment.inc', '', d)}
diff --git a/recipes-core/microcode/intel-microcode_20180312.bb b/recipes-core/microcode/intel-microcode_20240312.bb
index 238d09f3..00b18231 100644
--- a/recipes-core/microcode/intel-microcode_20180312.bb
+++ b/recipes-core/microcode/intel-microcode_20240312.bb
@@ -11,13 +11,15 @@ DESCRIPTION = "The microcode data file contains the latest microcode\
 if the file is placed in the /etc/firmware directory of the Linux system."
 LICENSE = "Intel-Microcode-License"
-LIC_FILES_CHKSUM = "file://microcode.dat;endline=33;md5=57d3c3c310f8debda2b0ca5baba67298"
+LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721"
+SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \
+           "
+SRCREV = "41af34500598418150aa298bb04e7edacc547897"
-SRC_URI = "https://downloadmirror.intel.com/27591/eng/microcode-${PV}.tgz"
-SRC_URI[md5sum] = "be315cd99a7ca392a2f917ceacbe14f2"
-SRC_URI[sha256sum] = "0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779"
 DEPENDS = "iucode-tool-native"
-S = "${WORKDIR}"
+S = "${WORKDIR}/git"
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -29,30 +31,24 @@ inherit deploy
 UCODE_FILTER_PARAMETERS ?= ""
 do_compile() {
-        mkdir -p ${WORKDIR}/ucode/kernel/x86/microcode
-        ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \
-                ${UCODE_FILTER_PARAMETERS} \
-                --overwrite \
-                --write-to=${WORKDIR}/microcode_${PV}.bin \
-                ${WORKDIR}/microcode.dat
        ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \
                ${UCODE_FILTER_PARAMETERS} \
                --overwrite \
                --write-earlyfw=${WORKDIR}/microcode_${PV}.cpio \
-                ${WORKDIR}/microcode.dat
+                ${S}/intel-ucode/* ${S}/intel-ucode-with-caveats/*
 }
 do_install() {
-        install -d ${D}${base_libdir}/firmware/intel-ucode/
+        install -d ${D}${nonarch_base_libdir}/firmware/intel-ucode/
-        install ${WORKDIR}/microcode_${PV}.bin ${D}${base_libdir}/firmware/intel-ucode/
+        ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \
-        cd ${D}${base_libdir}/firmware/intel-ucode/
+        ${UCODE_FILTER_PARAMETERS} \
-        ln -sf microcode_${PV}.bin microcode.bin
+        --write-firmware=${D}${nonarch_base_libdir}/firmware/intel-ucode \
+        ${S}/intel-ucode/* ${S}/intel-ucode-with-caveats/*
 }
 do_deploy() {
        install -d ${DEPLOYDIR}
-        install ${S}/microcode_${PV}.cpio ${DEPLOYDIR}/
+        install ${WORKDIR}/microcode_${PV}.cpio ${DEPLOYDIR}/
        cd ${DEPLOYDIR}
        rm -f microcode.cpio
        ln -sf microcode_${PV}.cpio microcode.cpio
@@ -62,4 +58,6 @@ addtask deploy before do_build after do_compile
 PACKAGES = "${PN}"
-FILES_${PN} = "${base_libdir}"
+FILES:${PN} = "${nonarch_base_libdir}"
+UPSTREAM_CHECK_GITTAGREGEX = "^microcode-(?P<pver>(\d+)[a-z]*)$"
diff --git a/recipes-core/microcode/iucode-tool_2.1.2.bb b/recipes-core/microcode/iucode-tool_2.3.1.bb
index e1fb56f4..19417b7c 100644
--- a/recipes-core/microcode/iucode-tool_2.1.2.bb
+++ b/recipes-core/microcode/iucode-tool_2.3.1.bb
@@ -12,17 +12,17 @@ DESCRIPTION = "iucode_tool is a program to manipulate Intel i686 and X86-64\
 HOMEPAGE = "https://gitlab.com/iucode-tool/"
 BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?ordering=normal;archive=0;src=iucode-tool;repeatmerged=0"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-                    file://iucode_tool.c;beginline=1;endline=15;md5=5d8e3639c3b6a80e7d5e0e073933da16"
+                    file://iucode_tool.c;beginline=1;endline=15;md5=71eeab3190360ff0267101b570874756"
-DEPENDS_append_libc-musl = " argp-standalone"
+DEPENDS:append:libc-musl = " argp-standalone"
 SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz"
-SRC_URI_append_libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch"
+SRC_URI:append:libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch"
-SRC_URI[md5sum] = "c6f131a0b69443f5498782a2335973fa"
+SRC_URI[md5sum] = "63b33cc0ea1f8c73b443412abbf39d6f"
-SRC_URI[sha256sum] = "01f1c02ba6935e0ac8440fb594c2ef57ce4437fcbce539e3ef329f55a6fd71ab"
+SRC_URI[sha256sum] = "12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95"
 inherit autotools
diff --git a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
index 62db0633..7eb3bc69 100644
--- a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
+++ b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
@@ -1,6 +1,6 @@
-From 48e511481d83c1614cd00a5a2edcf6b5d746b9c4 Mon Sep 17 00:00:00 2001
+From b2099e7184d48a6d05c8713b6fd5dac0e2e70963 Mon Sep 17 00:00:00 2001
 From: Mikko Ylinen <mikko.ylinen@linux.intel.com>
-Date: Fri, 7 Apr 2017 12:06:14 +0300
+Date: Wed, 2 Mar 2022 10:55:35 +0800
 Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot
 This patch adds refkit-db.cer (via xxd -i) in OVMF's db
@@ -9,97 +9,121 @@ application. It's used for testing purposes only.
 Images signed with refkit-db keys are allowed to boot.
+Upstream-Status: Inappropriate
 Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 68 +++++++++++++++++++++++++++
+ OvmfPkg/EnrollDefaultKeys/AuthData.c          | 69 +++++++++++++++++++
- 1 file changed, 68 insertions(+)
+ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c |  3 +
+ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h |  2 +
+ 3 files changed, 74 insertions(+)
+diff --git a/OvmfPkg/EnrollDefaultKeys/AuthData.c b/OvmfPkg/EnrollDefaultKeys/AuthData.c
+index 53ee7f7003..127131cd05 100644
+--- a/OvmfPkg/EnrollDefaultKeys/AuthData.c
+++ b/OvmfPkg/EnrollDefaultKeys/AuthData.c
+@@ -395,6 +395,75 @@ CONST UINT8  mMicrosoftUefiCa[] = {
+ 
+ CONST UINTN  mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;
+ 
+CONST UINT8 mRefkitTestCA[] = {
+  0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01,
+  0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac,
+  0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+  0x0b, 0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55,
+  0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64,
+  0x62, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x37, 0x30, 0x34, 0x32, 0x30, 0x31,
+  0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x34,
+  0x32, 0x30, 0x31, 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x30, 0x14, 0x31,
+  0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65,
+  0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, 0x62, 0x30, 0x82, 0x01, 0x22, 0x30,
+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01,
+  0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02,
+  0x82, 0x01, 0x01, 0x00, 0xb4, 0x1c, 0x22, 0xa6, 0x22, 0x01, 0x57, 0xcd,
+  0xf1, 0x4f, 0xaf, 0x72, 0xe3, 0xd9, 0x01, 0x80, 0x50, 0x55, 0xef, 0x02,
+  0x5e, 0xeb, 0x99, 0x35, 0xcb, 0x7f, 0x2a, 0x79, 0xff, 0xb5, 0x3e, 0xec,
+  0x5d, 0x92, 0x06, 0x30, 0x20, 0xe7, 0x95, 0xad, 0xa4, 0x84, 0x2e, 0x3f,
+  0xfa, 0xd7, 0x46, 0xdd, 0x49, 0xa8, 0xe8, 0xe3, 0x79, 0x49, 0xf6, 0x8f,
+  0x0b, 0x1d, 0xfe, 0x63, 0xa8, 0xd1, 0x63, 0xa3, 0xd6, 0x0d, 0x4e, 0x6c,
+  0x66, 0x5c, 0xd6, 0x66, 0x26, 0xd1, 0x26, 0x98, 0xd4, 0x4f, 0x76, 0xc9,
+  0x65, 0x48, 0x58, 0x13, 0x08, 0x31, 0xbc, 0xe5, 0x47, 0x25, 0x65, 0x95,
+  0x39, 0x89, 0x5f, 0x02, 0xf1, 0xc5, 0x06, 0x17, 0x58, 0xca, 0x09, 0xfd,
+  0xf6, 0x1e, 0xc5, 0x97, 0xda, 0xa3, 0x4e, 0x1a, 0x48, 0xbe, 0xcf, 0x96,
+  0x27, 0x04, 0x4b, 0xb7, 0x6d, 0x67, 0xb6, 0x50, 0x18, 0x04, 0x73, 0x51,
+  0xd2, 0x6a, 0x2d, 0xdf, 0x3b, 0xab, 0xf2, 0x2d, 0x95, 0xd7, 0xa8, 0xb8,
+  0xa8, 0x30, 0xa1, 0xab, 0x8b, 0x92, 0x2b, 0x60, 0x3e, 0x3a, 0xe5, 0x86,
+  0x40, 0x71, 0xc1, 0x3f, 0x2d, 0x2e, 0x90, 0xe7, 0xd6, 0xec, 0xcc, 0xc2,
+  0x0b, 0x79, 0x83, 0x71, 0x6d, 0xf6, 0xa3, 0xa9, 0x4c, 0xcd, 0x46, 0x81,
+  0xdc, 0xef, 0xec, 0x51, 0xbe, 0x81, 0x2a, 0xf1, 0x78, 0x73, 0x41, 0xdb,
+  0x54, 0xce, 0x7c, 0xce, 0xa2, 0xe3, 0x90, 0x4f, 0x45, 0x1a, 0xf9, 0x3d,
+  0x88, 0xfc, 0x0e, 0xed, 0xd3, 0x69, 0x22, 0x4c, 0xfa, 0x0a, 0x69, 0xd1,
+  0x48, 0xc0, 0xaa, 0xa9, 0x3a, 0xb3, 0x8f, 0x10, 0x3a, 0x76, 0xa8, 0x0c,
+  0x7a, 0x3d, 0xd8, 0x79, 0xce, 0x1c, 0x96, 0x62, 0xf4, 0x06, 0xee, 0x47,
+  0xe8, 0xe0, 0x69, 0x91, 0xae, 0xea, 0x34, 0xcf, 0xda, 0xa8, 0xb4, 0x39,
+  0x5e, 0xf3, 0x7a, 0xd0, 0x88, 0x48, 0x47, 0x69, 0x02, 0x03, 0x01, 0x00,
+  0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e,
+  0x04, 0x16, 0x04, 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b,
+  0x1a, 0x9f, 0x46, 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd,
+  0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80,
+  0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, 0x1a, 0x9f, 0x46,
+  0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, 0x30, 0x0c, 0x06,
+  0x03, 0x55, 0x1d, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30,
+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+  0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x8f, 0xd2, 0x84, 0x7c, 0x43,
+  0x47, 0xca, 0x6b, 0xfd, 0x87, 0x83, 0xd0, 0xef, 0x75, 0xd3, 0x20, 0x52,
+  0x73, 0x18, 0xaa, 0x32, 0x71, 0xfb, 0xa5, 0xf4, 0xc9, 0x11, 0xa3, 0x68,
+  0x4d, 0xb7, 0x9d, 0xe6, 0xd9, 0x46, 0x24, 0xdc, 0xc7, 0xc2, 0x3b, 0xf9,
+  0xb0, 0x98, 0xfc, 0xee, 0x34, 0x6e, 0x10, 0x9b, 0x3d, 0x44, 0x6e, 0x33,
+  0x09, 0x11, 0xb8, 0x29, 0xd6, 0x2d, 0x06, 0xcf, 0x67, 0x8f, 0x96, 0x85,
+  0x9d, 0x63, 0x72, 0xbf, 0x64, 0x5f, 0x0d, 0xe3, 0xc9, 0x63, 0x19, 0x71,
+  0xd4, 0x7d, 0x4c, 0x9c, 0x77, 0x46, 0xda, 0x20, 0x97, 0x6d, 0xbc, 0xdd,
+  0xc2, 0x1f, 0xf3, 0x40, 0x38, 0x1e, 0xe7, 0xcc, 0x55, 0x05, 0x72, 0xba,
+  0x24, 0x4f, 0xb3, 0x8a, 0x93, 0x0c, 0x30, 0x60, 0xda, 0x9f, 0x6f, 0x35,
+  0xf6, 0xfb, 0xb0, 0x1f, 0xb3, 0x00, 0xdd, 0xc4, 0xa6, 0xbc, 0xe2, 0x37,
+  0xc1, 0xa3, 0xef, 0xd9, 0xa1, 0x86, 0xf9, 0xeb, 0xa4, 0xa5, 0x45, 0x38,
+  0xff, 0x4e, 0x87, 0x4a, 0x41, 0xcf, 0x6e, 0x69, 0x7e, 0x97, 0xbe, 0x2d,
+  0x22, 0xbc, 0x8d, 0xa0, 0x1a, 0x21, 0x8f, 0x4b, 0x72, 0x90, 0x01, 0x5c,
+  0xba, 0xa5, 0x9c, 0x2d, 0xd7, 0x25, 0x24, 0xfc, 0xff, 0x5c, 0x58, 0x14,
+  0x46, 0x30, 0x09, 0x7c, 0x55, 0x64, 0x83, 0x0b, 0xb9, 0xdf, 0xcf, 0x25,
+  0xee, 0xec, 0xf7, 0xcb, 0xdb, 0xd1, 0x5b, 0x93, 0x93, 0xc8, 0x8a, 0x10,
+  0x46, 0xb8, 0xb0, 0x35, 0x1c, 0x6c, 0x0d, 0x8f, 0x03, 0x6a, 0x8f, 0x1b,
+  0x36, 0x68, 0xf3, 0x53, 0x89, 0x36, 0x5b, 0x21, 0x80, 0xde, 0xe3, 0x92,
+  0x52, 0x94, 0x97, 0x9d, 0x49, 0x89, 0x7d, 0x3e, 0xde, 0x29, 0x51, 0xba,
+  0x11, 0xf7, 0xba, 0x01, 0xf7, 0xab, 0xea, 0xc1, 0xa7, 0x2e, 0xa3, 0x4d,
+  0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3
+};
+
+CONST UINTN mSizeOfRefkitTestCA = sizeof mRefkitTestCA;
+
+ //
+ // The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case
+ // of the Secure Boot Logo Test in the Microsoft Hardware Certification Kit
 diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
-index 24ab977..a3c12ba 100644
+index 094e4c821b..0a7eef54dc 100644
 --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
 +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
-@@ -516,6 +516,73 @@ STATIC CONST UINT8 MicrosoftUefiCA[] = {
+@@ -702,6 +702,9 @@ ShellAppMain (
-   0x07, 0x92, 0x9b, 0xf5, 0xa6, 0xbc, 0x59, 0x83, 0x58
+                mMicrosoftUefiCa,
- };
+                mSizeOfMicrosoftUefiCa,
- 
+                &gMicrosoftVendorGuid,
-+STATIC CONST UINT8 RefkitTestCA[] = {
+               mRefkitTestCA,
-+  0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01,
+               mSizeOfRefkitTestCA,
-+  0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac,
+               &gEfiCallerIdGuid,
-+  0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+                NULL
-+  0x0b, 0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55,
+                );
-+  0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64,
+   }
-+  0x62, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x37, 0x30, 0x34, 0x32, 0x30, 0x31,
+diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
-+  0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x34,
+index 56da9c71d6..8de1dfe4e0 100644
-+  0x32, 0x30, 0x31, 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x30, 0x14, 0x31,
+--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
-+  0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65,
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
-+  0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, 0x62, 0x30, 0x82, 0x01, 0x22, 0x30,
+@@ -133,4 +133,6 @@ extern CONST UINTN  mSizeOfMicrosoftUefiCa;
-+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01,
+ extern CONST UINT8  mSha256OfDevNull[];
-+  0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02,
+ extern CONST UINTN  mSizeOfSha256OfDevNull;
-+  0x82, 0x01, 0x01, 0x00, 0xb4, 0x1c, 0x22, 0xa6, 0x22, 0x01, 0x57, 0xcd,
+ 
-+  0xf1, 0x4f, 0xaf, 0x72, 0xe3, 0xd9, 0x01, 0x80, 0x50, 0x55, 0xef, 0x02,
+extern CONST UINT8 mRefkitTestCA[];
-+  0x5e, 0xeb, 0x99, 0x35, 0xcb, 0x7f, 0x2a, 0x79, 0xff, 0xb5, 0x3e, 0xec,
+extern CONST UINTN mSizeOfRefkitTestCA;
-+  0x5d, 0x92, 0x06, 0x30, 0x20, 0xe7, 0x95, 0xad, 0xa4, 0x84, 0x2e, 0x3f,
+ #endif /* ENROLL_DEFAULT_KEYS_H_ */
-+  0xfa, 0xd7, 0x46, 0xdd, 0x49, 0xa8, 0xe8, 0xe3, 0x79, 0x49, 0xf6, 0x8f,
-+  0x0b, 0x1d, 0xfe, 0x63, 0xa8, 0xd1, 0x63, 0xa3, 0xd6, 0x0d, 0x4e, 0x6c,
-+  0x66, 0x5c, 0xd6, 0x66, 0x26, 0xd1, 0x26, 0x98, 0xd4, 0x4f, 0x76, 0xc9,
-+  0x65, 0x48, 0x58, 0x13, 0x08, 0x31, 0xbc, 0xe5, 0x47, 0x25, 0x65, 0x95,
-+  0x39, 0x89, 0x5f, 0x02, 0xf1, 0xc5, 0x06, 0x17, 0x58, 0xca, 0x09, 0xfd,
-+  0xf6, 0x1e, 0xc5, 0x97, 0xda, 0xa3, 0x4e, 0x1a, 0x48, 0xbe, 0xcf, 0x96,
-+  0x27, 0x04, 0x4b, 0xb7, 0x6d, 0x67, 0xb6, 0x50, 0x18, 0x04, 0x73, 0x51,
-+  0xd2, 0x6a, 0x2d, 0xdf, 0x3b, 0xab, 0xf2, 0x2d, 0x95, 0xd7, 0xa8, 0xb8,
-+  0xa8, 0x30, 0xa1, 0xab, 0x8b, 0x92, 0x2b, 0x60, 0x3e, 0x3a, 0xe5, 0x86,
-+  0x40, 0x71, 0xc1, 0x3f, 0x2d, 0x2e, 0x90, 0xe7, 0xd6, 0xec, 0xcc, 0xc2,
-+  0x0b, 0x79, 0x83, 0x71, 0x6d, 0xf6, 0xa3, 0xa9, 0x4c, 0xcd, 0x46, 0x81,
-+  0xdc, 0xef, 0xec, 0x51, 0xbe, 0x81, 0x2a, 0xf1, 0x78, 0x73, 0x41, 0xdb,
-+  0x54, 0xce, 0x7c, 0xce, 0xa2, 0xe3, 0x90, 0x4f, 0x45, 0x1a, 0xf9, 0x3d,
-+  0x88, 0xfc, 0x0e, 0xed, 0xd3, 0x69, 0x22, 0x4c, 0xfa, 0x0a, 0x69, 0xd1,
-+  0x48, 0xc0, 0xaa, 0xa9, 0x3a, 0xb3, 0x8f, 0x10, 0x3a, 0x76, 0xa8, 0x0c,
-+  0x7a, 0x3d, 0xd8, 0x79, 0xce, 0x1c, 0x96, 0x62, 0xf4, 0x06, 0xee, 0x47,
-+  0xe8, 0xe0, 0x69, 0x91, 0xae, 0xea, 0x34, 0xcf, 0xda, 0xa8, 0xb4, 0x39,
-+  0x5e, 0xf3, 0x7a, 0xd0, 0x88, 0x48, 0x47, 0x69, 0x02, 0x03, 0x01, 0x00,
-+  0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e,
-+  0x04, 0x16, 0x04, 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b,
-+  0x1a, 0x9f, 0x46, 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd,
-+  0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80,
-+  0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, 0x1a, 0x9f, 0x46,
-+  0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, 0x30, 0x0c, 0x06,
-+  0x03, 0x55, 0x1d, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30,
-+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-+  0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x8f, 0xd2, 0x84, 0x7c, 0x43,
-+  0x47, 0xca, 0x6b, 0xfd, 0x87, 0x83, 0xd0, 0xef, 0x75, 0xd3, 0x20, 0x52,
-+  0x73, 0x18, 0xaa, 0x32, 0x71, 0xfb, 0xa5, 0xf4, 0xc9, 0x11, 0xa3, 0x68,
-+  0x4d, 0xb7, 0x9d, 0xe6, 0xd9, 0x46, 0x24, 0xdc, 0xc7, 0xc2, 0x3b, 0xf9,
-+  0xb0, 0x98, 0xfc, 0xee, 0x34, 0x6e, 0x10, 0x9b, 0x3d, 0x44, 0x6e, 0x33,
-+  0x09, 0x11, 0xb8, 0x29, 0xd6, 0x2d, 0x06, 0xcf, 0x67, 0x8f, 0x96, 0x85,
-+  0x9d, 0x63, 0x72, 0xbf, 0x64, 0x5f, 0x0d, 0xe3, 0xc9, 0x63, 0x19, 0x71,
-+  0xd4, 0x7d, 0x4c, 0x9c, 0x77, 0x46, 0xda, 0x20, 0x97, 0x6d, 0xbc, 0xdd,
-+  0xc2, 0x1f, 0xf3, 0x40, 0x38, 0x1e, 0xe7, 0xcc, 0x55, 0x05, 0x72, 0xba,
-+  0x24, 0x4f, 0xb3, 0x8a, 0x93, 0x0c, 0x30, 0x60, 0xda, 0x9f, 0x6f, 0x35,
-+  0xf6, 0xfb, 0xb0, 0x1f, 0xb3, 0x00, 0xdd, 0xc4, 0xa6, 0xbc, 0xe2, 0x37,
-+  0xc1, 0xa3, 0xef, 0xd9, 0xa1, 0x86, 0xf9, 0xeb, 0xa4, 0xa5, 0x45, 0x38,
-+  0xff, 0x4e, 0x87, 0x4a, 0x41, 0xcf, 0x6e, 0x69, 0x7e, 0x97, 0xbe, 0x2d,
-+  0x22, 0xbc, 0x8d, 0xa0, 0x1a, 0x21, 0x8f, 0x4b, 0x72, 0x90, 0x01, 0x5c,
-+  0xba, 0xa5, 0x9c, 0x2d, 0xd7, 0x25, 0x24, 0xfc, 0xff, 0x5c, 0x58, 0x14,
-+  0x46, 0x30, 0x09, 0x7c, 0x55, 0x64, 0x83, 0x0b, 0xb9, 0xdf, 0xcf, 0x25,
-+  0xee, 0xec, 0xf7, 0xcb, 0xdb, 0xd1, 0x5b, 0x93, 0x93, 0xc8, 0x8a, 0x10,
-+  0x46, 0xb8, 0xb0, 0x35, 0x1c, 0x6c, 0x0d, 0x8f, 0x03, 0x6a, 0x8f, 0x1b,
-+  0x36, 0x68, 0xf3, 0x53, 0x89, 0x36, 0x5b, 0x21, 0x80, 0xde, 0xe3, 0x92,
-+  0x52, 0x94, 0x97, 0x9d, 0x49, 0x89, 0x7d, 0x3e, 0xde, 0x29, 0x51, 0xba,
-+  0x11, 0xf7, 0xba, 0x01, 0xf7, 0xab, 0xea, 0xc1, 0xa7, 0x2e, 0xa3, 0x4d,
-+  0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3
-+};
-+
- //
- // The most important thing about the variable payload is that it is a list of
- // lists, where the element size of any given *inner* list is constant.
-@@ -908,6 +975,7 @@ ShellAppMain (
-              &gEfiImageSecurityDatabaseGuid,
-              MicrosoftPCA,    sizeof MicrosoftPCA,    &gEfiCallerIdGuid,
-              MicrosoftUefiCA, sizeof MicrosoftUefiCA, &gEfiCallerIdGuid,
-+             RefkitTestCA,    sizeof RefkitTestCA,    &gEfiCallerIdGuid,
-              NULL);
-   if (EFI_ERROR (Status)) {
-     return 1;
 -- 
-2.1.4
+2.17.1
diff --git a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb
index b20f6e58..ca3cfc15 100644
--- a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb
+++ b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb
@@ -1,10 +1,10 @@
 require recipes-core/ovmf/ovmf-shell-image.bb
-WKS_SEARCH_PATH_append = ":${COREBASE}/meta/recipes-core/ovmf"
+WKS_SEARCH_PATH:append = ":${COREBASE}/meta/recipes-core/ovmf"
 QB_DRIVE_TYPE = "/dev/vd"
-do_image_append() {
+do_image:append() {
    cat > ${IMAGE_ROOTFS}/startup.nsh << EOF
 EnrollDefaultKeys
 reset
diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend
index bbf5fa32..34a9dd1b 100644
--- a/recipes-core/ovmf/ovmf_%.bbappend
+++ b/recipes-core/ovmf/ovmf_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:"
-SRC_URI_append_intel-x86-common = " \
+SRC_URI:append:intel-x86-common = " \
        file://0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch \
 "
-PACKAGECONFIG_append_intel-x86-common = " secureboot"
+PACKAGECONFIG:append:intel-x86-common = " secureboot"
diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
new file mode 100644
index 00000000..b5a5fdd4
--- /dev/null
+++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -0,0 +1 @@
+RDEPENDS:${PN} += "${@bb.utils.contains('ICXSDK', '1', ' intel-oneapi-dpcpp-cpp intel-oneapi-dpcpp-cpp-dev intel-oneapi-dpcpp-cpp-runtime intel-oneapi-dpcpp-cpp-runtime-dev ', '', d)}"
diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
new file mode 100644
index 00000000..608ea3d3
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
@@ -0,0 +1 @@
+RRECOMMENDS:${PN}:append:intel-x86-common = "${@bb.utils.contains('ICXSDK', '1', ' intel-oneapi-dpcpp-cpp intel-oneapi-dpcpp-cpp-dev intel-oneapi-dpcpp-cpp-runtime intel-oneapi-dpcpp-cpp-runtime-dev ', '', d)}"
diff --git a/recipes-devtools/slimboot/slimboot-tools_git.bb b/recipes-devtools/slimboot/slimboot-tools_git.bb
new file mode 100644
index 00000000..b65b182d
--- /dev/null
+++ b/recipes-devtools/slimboot/slimboot-tools_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Slim Bootloader Host Tools"
+DESCRIPTION = "Native host tools to generate the container images in a \
+binary file format understood by Slim Bootloader to load and initialize\
+Operating Systems or Hypervisors."
+HOMEPAGE = "https://slimbootloader.github.io/tools/index.html"
+SRC_URI = "git://github.com/slimbootloader/slimbootloader;protocol=https;branch=master"
+SRCREV = "df5bd0bc2a522afcb8945a6797592b04838db753"
+PV = "0.0.0+git${SRCPV}"
+LICENSE = "BSD-2-Clause-Patent"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ef7fba7be2819ac13aaf5d0f842ce5d9"
+S = "${WORKDIR}/git"
+inherit python3native
+BBCLASSEXTEND = "native"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install() {
+        install -m 755 -d ${D}${libexecdir}/slimboot/Tools
+        install -m 755 ${S}/BootloaderCorePkg/Tools/*.py ${D}${libexecdir}/slimboot/Tools
+}
diff --git a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
new file mode 100644
index 00000000..825c1f18
--- /dev/null
+++ b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
@@ -0,0 +1,37 @@
+From 8729d66800995a9b7e693bd78249932bd12383e1 Mon Sep 17 00:00:00 2001
+From: John Machado <john.machado@intel.com>
+Date: Mon, 25 Mar 2024 11:13:27 +0530
+Subject: [PATCH] Add new DG2 device IDs (#194)
+Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/dcc4b85ea3728c848b62fbb164c00f43b519b6fb]
+Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
+---
+ Source/inc/common/igfxfmid.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
+index 7969779..8e2c955 100644
+--- a/Source/inc/common/igfxfmid.h
+++ b/Source/inc/common/igfxfmid.h
+@@ -1932,6 +1932,8 @@ typedef enum __NATIVEGTTYPE
+ #define DEV_ID_56BB                             0x56BB
+ #define DEV_ID_56BC                             0x56BC
+ #define DEV_ID_56BD                             0x56BD
+#define DEV_ID_56BE                             0x56BE
+#define DEV_ID_56BF                             0x56BF
+ #define DEV_ID_56C0                             0x56C0
+ #define DEV_ID_56C1                             0x56C1
+ 
+@@ -1992,6 +1994,8 @@ typedef enum __NATIVEGTTYPE
+                                       ( d == DEV_ID_5690 )                              ||   \
+                                       ( d == DEV_ID_5691 )                              ||   \
+                                       ( d == DEV_ID_5692 )                              ||   \
+                                      ( d == DEV_ID_56BE )                              ||   \
+                                      ( d == DEV_ID_56BF )                              ||   \
+                                       ( d == DEV_ID_56C0 )                              ||   \
+                                       ( d == DEV_ID_4F80 )                              ||   \
+                                       ( d == DEV_ID_4F81 )                              ||   \
+-- 
+2.34.1
diff --git a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
new file mode 100644
index 00000000..ab4cb178
--- /dev/null
+++ b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
@@ -0,0 +1,42 @@
+From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001
+From: John Machado <john.machado@intel.com>
+Date: Fri, 9 Feb 2024 13:10:18 +0530
+Subject: [PATCH] Introduce ARL-H support (#172)
+Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ Source/inc/common/igfxfmid.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
+index 99fc624..19aa505 100644
+--- a/Source/inc/common/igfxfmid.h
+++ b/Source/inc/common/igfxfmid.h
+@@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE
+ // ARL-S
+ #define DEV_ID_7D67                             0x7D67
+ 
+// ARL-H
+#define DEV_ID_7D41                             0x7D41
+#define DEV_ID_7D51                             0x7D51
+#define DEV_ID_7DD1                             0x7DD1
+
+ #define MGM_HAS     0
+ 
+ //#define SDG_HAS      1              //Reserve place for Springdale-G HAS
+@@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE
+ // Macro to identify ARL-S Device ID
+ #define GFX_IS_ARL_S(d)  ( ( d == DEV_ID_7D67 ) )
+ 
+// Macro to identify ARL-H Device ID
+#define GFX_IS_ARL_H(d)  ( ( d == DEV_ID_7D41 )  ||   \
+                         ( d == DEV_ID_7D51 )    ||   \
+                         ( d == DEV_ID_7DD1 ))
+
+ //we define the highest cap and lower cap of stepping IDs
+ #define SI_REV_ID(lo,hi) (lo | hi<<16)
+ 
+-- 
+2.40.1
diff --git a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb b/recipes-graphics/gmmlib/gmmlib_22.3.15.bb
new file mode 100644
index 00000000..875fbaf5
--- /dev/null
+++ b/recipes-graphics/gmmlib/gmmlib_22.3.15.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Intel(R) Graphics Memory Management Library"
+DESCRIPTION = "The Intel(R) Graphics Memory Management Library provides \
+device specific and buffer management for the Intel(R) Graphics \
+Compute Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654"
+SRC_URI = " \
+            git://github.com/intel/gmmlib.git;protocol=https;branch=master \
+            file://0001-Introduce-ARL-H-support-172.patch \
+            file://0001-Add-new-DG2-device-IDs-194.patch \
+            "
+SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc"
+S = "${WORKDIR}/git"
+COMPATIBLE_HOST:x86-x32 = "null"
+UPSTREAM_CHECK_GITTAGREGEX = "^intel-gmmlib-(?P<pver>(\d+(\.\d+)+))$"
+inherit pkgconfig cmake
+EXTRA_OECMAKE += "-DRUN_TEST_SUITE=OFF"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
new file mode 100644
index 00000000..6d32da43
--- /dev/null
+++ b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
@@ -0,0 +1,42 @@
+From 5cbcecff0bb7fa1c617d3082e7ad94c22e5f4eb1 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Wed, 3 Jul 2019 17:13:15 +0800
+Subject: [PATCH] main: fix hdcpd service failure
+Child process not able to finish before parent process
+exits, which causing hdcpd service failure.
+Added wait function to block parent process
+until child process exits.
+Upstream-Status: Submitted [https://github.com/intel/hdcp/pull/17]
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ daemon/main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/daemon/main.cpp b/daemon/main.cpp
+index 9a028d7..ef1e047 100644
+--- a/daemon/main.cpp
+++ b/daemon/main.cpp
+@@ -36,6 +36,7 @@
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <iostream>
+#include <sys/wait.h>
+ 
+ #include "hdcpdef.h"
+ #include "srm.h"
+@@ -93,6 +94,8 @@ int32_t daemon_init(void)
+     }
+     else if (pid != 0)
+     {
+        int status;
+        wait(&status);
+         exit(SUCCESS);    // parent exit
+     }
+ 
+-- 
+2.17.1
diff --git a/recipes-graphics/hdcp/hdcp_21.2.0.bb b/recipes-graphics/hdcp/hdcp_21.2.0.bb
new file mode 100644
index 00000000..8529b5ab
--- /dev/null
+++ b/recipes-graphics/hdcp/hdcp_21.2.0.bb
@@ -0,0 +1,26 @@
+SUMMARY  = "Intel(R) unified HDCP SDK"
+DESCRIPTION = "This is a user space implementation to prevent copying of \
+digital audio & video content across digital display interfaces. It provides \
+Linux user space implementation to enable the HDCP1.4 and HDCP2.2 protection \
+for external digital display interface"
+LICENSE  = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c50969be4feb8b99c6baa3795ede4dce"
+SECTION = "lib"
+inherit pkgconfig cmake useradd systemd features_check
+SRC_URI = "git://github.com/intel/hdcp.git;branch=master;protocol=https \
+        file://0001-main-fix-hdcpd-service-failure.patch \
+"
+SRCREV = "cacc352159c5bdaf1c21846cecdd1eb7b031e1d3"
+S = "${WORKDIR}/git"
+REQUIRED_DISTRO_FEATURES = "systemd"
+DEPENDS = "libdrm virtual/mesa systemd"
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --gid nogroup media"
+SYSTEMD_SERVICE:${PN} = "hdcpd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb
deleted file mode 100644
index f9ee7218..00000000
--- a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc
-SUMMARY = "Intel GPU tools"
-DESCRIPTION = "Variety of small tools for testing intel graphics."
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4b3dd344780e0400593b21b115a6947"
-LICENSE_append = " & ISC"
-inherit autotools gtk-doc
-SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz"
-DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps libunwind"
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN}-tests += "bash"
-PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
-SRC_URI[md5sum] = "965c591b23a132084113c2a0604f537a"
-SRC_URI[sha256sum] = "3d66c1dc5110712ca4d22199b3ce9853f261be1690064edf87e69e5392e39a5c"
-EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
-COMPATIBLE_HOST_libc-musl_class-target = "null"
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[audio] = "--enable-audio,--disable-audio,alsa-lib gsl"
-gputools_sysroot_preprocess() {
-        rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc
-}
-SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess"
-FILES_${PN} += "${libdir}/intel_aubdump.so"
-FILES_${PN}-benchmarks += "${libexecdir}/intel-gpu-tools/benchmarks"
-FILES_${PN}-tests += "\
-                ${libexecdir}/intel-gpu-tools/*\
-                ${datadir}/intel-gpu-tools/1080p-right.png\
-                ${datadir}/intel-gpu-tools/1080p-left.png\
-                ${datadir}/intel-gpu-tools/pass.png\
-                ${datadir}/intel-gpu-tools/test-list.txt"
diff --git a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb b/recipes-graphics/libva/libva-intel-utils_2.20.1.bb
new file mode 100644
index 00000000..9c26f009
--- /dev/null
+++ b/recipes-graphics/libva/libva-intel-utils_2.20.1.bb
@@ -0,0 +1,35 @@
+SUMMARY = "libva-utils is a collection of utilities from libva project"
+DESCRIPTION = "libva-utils is a collection of utilities \
+and examples to exercise VA-API in accordance with the libva \
+project.VA-API is an open-source library and API specification, \
+which provides access to graphics hardware acceleration capabilities \
+for video processing. It consists of a main library and driver-specific \
+acceleration backends for each supported hardware vendor"
+HOMEPAGE = "https://01.org/linuxmedia/vaapi"
+BUGTRACKER = "https://github.com/intel/libva-utils/issues"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https"
+SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8"
+S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
+DEPENDS = "libva"
+inherit meson pkgconfig features_check
+# depends on libva which requires opengl
+REQUIRED_DISTRO_FEATURES = "opengl"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes"
+PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland"
+PROVIDES = "libva-utils"
+RPROVIDES:${PN} += "libva-utils"
diff --git a/recipes-graphics/libva/libva-intel_2.20.0.bb b/recipes-graphics/libva/libva-intel_2.20.0.bb
new file mode 100644
index 00000000..c81ed65c
--- /dev/null
+++ b/recipes-graphics/libva/libva-intel_2.20.0.bb
@@ -0,0 +1,55 @@
+SUMMARY = "Video Acceleration (VA) API for Linux"
+DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \
+and API specification which enables and provides access to graphics \
+hardware (GPU) acceleration for video processing on Linux and UNIX \
+based operating systems. Accelerated processing includes video \
+decoding, video encoding, subpicture blending and rendering. The \
+specification was originally designed by Intel for its GMA (Graphics \
+Media Accelerator) series of GPU hardware, the API is however not \
+limited to GPUs or Intel specific hardware, as other hardware and \
+manufacturers can also freely use this API for hardware accelerated \
+video decoding."
+HOMEPAGE = "https://01.org/linuxmedia/vaapi"
+BUGTRACKER = "https://github.com/intel/libva/issues"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
+SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 \
+          "
+SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49"
+S = "${WORKDIR}/libva-${PV}"
+UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
+DEPENDS = "libdrm"
+inherit meson pkgconfig
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \
+"
+PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes"
+PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa"
+PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland"
+PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland"
+RDEPENDS:${PN}-x11 =+ "${PN}"
+RDEPENDS:${PN}-glx =+ "${PN}-x11"
+FILES:${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}"
+FILES:${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}"
+FILES:${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}"
+PROVIDES += "libva"
+RPROVIDES:${PN} += "libva"
+RPROVIDES:${PN}-x11 += "libva-x11"
+RPROVIDES:${PN}-glx += "libva-glx"
+RPROVIDES:${PN}-wayland += "libva-wayland"
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb
new file mode 100644
index 00000000..3ed1c9bd
--- /dev/null
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb
@@ -0,0 +1,18 @@
+SUMMARY  = "Intel Metrics Discovery Application Programming Interface"
+DESCRIPTION = "This software is a user mode library that provides access to \
+GPU performance data."
+LICENSE  = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8c5c9ac8ffd04a5614befdf63fba6ba8"
+SECTION = "lib"
+inherit pkgconfig cmake
+S = "${WORKDIR}/git"
+SRCREV = "75b292eb1309e4ea10dce403065ee8ca5bf29ecc"
+SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
+          "
+EXTRA_OECMAKE += "-DMD_PLATFORM=linux"
+EXTRA_OECMAKE += "-DMD_LIBDRM_SRC=${STAGING_INCDIR}"
+DEPENDS = "libdrm"
diff --git a/recipes-graphics/xorg-driver/xf86-video-ast_1.1.5.bb b/recipes-graphics/xorg-driver/xf86-video-ast_1.1.6.bb
index 090efd62..d7e4eab4 100644
--- a/recipes-graphics/xorg-driver/xf86-video-ast_1.1.5.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-ast_1.1.6.bb
@@ -7,6 +7,6 @@ DESCRIPTION = "ast is an Xorg driver for ASpeed Technologies video cards"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0b8c242f0218eea5caa949b7910a774b"
 DEPENDS += "libpciaccess"
+XORG_DRIVER_COMPRESSOR = ".tar.gz"
-SRC_URI[md5sum] = "4f85febe48d51e53624550a96fc9e9ee"
+SRC_URI[sha256sum] = "eeff52178ce2916a0e07b531bb23c8b105826b6e6e6c5f7c90e33f757827a7c7"
-SRC_URI[sha256sum] = "1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de"
diff --git a/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch b/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch
deleted file mode 100644
index 353126fe..00000000
--- a/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3fcc81ad127c267018aed96a359bbf01db1bd8ee Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Sat, 1 Apr 2017 11:43:31 -0700
-Subject: [PATCH] zc: Force 4.10 get_user_pages_remote API
-This change forces the newer API, as the linux-intel 4.9-LTS kernel
-backported the 4.10 API change in the page handling code.
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
- zc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/zc.c b/zc.c
-index ae464ff..b2759ce 100644
--- a/zc.c
-+++ b/zc.c
-@@ -65,7 +65,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
- #elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0))
-        ret = get_user_pages_remote(task, mm,
-                        (unsigned long)addr, pgcount, write, 0, pg, NULL);
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0))
-+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) & 0)
-        ret = get_user_pages_remote(task, mm,
-                        (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
-                        pg, NULL);
diff --git a/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
deleted file mode 100644
index c59ddb2f..00000000
--- a/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
-python() {
-    # When we add more kernels for linux-intel, we may have to add a Version check
-    if (d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel"):
-        src_uri = d.getVar("SRC_URI")
-        d.setVar("SRC_URI", src_uri +
-             " file://0001-zc-Force-4.10-get_user_pages_remote-API.patch")
-}
diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch
deleted file mode 100644
index 0041af57..00000000
--- a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5f87ef7ed60bc9762467184ed0a6d000b80713d9 Mon Sep 17 00:00:00 2001
-From: sweeaun <swee.aun.khor@intel.com>
-Date: Sun, 8 Apr 2018 17:21:52 +0800
-Subject: [PATCH] ixgbe: skip host depmod
-Upstream-Status: Inappropriate [Cross-Compile]
-Depmod during do_install is irrelevant when cross-compiling.
-Remove the depmod steps during do_install.
-Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-diff --git a/Makefile b/Makefile
-index 545489a..07e422f 100644
--- a/Makefile
-+++ b/Makefile
-@@ -141,8 +141,6 @@ install: default manfile
-        @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz
-        @echo "Installing modules..."
-        @+$(call devkernelbuild,modules_install)
-       @echo "Running depmod..."
-       @$(call cmd_depmod)
- 
- uninstall:
-        rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko;
-- 
-2.7.4
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb b/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb
new file mode 100644
index 00000000..7ef38650
--- /dev/null
+++ b/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb
@@ -0,0 +1,43 @@
+SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE"
+DESCRIPTION="The ixgbe driver supports 82598- and 82599-based \
+PCI Express* 10 Gigabit Network Connections."
+HOMEPAGE = "https://sourceforge.net/projects/e1000/"
+SECTION = "kernel/network"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
+SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
+           "
+SRC_URI[sha256sum] = "a844f1fea8064e30b276792455c3b286c1d7af26731e8f865d4a4e9ed1dcf4ab"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/"
+UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/"
+CVE_PRODUCT = "linux:linux_kernel_ixgbe"
+S = "${WORKDIR}/${BP}/src"
+EXTRA_OEMAKE=' KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
+KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbe"
+KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbe"
+inherit module
+do_install:append () {
+        # Install scripts/set_irq_affinity
+        install -d      ${D}${sysconfdir}/network
+        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
+        rm -rf ${D}${prefix}/man
+}
+PACKAGES += "${PN}-script"
+FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity"
+EXCLUDE_FROM_WORLD = "1"
+CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1"
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb b/recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb
deleted file mode 100644
index 8d71ac55..00000000
--- a/recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE"
-DESCRIPTION="The ixgbe driver supports 82598- and 82599-based \
-PCI Express* 10 Gigabit Network Connections."
-HOMEPAGE = "https://sourceforge.net/projects/e1000/"
-SECTION = "kernel/network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
-           file://0001-ixgbe-skip-host-depmod.patch \
-           "
-SRC_URI[md5sum] = "d6816f2b6b8bddfa2d78267f84770d91"
-SRC_URI[sha256sum] = "6ba26de1bb9b55b92f5f54c6c7b25f837323ec3322a6ee54e882c8e54e6d0eaa"
-S = "${WORKDIR}/${BP}/src"
-MODULES_INSTALL_TARGET = "install"
-EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
-KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbe"
-KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe"
-inherit module
-do_install_append () {
-        # Install scripts/set_irq_affinity
-        install -d      ${D}${sysconfdir}/network
-        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
-        rm -rf ${D}${prefix}/man
-}
-PACKAGES += "${PN}-script"
-FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity"
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch
deleted file mode 100644
index 49a59496..00000000
--- a/recipes-kernel/intel-ethernet/ixgbevf/0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b1d7f46442e50458311573443a5c78637874f62b Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 12 Apr 2018 11:46:15 +0800
-Subject: [PATCH] Makefile: check for CONFIG_IXGBEVF instead
-Check for the correct config, otherwise it won't build with kbuild.
-Upstream-Status: Pending
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Makefile b/Makefile
-index 968ef5e..e3cb81b 100644
--- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ ifneq ($(KERNELRELEASE),)
- # Makefile for the Intel(R) 10GbE PCI Express Virtual Function Driver
- #
- 
-obj-$(CONFIG_IXGBE) += ixgbevf.o
-+obj-$(CONFIG_IXGBEVF) += ixgbevf.o
- 
- define ixgbevf-y
-        ixgbevf_main.o
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch
deleted file mode 100644
index 656a897d..00000000
--- a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9677d09f5c3984997ac8e7d90b5d4b11fb9ce277 Mon Sep 17 00:00:00 2001
-From: sweeaun <swee.aun.khor@intel.com>
-Date: Sat, 7 Oct 2017 20:56:35 -0700
-Subject: [PATCH] ixgbevf: skip host depmod
-Upstream-Status: Inappropriate [Cross-Compile]
-Depmod during do_install is irrelevant when cross-compiling.
-Remove the depmod steps during do_install.
-Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-diff --git a/Makefile b/Makefile
-index 91df705..1dcf350 100644
--- a/Makefile
-+++ b/Makefile
-@@ -104,8 +104,6 @@ modules_install: default manfile
-        @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz
-        @echo "Installing modules..."
-        @+$(call kernelbuild,modules_install)
-       @echo "Running depmod..."
-       @$(call cmd_depmod)
- 
- uninstall:
-        rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko;
-- 
-2.7.4
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.3.5.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.18.7.bb
index 6f1ca081..b21796c6 100644
--- a/recipes-kernel/intel-ethernet/ixgbevf_4.3.5.bb
+++ b/recipes-kernel/intel-ethernet/ixgbevf_4.18.7.bb
@@ -7,28 +7,29 @@ The guest OS loading this driver must support MSI-X interrupts."
 HOMEPAGE = "https://sourceforge.net/projects/e1000/"
 SECTION = "kernel/network"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
-           file://0001-ixgbevf-skip-host-depmod.patch \
-           file://0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch \
           "
-SRC_URI[md5sum] = "cdd9c52f034223c114d4b10345d11fe9"
+SRC_URI[sha256sum] = "90f6cd614008839b6fc748ae0f4ad3503435f8b788318d4f40cfc83c7029025e"
-SRC_URI[sha256sum] = "f2ae017462bd1ea8082710580ec3dadfc322a0b2ecd4a576a16f0a4b622e5968"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"
+UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/"
+CVE_PRODUCT = "linux:linux_kernel_ixgbe"
 S = "${WORKDIR}/${BP}/src"
-MODULES_INSTALL_TARGET = "install"
-EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
+EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
-KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf"
+KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbevf"
-KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf"
+KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbevf"
 inherit module
-do_install_append () {
+do_install:append () {
        # Install scripts/set_irq_affinity
        install -d      ${D}${sysconfdir}/network
        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
@@ -38,4 +39,8 @@ do_install_append () {
 PACKAGES += "${PN}-script"
-FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity"
+FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity"
+CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1"
+EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch b/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch
deleted file mode 100644
index 4fdc36f7..00000000
--- a/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ecb29b78ce946c802058be0c46a0d20432f412e5 Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Thu, 28 Sep 2017 10:51:15 -0700
-Subject: [PATCH] hrtimer: fix version numbers because production kernel has
- update
-Decrease the version check because the OTC production kernel which is
-4.9 includes the HRTimer code that this is using.
-Upstream-Status: [Backport] It's been backported into the older kernel
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
- backport-include/linux/hrtimer.h                        | 2 +-
- drivers/net/wireless/intel/iwlwifi/mvm/tx.c             | 2 +-
- drivers/net/wireless/intel/iwlwifi/pcie/tx.c            | 2 +-
- drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c | 2 +-
- net/mac80211/tx.c                                       | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/backport-include/linux/hrtimer.h b/backport-include/linux/hrtimer.h
-index bdcf106e1..ae128852d 100644
--- a/backport-include/linux/hrtimer.h
-+++ b/backport-include/linux/hrtimer.h
-@@ -4,7 +4,7 @@
- #include_next <linux/hrtimer.h>
- #include <linux/interrupt.h>
- 
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
- static inline void backport_hrtimer_start(struct hrtimer *timer, s64 time,
-                                          const enum hrtimer_mode mode)
- {
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-index cf1f95a01..e6f1ff294 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-@@ -1310,7 +1310,7 @@ static void iwl_mvm_tx_lat_add_ts_ack(struct sk_buff *skb)
-        s64 ts_1 = ktime_to_ns(skb->tstamp) >> 32;
-        s64 diff = temp - ts_1;
- 
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        skb->tstamp.tv64 += diff;
- #else
-        skb->tstamp += diff;
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
-index df81bce25..ad664bacd 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
-@@ -1955,7 +1955,7 @@ static void iwl_trans_pci_tx_lat_add_ts_write(struct sk_buff *skb)
-        s64 ts_1 = ktime_to_ns(skb->tstamp) >> 32;
-        s64 diff = temp - ts_1;
- 
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        skb->tstamp.tv64 += diff << 16;
- #else
-        skb->tstamp += diff << 16;
-diff --git a/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c b/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c
-index e4d45bcf7..cdd0ba9a2 100644
--- a/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c
-+++ b/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c
-@@ -796,7 +796,7 @@ void iwl_slv_tx_lat_add_ts_write(struct iwl_trans_slv *trans_slv,
- 
-        ts_1 = ktime_to_ns(data_entry->skb->tstamp) >> 32;
-        diff = temp - ts_1;
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        data_entry->skb->tstamp.tv64 += diff << 16;
- #else
-        data_entry->skb->tstamp += diff << 16;
-diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
-index 94a348688..0f226c413 100644
--- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -2278,7 +2278,7 @@ static void ieee80211_tx_latency_start_msrmnt(struct ieee80211_local *local,
-        if (!tx_latency && !tx_consec && !tx_thrshld)
-                return;
-        temp = ktime_to_ms(ktime_get());
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        skb->tstamp.tv64 += temp << 32;
- #else
-        skb->tstamp += temp << 32;
-- 
-2.13.5
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
index 0173ef83..ea36cfc3 100644
--- a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
+++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
@@ -1,13 +1,13 @@
 SUMMARY = "Intel Wireless LinuxCore kernel driver"
 DESCRIPTION = "Intel Wireless LinuxCore kernel driver"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 REQUIRED_DISTRO_FEATURES = "wifi"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-inherit module
+inherit module features_check
 # For some iwfwifi LinuxCore supported wireless chips, the best/latest
 # firmware blobs are found in the iwlwifi's linux-firmware.git fork.
@@ -17,16 +17,12 @@ inherit module
 # When updating this recipe, ensure that the proper firmware is included from
 # either the linux-firmware or iwlwifi-firmware repos.
-PV = "30"
+PV = "79"
-SRCREV = "b31221a99488021300e7f89d2ecf9bdd2bc52dd2"
+SRCREV = "574631d89d736fd2c76b0e2ea489270c50903e52"
-# Add a patch for Intel's Production Kernel as it's got a backport of HRTimers
-PK_PATCH = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel','linux-intel','file://0001-hrtimer-fix-version-numbers-because-production-kerne.patch','',d)}"
 SRC_URI = " \
-           git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV} \
+           git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/core${PV} \
           file://0001-Makefile.real-skip-host-install-scripts.patch \
-           ${PK_PATCH} \
           file://iwlwifi.conf \
          "
@@ -40,15 +36,19 @@ do_configure() {
 MODULES_INSTALL_TARGET="install"
-do_install_append() {
+do_install:append() {
        ## install configs and service scripts
        install -d ${D}${sysconfdir}/modprobe.d
        install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
 }
-RDEPENDS_${PN} = "linux-firmware-iwlwifi"
+RDEPENDS:${PN} = "linux-firmware-iwlwifi"
+FILES:${PN} += "${sysconfdir}/modprobe.d/iwlwifi.conf"
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi"
 KERNEL_MODULE_PACKAGE_PREFIX = "backport-iwlwifi"
+EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-kernel/linux/linux-intel-rt_4.14.bb b/recipes-kernel/linux/linux-intel-rt_4.14.bb
deleted file mode 100644
index 688cf7a9..00000000
--- a/recipes-kernel/linux/linux-intel-rt_4.14.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require linux-intel.inc
-# Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
-# to build multiple virtual/kernel providers, e.g. as dependency of
-# core-image-rt-sdk, core-image-rt.
-python () {
-    if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
-        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
-}
-KBRANCH = "4.14/preempt-rt"
-KMETA_BRANCH = "yocto-4.14"
-# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
-SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
-DEPENDS += "elfutils-native openssl-native util-linux-native"
-LINUX_VERSION ?= "4.14.40"
-SRCREV_machine ?= "9e7ff06e56a4938e43c09273107876c22eed1398"
-SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842"
-LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/recipes-kernel/linux/linux-intel-rt_4.9.bb b/recipes-kernel/linux/linux-intel-rt_4.9.bb
deleted file mode 100644
index 86233811..00000000
--- a/recipes-kernel/linux/linux-intel-rt_4.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require linux-intel.inc
-# Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
-# to build multiple virtual/kernel providers, e.g. as dependency of
-# core-image-rt-sdk, core-image-rt.
-python () {
-    if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
-        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
-}
-KBRANCH = "4.9/yocto/base-rt"
-KMETA_BRANCH = "yocto-4.9"
-LINUX_VERSION ?= "4.9.84"
-SRCREV_machine ?= "33b17c3a62dc470c849f85ce2a90cfa90e96bcf5"
-SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
-LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/recipes-kernel/linux/linux-intel-rt_6.6.bb b/recipes-kernel/linux/linux-intel-rt_6.6.bb
new file mode 100644
index 00000000..342679eb
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel-rt_6.6.bb
@@ -0,0 +1,33 @@
+require linux-intel.inc
+SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
+                    "
+# Skip processing of this recipe if it is not explicitly specified as the
+# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
+# to build multiple virtual/kernel providers, e.g. as dependency of
+# core-image-rt-sdk, core-image-rt.
+python () {
+    if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
+        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
+}
+KBRANCH = "6.6/preempt-rt"
+KMETA_BRANCH = "yocto-6.6"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
+LINUX_VERSION ?= "6.6.25"
+SRCREV_machine ?= "f8939454cf9bb7277239bb44e90c99474c599f37"
+SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
+LINUX_KERNEL_TYPE = "preempt-rt"
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.6.(\d+)-rt(\d)-preempt-rt-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 2525c70d..f78f5205 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -1,26 +1,24 @@
 require recipes-kernel/linux/linux-yocto.inc
 require recipes-kernel/linux/meta-intel-compat-kernel.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:"
 KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}"
 SRC_URI = " \
-           git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
-           file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
           ${KERNEL_CONFIG_URI} \
+           file://0001-vt-conmakehash-improve-reproducibility.patch \
+           file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
+           file://fix-perf-reproducibility.patch \
+           file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+           file://0002-mconf-fix-output-of-cflags-and-libraries.patch \
          "
-SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
-LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "2"
+KCONF_BSP_AUDIT_LEVEL = "0"
-COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)"
+COMPATIBLE_MACHINE ?= "(intel-corei7-64)"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
diff --git a/recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch
new file mode 100644
index 00000000..d41c3f0b
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch
@@ -0,0 +1,48 @@
+From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 10 Jul 2022 22:56:53 -0400
+Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
+The script build_OID_registry captures the full path of itself
+in the generated data. This causes reproduciblity issues as the
+path is captured and packaged.
+We use the basename of the script instead, and that allows us
+to be reprodicible, with slightly less information captured in
+the output data (but the generating script can still easily
+be found).
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+Upstream-Status: Inappropriate
+Taken from linux-yocto, v5.15/standard/base.
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ lib/build_OID_registry | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index d7fc32ea8ac2..f6de0a7f7457 100755
+--- a/lib/build_OID_registry
+++ b/lib/build_OID_registry
+@@ -8,6 +8,7 @@
+ #
+ 
+ use strict;
+use File::Basename;
+ 
+ my @names = ();
+ my @oids = ();
+@@ -35,7 +36,7 @@ close IN_FILE || die;
+ #
+ open C_FILE, ">$ARGV[1]" or die;
+ print C_FILE "/*\n";
+-print C_FILE " * Automatically generated by ", $0, ".  Do not edit\n";
+print C_FILE " * Automatically generated by ", basename $0, ".  Do not edit\n";
+ print C_FILE " */\n";
+ 
+ #
+-- 
+2.36.1
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
deleted file mode 100644
index a9e9213b..00000000
--- a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001
-From: Jason Wessel <jason.wessel@windriver.com>
-Date: Thu, 25 Sep 2014 11:26:49 -0700
-Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses
- location
-In some cross build environments such as the Yocto Project build
-environment it provides an ncurses library that is compiled
-differently than the host's version.  This causes display corruption
-problems when the host's curses includes are used instead of the
-includes from the provided compiler are overridden.  There is a second
-case where there is no curses libraries at all on the host system and
-menuconfig will just fail entirely.
-The solution is simply to allow an override variable in
-check-lxdialog.sh for environments such as the Yocto Project.  Adding
-a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
-compiling and linking against the right headers and libraries.
-Upstream-Status: submitted [https://lkml.org/lkml/2013/3/3/103]
-Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-cc: Michal Marek <mmarek@suse.cz>
-cc: linux-kbuild@vger.kernel.org
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++
- 1 file changed, 8 insertions(+)
- mode change 100755 => 100644 scripts/kconfig/lxdialog/check-lxdialog.sh
-diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
-old mode 100755
-new mode 100644
-index 5075ebf2d3b9..ba9242101190
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
-+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
-@@ -4,6 +4,10 @@
- # What library to link
- ldflags()
- {
-+       if [ "$CROSS_CURSES_LIB" != "" ]; then
-+               echo "$CROSS_CURSES_LIB"
-+               exit
-+       fi
-        pkg-config --libs ncursesw 2>/dev/null && exit
-        pkg-config --libs ncurses 2>/dev/null && exit
-        for ext in so a dll.a dylib ; do
-@@ -21,6 +25,10 @@ ldflags()
- # Where is ncurses.h?
- ccflags()
- {
-+       if [ x"$CROSS_CURSES_INC" != x ]; then
-+               echo "$CROSS_CURSES_INC"
-+               exit
-+       fi
-        if pkg-config --cflags ncursesw 2>/dev/null; then
-                echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
-        elif pkg-config --cflags ncurses 2>/dev/null; then
-- 
-2.14.3
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
new file mode 100644
index 00000000..a601e783
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
@@ -0,0 +1,52 @@
+From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH 1/2] menuconfig,mconf-cfg: Allow specification of ncurses
+ location
+In some cross build environments such as the Yocto Project build
+environment it provides an ncurses library that is compiled
+differently than the host's version.  This causes display corruption
+problems when the host's curses includes are used instead of the
+includes from the provided compiler are overridden.  There is a second
+case where there is no curses libraries at all on the host system and
+menuconfig will just fail entirely.
+The solution is simply to allow an override variable in
+check-lxdialog.sh for environments such as the Yocto Project.  Adding
+a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+compiling and linking against the right headers and libraries.
+Upstream-Status: Submitted
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+cc: Michal Marek <mmarek@suse.cz>
+cc: linux-kbuild@vger.kernel.org
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index 1e61f50a5905..38cf8304bb31 100755
+--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
+@@ -7,6 +7,14 @@ libs=$2
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
+if [ "$CROSS_CURSES_LIB" != "" ]; then
+    echo libs=\'$CROSS_CURSES_LIB\'
+    if [ x"$CROSS_CURSES_INC" != x ]; then
+       echo cflags=\'$CROSS_CURSES_INC\'
+    fi
+    exit 0
+fi
+
+ if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+        if ${HOSTPKG_CONFIG} --exists $PKG; then
+                ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+-- 
+2.34.1
diff --git a/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch b/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch
deleted file mode 100644
index 5c8b27c7..00000000
--- a/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 57af599929263e7bb6f2f369c9e4bc1e440528a9 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 21 Aug 2017 13:52:53 -0400
-Subject: [PATCH 1/1] perf: x86-32: explicitly include <errno.h>
-Upstream-Status: submitted
-The 32bit x86 perf build does not find the system definitions of error
-return values, hence we end up with:
-| In file included from util/libunwind/x86_32.c:32:0:
-| util/libunwind/../../arch/x86/util/unwind-libunwind.c: In function 'libunwind__x86_reg_id':
-| util/libunwind/../../arch/x86/util/unwind-libunwind.c:109:11: error: 'EINVAL' undeclared (first use in this function); did you mean 'UNW_EINVAL'?
-|    return -EINVAL;
-|            ^~~~~~
-|            UNW_EINVAL
-By explicitly including errno.h, we can fix this build without impacting
-other architectures.
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
- tools/perf/util/libunwind/x86_32.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/tools/perf/util/libunwind/x86_32.c b/tools/perf/util/libunwind/x86_32.c
-index 957ffff72428..d781f7bdeb88 100644
--- a/tools/perf/util/libunwind/x86_32.c
-+++ b/tools/perf/util/libunwind/x86_32.c
-@@ -20,6 +20,7 @@
- #define LIBUNWIND__ARCH_REG_IP PERF_REG_X86_IP
- #define LIBUNWIND__ARCH_REG_SP PERF_REG_X86_SP
- 
-+#include <errno.h>
- #include "unwind.h"
- #include "debug.h"
- #include "libunwind-x86.h"
-- 
-2.14.3
diff --git a/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch
new file mode 100644
index 00000000..33280063
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch
@@ -0,0 +1,58 @@
+From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 10 Jul 2022 21:37:07 -0400
+Subject: [PATCH] vt/conmakehash: improve reproducibility
+The file generated by conmakehash capture the application
+path used to generate the file. While that can be informative,
+it varies based on where the kernel was built, as the full
+path is captured.
+We tweak the application to use a second input as the "capture
+name", and then modify the Makefile to pass the basename of
+the source, making it reproducible.
+This could be improved by using some sort of path mapping,
+or the application manipualing argv[1] itself, but for now
+this solves the reprodicibility issue.
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+Upstream-Status: Inappropriate
+Taken from linux-yocto, v5.15/standard/base
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ drivers/tty/vt/Makefile      | 2 +-
+ drivers/tty/vt/conmakehash.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
+index fe30ce512819..cb51c21b58f9 100644
+--- a/drivers/tty/vt/Makefile
+++ b/drivers/tty/vt/Makefile
+@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
+ hostprogs += conmakehash
+ 
+ quiet_cmd_conmk = CONMK   $@
+-      cmd_conmk = $(obj)/conmakehash $< > $@
+      cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
+ 
+ $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
+        $(call cmd,conmk)
+diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
+index cddd789fe46e..d62510b280e9 100644
+--- a/drivers/tty/vt/conmakehash.c
+++ b/drivers/tty/vt/conmakehash.c
+@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
+ #include <linux/types.h>\n\
+ \n\
+ u8 dfont_unicount[%d] = \n\
+-{\n\t", argv[1], fontlen);
+{\n\t", argv[2], fontlen);
+ 
+   for ( i = 0 ; i < fontlen ; i++ )
+     {
+-- 
+2.36.1
diff --git a/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch
new file mode 100644
index 00000000..a96b68d9
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch
@@ -0,0 +1,40 @@
+From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Mon, 17 Jul 2023 17:17:55 -0400
+Subject: [PATCH 2/2] mconf: fix output of cflags and libraries
+commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce
+process forks] changes the way that flags are detected. They are
+no longer just echo'd and captured, they are written to a file and
+later read.
+We adjust our CROSS ncurses patch accordingly.
+We'll eventually be able to drop this patch, but not quite yet.
+Upstream-Status: Inappropriate  [OE-Specific]
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index 38cf8304bb31..a5ae56e08b07 100755
+--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
+@@ -8,9 +8,9 @@ PKG="ncursesw"
+ PKG2="ncurses"
+ 
+ if [ "$CROSS_CURSES_LIB" != "" ]; then
+-    echo libs=\'$CROSS_CURSES_LIB\'
+    echo $CROSS_CURSES_LIB > ${libs}
+     if [ x"$CROSS_CURSES_INC" != x ]; then
+-       echo cflags=\'$CROSS_CURSES_INC\'
+       echo $CROSS_CURSES_INC > ${cflags}
+     fi
+     exit 0
+ fi
+-- 
+2.34.1
diff --git a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg b/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
deleted file mode 100644
index f7d7322e..00000000
--- a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_FLORIDA_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_WM8281_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
diff --git a/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch
new file mode 100644
index 00000000..1a98b1db
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch
@@ -0,0 +1,39 @@
+From b8cd0e429bf75b673c438a8277d4bc74327df992 Mon Sep 17 00:00:00 2001
+From: Tom Zanussi <tom.zanussi@intel.com>
+Date: Tue, 3 Jul 2012 13:07:23 -0500
+Subject: perf: change --root to --prefix for python install
+Otherwise we get the sysroot path appended to the build path, not what
+we want.
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+Upstream-Status: Inappropriate
+Taken from linux-yocto, v5.15/standard/base
+https://git.yoctoproject.org/linux-yocto/commit?id=b8cd0e429bf75b673c438a8277d4bc74327df992&h=v5.15%2Fstandard%2Fbase
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ tools/perf/Makefile.perf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+(limited to 'tools/perf/Makefile.perf')
+diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
+index 8f738e11356d..ee945d8e3996 100644
+--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
+@@ -1022,7 +1022,7 @@ install-bin: install-tools install-tests install-traceevent-plugins
+ install: install-bin try-install-man
+ 
+ install-python_ext:
+-       $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
+       $(PYTHON_WORD) util/setup.py --quiet install --prefix='$(DESTDIR_SQ)/usr'
+ 
+ # 'make install-doc' should call 'make -C Documentation install'
+ $(INSTALL_DOC_TARGETS):
+-- 
+cgit 
diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb
deleted file mode 100644
index f9e07efb..00000000
--- a/recipes-kernel/linux/linux-intel_4.14.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require linux-intel.inc
-KBRANCH = "4.14/base"
-KMETA_BRANCH = "yocto-4.14"
-# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
-SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
-DEPENDS += "elfutils-native openssl-native util-linux-native"
-LINUX_VERSION ?= "4.14.40"
-SRCREV_machine ?= "de459f4df74cd7d586fc1560bb4249507490be5d"
-SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842"
-# For Crystalforest and Romley
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb
deleted file mode 100644
index d6ba58ac..00000000
--- a/recipes-kernel/linux/linux-intel_4.9.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require linux-intel.inc
-KBRANCH = "4.9/yocto/base"
-KMETA_BRANCH = "yocto-4.9"
-LINUX_VERSION ?= "4.9.99"
-SRCREV_machine ?= "13ee9d9ef164b9a74f22bc97d1e504afe491134c"
-SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
-# For Crystalforest and Romley
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
diff --git a/recipes-kernel/linux/linux-intel_6.6.bb b/recipes-kernel/linux/linux-intel_6.6.bb
new file mode 100644
index 00000000..3b917bfa
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel_6.6.bb
@@ -0,0 +1,21 @@
+require linux-intel.inc
+SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
+                    "
+KBRANCH = "6.6/linux"
+KMETA_BRANCH = "yocto-6.6"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
+LINUX_VERSION ?= "6.6.25"
+SRCREV_machine ?= "lts-v6.6.25-linux-240415T215440Z"
+SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.6.(\d+)-linux-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-intel_6.8.bb b/recipes-kernel/linux/linux-intel_6.8.bb
new file mode 100644
index 00000000..036879db
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel_6.8.bb
@@ -0,0 +1,20 @@
+require linux-intel.inc
+SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
+                  "
+KMETA_BRANCH = "master"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
+LINUX_VERSION ?= "6.8"
+SRCREV_machine ?= "efbae83db36abbbbdb946d4f7bbdfda174107cd2"
+SRCREV_meta ?= "27907f391a4fc508da21358b13419c6e86926c34"
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.7-rc3-linux-(?P<pver>(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index 6173148c..deb19940 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,21 +1,21 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
+COMPATIBLE_MACHINE:core2-32-intel-common = "${MACHINE}"
-KMACHINE_core2-32-intel-common = "intel-core2-32"
+KMACHINE:core2-32-intel-common = "intel-core2-32"
-KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KERNEL_FEATURES:append:core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
+COMPATIBLE_MACHINE:corei7-64-intel-common = "${MACHINE}"
-KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KMACHINE:corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KERNEL_FEATURES:append:corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV
 # and setting them here breaks the default mechanism to use AUTOREV if the
 # default SRCREV is set and linux-yocto-dev is the preferred provider.
 # For Crystalforest and Romley
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
+KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
+KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio"
 # For FRI2, NUC
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi"
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
index daa7dd6b..daa7dd6b 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.14.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.14.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto-rt_4.14.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.15.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.15.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto-rt_4.15.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend b/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
deleted file mode 100644
index e8c27707..00000000
--- a/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
-KERNEL_FEATURES_INTEL_COMMON ?= ""
-COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-KBRANCH_core2-32-intel-common = "standard/tiny/base"
-KBRANCH_corei7-64-intel-common = "standard/tiny/base"
-KMACHINE_core2-32-intel-common = "intel-core2-32"
-KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
-KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index 7c29be14..9f3d43e3 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,4 +1,6 @@
+require meta-intel-compat-kernel.inc
 # The kernel build is 64-bit regardless, so include both common overrides.
 # Without this, the kernel will be missing vars that make it buildable for the
 # intel-corei7-64 machine.
-MACHINEOVERRIDES_prepend_corei7-64-x32-intel-common = "corei7-64-intel-common:"
+MACHINEOVERRIDES:prepend:corei7-64-x32-intel-common = "corei7-64-intel-common:"
diff --git a/recipes-kernel/linux/linux-yocto_4.12.bbappend b/recipes-kernel/linux/linux-yocto_4.12.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto_4.12.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/linux-yocto_4.14.bbappend b/recipes-kernel/linux/linux-yocto_4.14.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto_4.14.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/linux-yocto_4.15.bbappend b/recipes-kernel/linux/linux-yocto_4.15.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto_4.15.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc
index be5056c2..0c861e13 100644
--- a/recipes-kernel/linux/meta-intel-compat-kernel.inc
+++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc
@@ -3,11 +3,12 @@
 KERNEL_FEATURES_INTEL_COMMON ?= ""
-COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}"
+COMPATIBLE_MACHINE:intel-x86-common = "${MACHINE}"
-KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KMACHINE:corei7-64-intel-common = "intel-corei7-64"
-KMACHINE_core2-32-intel-common = "intel-core2-32"
+KMACHINE:core2-32-intel-common = "intel-core2-32"
+KMACHINE:x86-64-v3-intel-common = "intel-corei7-64"
 INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915"
-KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"
+KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"
diff --git a/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch b/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch
deleted file mode 100644
index 32b49b8d..00000000
--- a/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ebfdc8b8af17f9cf23c6878eb52476fde7b48e5c Mon Sep 17 00:00:00 2001
-From: Priyalee Kushwaha <priyalee.kushwaha@intel.com>
-Date: Fri, 22 Sep 2017 14:40:57 -0700
-Subject: [PATCH] lttng-modules: PKT 4.9 yocto build failed
-PKT 4.9 yocto kernel backports a patch from upstream and that
-changes header include/linux/ktimer.h. Since this backported
-patch is only relevant for PKT kernel, we need to carry this
-patch.
-Upstream-Status: Backport
-Signed-off-by: Kushwaha, Priyalee <priyalee.kushwaha@intel.com>
---
- instrumentation/events/lttng-module/timer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h
-index d62fd25..59da988 100644
--- a/instrumentation/events/lttng-module/timer.h
-+++ b/instrumentation/events/lttng-module/timer.h
-@@ -16,11 +16,11 @@ struct timer_list;
- 
- #endif /* _TRACE_TIMER_DEF_ */
- 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0))
- #define lttng_ktime_get_tv64(kt)       (kt)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) */
- #define lttng_ktime_get_tv64(kt)       ((kt).tv64)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) */
- 
- LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
- 
-- 
-2.7.4
diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend
deleted file mode 100644
index dc1c4a74..00000000
--- a/recipes-kernel/lttng/lttng-modules_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
-LTTNG_PATCH = "${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/kernel','linux-intel linux-intel-rt','file://0002-lttng-modules-PKT-4.9-yocto-build-failed.patch','',d)}"
-SRC_URI_append_intel-x86-common = " ${LTTNG_PATCH}"
diff --git a/recipes-multimedia/itt/itt_3.24.6.bb b/recipes-multimedia/itt/itt_3.24.6.bb
new file mode 100644
index 00000000..1c4759f9
--- /dev/null
+++ b/recipes-multimedia/itt/itt_3.24.6.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Intel® Instrumentation and Tracing Technology (ITT) and Just-In-Time (JIT) API"
+DESCRIPTION = "The Instrumentation and Tracing Technology (ITT) API enables \
+application to generate and control the collection of trace data during its \
+execution across different Intel tools."
+LICENSE = "BSD-3-Clause & GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c722edeca7b \
+                    file://LICENSES/GPL-2.0-only.txt;md5=e2d76e7801260c21b90eea3605508ad6 \
+                    "
+SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master"
+SRCREV = "ec077431fc725dba590b09b2cec5137878b14783"
+S = "${WORKDIR}/git"
+PE = "1"
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+inherit pkgconfig cmake
+EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release"
+EXTRA_OECMAKE += "${@oe.utils.conditional('TARGET_ARCH','x86_64','','-DFORCE_32=ON',d)}"
+do_install() {
+     install -d -m 755 ${D}${libdir} ${D}${includedir}/ittnotify
+     install -m 644 ${B}/bin/*.a ${D}${libdir}
+     cp -r ${S}/include/* ${D}${includedir}/ittnotify
+     cp -r ${S}/src/ittnotify/*.h ${D}${includedir}/ittnotify
+     rm -r ${D}${includedir}/ittnotify/fortran/win32
+     if [ "${TARGET_ARCH}" = "x86_64" ]; then
+        rm -r ${D}${includedir}/ittnotify/fortran/posix/x86
+     else
+        rm -r ${D}${includedir}/ittnotify/fortran/posix/x86_64
+     fi
+}
+RDEPENDS:${PN}-dev:remove = "${PN} (= ${EXTENDPKGV})"
diff --git a/recipes-multimedia/libva/files/0001-Disable-vp9-padding-on-mtl.patch b/recipes-multimedia/libva/files/0001-Disable-vp9-padding-on-mtl.patch
new file mode 100644
index 00000000..90dff8d1
--- /dev/null
+++ b/recipes-multimedia/libva/files/0001-Disable-vp9-padding-on-mtl.patch
@@ -0,0 +1,35 @@
+From 1b303f417113ad1aa6b63fc024fbe4aa0c943f57 Mon Sep 17 00:00:00 2001
+From: Lim Siew Hoon <siew.hoon.lim@intel.com>
+Date: Tue, 5 Sep 2023 16:13:42 +0800
+Subject: [PATCH 01/12] Disable vp9 padding on mtl.
+Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1720]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp
+index 844545a87..72265289c 100644
+--- a/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp
+++ b/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp
+@@ -284,7 +284,7 @@ static bool InitMtlMediaWaExt(struct GfxDeviceInfo *devInfo,
+ 
+     MEDIA_WR_WA(waTable, WaDisableSetObjectCapture, 1);
+ 
+-    MEDIA_WR_WA(waTable, Wa_Vp9UnalignedHeight, 1);
+    MEDIA_WR_WA(waTable, Wa_Vp9UnalignedHeight, 0);
+ 
+     MEDIA_WR_WA(waTable, Wa_15013355402, 1);
+ 
+@@ -337,4 +337,4 @@ static struct LinuxDeviceInit arlDeviceInit =
+ };
+ 
+ static bool arlDeviceRegister = DeviceInfoFactory<LinuxDeviceInit>::
+-    RegisterDevice((uint32_t)IGFX_ARROWLAKE, &arlDeviceInit);
+\ No newline at end of file
+    RegisterDevice((uint32_t)IGFX_ARROWLAKE, &arlDeviceInit);
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0002-Force-ARGB-surface-to-tile4-for-ACM.patch b/recipes-multimedia/libva/files/0002-Force-ARGB-surface-to-tile4-for-ACM.patch
new file mode 100644
index 00000000..df3d9805
--- /dev/null
+++ b/recipes-multimedia/libva/files/0002-Force-ARGB-surface-to-tile4-for-ACM.patch
@@ -0,0 +1,44 @@
+From 1580f01ec5ad5afdad58c39dded999494275be10 Mon Sep 17 00:00:00 2001
+From: Lim Siew Hoon <siew.hoon.lim@intel.com>
+Date: Wed, 11 Oct 2023 15:36:21 +0800
+Subject: [PATCH 02/12] Force ARGB surface to tile4 for ACM
+Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1728]
+Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ media_driver/linux/common/ddi/media_libva_util.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+diff --git a/media_driver/linux/common/ddi/media_libva_util.cpp b/media_driver/linux/common/ddi/media_libva_util.cpp
+index 63c173419..73be76366 100755
+--- a/media_driver/linux/common/ddi/media_libva_util.cpp
+++ b/media_driver/linux/common/ddi/media_libva_util.cpp
+@@ -504,6 +504,7 @@ VAStatus DdiMediaUtil_AllocateSurface(
+                         gmmCustomParams.Flags.Gpu.UnifiedAuxSurface = 0;
+                     }
+                 }
+
+                 break;
+             case TILING_X:
+                 gmmCustomParams.Flags.Info.TiledX = true;
+@@ -685,6 +686,15 @@ VAStatus DdiMediaUtil_AllocateSurface(
+                         }
+                     }
+                 }
+                // There's no VAAPI interface for modifier query yet. As a workaround, always allocate
+                // RGB surface as tile4.
+                if ((format == Media_Format_A8R8G8B8 ||
+                     format == Media_Format_B10G10R10A2 |
+                     format == Media_Format_A8B8G8R8 ||
+                     format == Media_Format_X8R8G8B8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY))
+                {
+                    gmmParams.Flags.Info.Tile4 = true;
+                }
+                 break;
+             case TILING_X:
+                 gmmParams.Flags.Info.TiledX    = true;
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch
new file mode 100644
index 00000000..59fff127
--- /dev/null
+++ b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch
@@ -0,0 +1,45 @@
+From bb860c0bfe53060925b1dce50da4e6e94cfc8cae Mon Sep 17 00:00:00 2001
+From: huangli2018 <li.h.huang@intel.com>
+Date: Wed, 20 Dec 2023 15:47:43 +0800
+Subject: [PATCH 04/13] Add device ID for ARL
+Add device ID for ARL
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/95cbfce81cafa3c24d9d4601d41a855093bc51fb]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp       | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
+index 426bd795f..7b73dfaff 100644
+--- a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
+++ b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
+@@ -1,6 +1,6 @@
+ /*===================== begin_copyright_notice ==================================
+ 
+-Copyright (c) 2022, Intel Corporation
+Copyright (c) 2023, Intel Corporation
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+@@ -218,4 +218,13 @@ static struct GfxDeviceInfo arlInfo = {
+ };
+ 
+ static bool arlsDevice7d67 = DeviceInfoFactory<GfxDeviceInfo>::
+-    RegisterDevice(0x7D67, &arlInfo);
+\ No newline at end of file
+    RegisterDevice(0x7D67, &arlInfo);
+
+static bool arlhDevice7d51 = DeviceInfoFactory<GfxDeviceInfo>::
+    RegisterDevice(0x7D51, &arlInfo);
+
+static bool arlhDevice7dd1 = DeviceInfoFactory<GfxDeviceInfo>::
+    RegisterDevice(0x7DD1, &arlInfo);
+
+static bool arlhDevice7d41 = DeviceInfoFactory<GfxDeviceInfo>::
+    RegisterDevice(0x7D41, &arlInfo);
+\ No newline at end of file
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch
new file mode 100644
index 00000000..a9cd2317
--- /dev/null
+++ b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch
@@ -0,0 +1,34 @@
+From bbd3af94a6146d702909ff7e25b0c0547ecbb895 Mon Sep 17 00:00:00 2001
+From: jlui <jonathan.ming.jun.lui@intel.com>
+Date: Wed, 15 Nov 2023 10:48:34 +0800
+Subject: [PATCH 05/13] Add XR24 support to DMABuf
+This is to enable XR24/BGRX support for DMABuf
+Signed-off-by: Lui, Jonathan Ming Jun <jonathan.ming.jun.lui@intel.com>
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/3910b7029f5416fd0b5972f940c65d0a82c48c7b]
+Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h         | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
+index fdcca8873..2dcf440a4 100644
+--- a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
+++ b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
+@@ -55,8 +55,9 @@ static ProfileSurfaceAttribInfo surfaceAttribInfo_VAEntrypointVideoProc_VAProfil
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('4', '2', '2', 'V')}}},
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'A')}}},
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('B', 'G', 'R', 'A')}}},
+-    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, { VA_FOURCC('R', 'G', 'B', 'P')}}},
+    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'P')}}},
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'X')}}},
+    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('X', 'R', 'G', 'B')}}},
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('P', '0', '1', '0')}}},
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', '2', '4')}}},
+     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ARGB}}},
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch
new file mode 100644
index 00000000..5b04201a
--- /dev/null
+++ b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch
@@ -0,0 +1,214 @@
+From 67fb6128adf8fc03d429393e98f0982b42a40e64 Mon Sep 17 00:00:00 2001
+From: Zhang_Xinfeng <carl.zhang@intel.com>
+Date: Wed, 27 Dec 2023 09:59:29 +0800
+Subject: [PATCH 06/12] add INTEL MEDIA ALLOC refineE to specify the memory
+ alignment
+this key is used to allocate bigger pages
+env variable INTEL_MEDIA_ALLOC_refineE also could be used
+and was not enabled by default
+mode 0 is default mode
+mode 1 is < 64 align to 64
+mode 2 is > 1M &&  <= 3M align to 1M, >3M align to 2M
+mode 3 is mode 1 & mode 2
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/765dd939dcc5562d18cca18e5eda505bda952797]
+Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../linux/common/os/i915/mos_bufmgr.c         | 75 +++++++++++++++----
+ .../common/os/i915_production/mos_bufmgr.c    |  1 +
+ .../common/os/mos_context_specific_next.cpp   | 21 +++++-
+ .../common/os/mos_user_setting_specific.cpp   |  7 ++
+ 4 files changed, 90 insertions(+), 14 deletions(-)
+diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c
+index c0b3ba027..b623d0129 100644
+--- a/media_softlet/linux/common/os/i915/mos_bufmgr.c
+++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c
+@@ -138,7 +138,7 @@ struct mos_bufmgr_gem {
+     int exec_count;
+ 
+     /** Array of lists of cached gem objects of power-of-two sizes */
+-    struct mos_gem_bo_bucket cache_bucket[14 * 4];
+    struct mos_gem_bo_bucket cache_bucket[64];
+     int num_buckets;
+     time_t time;
+ 
+@@ -3852,9 +3852,9 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size)
+ }
+ 
+ static void
+-init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
+init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode)
+ {
+-    unsigned long size, cache_max_size = 64 * 1024 * 1024;
+    unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size;
+ 
+     /* OK, so power of two buckets was too wasteful of memory.
+      * Give 3 other sizes between each power of two, to hopefully
+@@ -3864,17 +3864,63 @@ init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
+      * width/height alignment and rounding of sizes to pages will
+      * get us useful cache hit rates anyway)
+      */
+-    add_bucket(bufmgr_gem, 4096);
+-    add_bucket(bufmgr_gem, 4096 * 2);
+-    add_bucket(bufmgr_gem, 4096 * 3);
+    /* alloc_mode 0 is default alloc_mode
+     * alloc_mode 1 rounding up to 64K for all < 1M
+     * alloc_mode 2 rounding up to 2M for size> 1M
+     * alloc_mode 3 rounding up to 2M for size > 1M and 64K for size <= 1M */
+    if( alloc_mode > 3 )
+        alloc_mode = 0;
+
+    if ( 0 == alloc_mode || 2 == alloc_mode)
+    {
+        // < 1M normal alloc_mode
+        add_bucket(bufmgr_gem, 4096);
+        add_bucket(bufmgr_gem, 4096 * 2);
+        add_bucket(bufmgr_gem, 4096 * 3);
+        /* Initialize the linked lists for BO reuse cache. */
+        for (size = 4 * 4096; size < 1024 * 1024; size *= 2) {
+            add_bucket(bufmgr_gem, size);
+            add_bucket(bufmgr_gem, size + size * 1 / 4);
+            add_bucket(bufmgr_gem, size + size * 2 / 4);
+            add_bucket(bufmgr_gem, size + size * 3 / 4);
+        }
+ 
+-    /* Initialize the linked lists for BO reuse cache. */
+-    for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
+-        add_bucket(bufmgr_gem, size);
+        add_bucket(bufmgr_gem, 1024 * 1024);
+    }
+    if (1 == alloc_mode || 3 == alloc_mode)
+    {
+        // < 1M 64k alignment
+        unit_size = 64 * 1024;
+        for (size = unit_size; size <= 1024 * 1024; size += unit_size)
+        {
+            add_bucket(bufmgr_gem, size);
+        }
+    }
+    if( 0 == alloc_mode || 1 == alloc_mode)
+    {
+       //> 1M is normal alloc_mode
+        add_bucket(bufmgr_gem, 1280 * 1024);
+        add_bucket(bufmgr_gem, 1536 * 1024);
+        add_bucket(bufmgr_gem, 1792 * 1024);
+
+        for (size = 2 * 1024 * 1024; size < cache_max_size; size *= 2) {
+            add_bucket(bufmgr_gem, size);
+            add_bucket(bufmgr_gem, size + size * 1 / 4);
+            add_bucket(bufmgr_gem, size + size * 2 / 4);
+            add_bucket(bufmgr_gem, size + size * 3 / 4);
+        }
+    }
+    if( 2 == alloc_mode || 3 == alloc_mode)
+    {
+       //> 1M rolling to 2M
+       unit_size = 2 * 1024 * 1024;
+       add_bucket(bufmgr_gem, unit_size);
+       add_bucket(bufmgr_gem, 3 * 1024 * 1024);
+ 
+-        add_bucket(bufmgr_gem, size + size * 1 / 4);
+-        add_bucket(bufmgr_gem, size + size * 2 / 4);
+-        add_bucket(bufmgr_gem, size + size * 3 / 4);
+       for (size = 4 * 1024 * 1024; size <= cache_max_size; size += unit_size)
+       {
+           add_bucket(bufmgr_gem, size);
+       }
+     }
+ }
+ 
+@@ -5100,6 +5146,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
+     struct drm_i915_gem_get_aperture aperture;
+     drm_i915_getparam_t gp;
+     int ret, tmp;
+    uint8_t alloc_mode;
+     bool exec2 = false;
+ 
+     pthread_mutex_lock(&bufmgr_list_mutex);
+@@ -5352,10 +5399,12 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
+      *
+      * Every 4 was too few for the blender benchmark.
+      */
+    alloc_mode = (uint8_t)(batch_size & 0xff);
+    batch_size &= 0xffffff00;
+     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
+ 
+     DRMINITLISTHEAD(&bufmgr_gem->named);
+-    init_cache_buckets(bufmgr_gem);
+    init_cache_buckets(bufmgr_gem,alloc_mode);
+ 
+     DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list);
+ 
+diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
+index 90b5685b1..b3574f7d3 100644
+--- a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
+++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
+@@ -5403,6 +5403,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
+      *
+      * Every 4 was too few for the blender benchmark.
+      */
+    batch_size &= 0xffffff00;
+     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
+ 
+     DRMINITLISTHEAD(&bufmgr_gem->named);
+diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
+index 9e9e3ff7e..543e262d1 100644
+--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
+@@ -64,6 +64,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
+     uint32_t      iDeviceId = 0;
+     MOS_STATUS    eStatus   = MOS_STATUS_SUCCESS;
+     uint32_t      value     = 0;
+    uint32_t      mode      = 0;
+     MediaUserSettingSharedPtr   userSettingPtr = nullptr;
+ 
+     MOS_OS_FUNCTION_ENTER;
+@@ -89,7 +90,25 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
+ 
+         userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext);
+ 
+-        m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType);
+        mode = BATCH_BUFFER_SIZE;
+        ReadUserSetting(
+            userSettingPtr,
+            value,
+            "INTEL MEDIA ALLOC MODE",
+            MediaUserSetting::Group::Device);
+
+        if (value)
+        {
+            mode |= (value & 0x000000ff);
+        }
+        value = 0;
+        /* no need to set batch buffer size after switch to softpin
+         * keep it, just for test during relocation to softpin transition
+         * now , it could be a debug method , but is actually useless
+         * so it is safe to reuse the lowest 8bit to convey addtional information
+         * more suitable solution is deleting it , or add additional parameter*/
+
+        m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType);
+         if (nullptr == m_bufmgr)
+         {
+             MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd);
+diff --git a/media_softlet/linux/common/os/mos_user_setting_specific.cpp b/media_softlet/linux/common/os/mos_user_setting_specific.cpp
+index 6be8b4298..caed584f4 100644
+--- a/media_softlet/linux/common/os/mos_user_setting_specific.cpp
+++ b/media_softlet/linux/common/os/mos_user_setting_specific.cpp
+@@ -52,5 +52,12 @@ MOS_STATUS MosUserSetting::InitMosUserSettingSpecific(MediaUserSettingSharedPtr
+         0,
+         true); //"Enable VM Bind."
+ 
+    DeclareUserSettingKey(
+        userSettingPtr,
+        "INTEL MEDIA ALLOC MODE",
+        MediaUserSetting::Group::Device,
+        0,
+        false); //
+
+     return MOS_STATUS_SUCCESS;
+ }
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch
new file mode 100644
index 00000000..459ff490
--- /dev/null
+++ b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch
@@ -0,0 +1,78 @@
+From b1aebef4d342c77fc2b9c5efbf20aeb2aa9d634e Mon Sep 17 00:00:00 2001
+From: Wang_Pingli <pingli.wang@intel.com>
+Date: Thu, 28 Dec 2023 16:44:40 +0800
+Subject: [PATCH 07/12] Skip report keys
+Skip to report keys
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/68ce25b0a6fa90614eb4734c8680aa4e149e8323]
+Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../os/osservice/mos_utilities_specific.cpp   | 30 +++++++++++++++++--
+ 1 file changed, 28 insertions(+), 2 deletions(-)
+diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+index b5df29f06..96785e21e 100644
+--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+@@ -67,6 +67,8 @@ int32_t g_mosMemoryFailSimulateAllocCounter = 0;
+ int32_t *MosUtilities::m_mosAllocMemoryFailSimulateAllocCounter = &g_mosMemoryFailSimulateAllocCounter;
+ #endif
+ 
+static bool s_skipToReportReg = false;
+
+ double MosUtilities::MosGetTime()
+ {
+     struct timespec ts = {};
+@@ -1551,6 +1553,10 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
+         {
+             std::string id       = "";
+ 
+            static const char *disableReportRegKeyList[] = {
+                "INTEL MEDIA ALLOC MODE"
+            };
+            static const uint32_t disableReportRegKeyListCount = sizeof(disableReportRegKeyList) / sizeof(disableReportRegKeyList[0]);
+             while(!regStream.eof())
+             {
+                 std::string line = "";
+@@ -1585,8 +1591,22 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
+                     {
+                         std::string name = line.substr(0,pos);
+                         std::string value = line.substr(pos+1);
+-                        auto        &keys  = regBufferMap[id];
+-                        keys[name]       = value;
+                        if (name.size() > 0 && value.size() > 0)
+                        {
+                            auto &keys = regBufferMap[id];
+                            keys[name] = value;
+                            if (s_skipToReportReg == false && id == USER_SETTING_CONFIG_PATH)
+                            {
+                                for (uint32_t i = 0; i < disableReportRegKeyListCount; i++)
+                                {
+                                    if (strcmp(name.c_str(), disableReportRegKeyList[i]) == 0)
+                                    {
+                                        s_skipToReportReg = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                     }
+                 }
+             }
+@@ -1606,6 +1626,12 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
+ MOS_STATUS MosUtilities::MosUninitializeReg(RegBufferMap &regBufferMap)
+ {
+     MOS_STATUS status = MOS_STATUS_SUCCESS;
+
+    if (s_skipToReportReg)
+    {
+        return MOS_STATUS_SUCCESS;
+    }
+
+     if (regBufferMap.size() == 0)
+     {
+         return MOS_STATUS_SUCCESS;
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch
new file mode 100644
index 00000000..ece5e00b
--- /dev/null
+++ b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch
@@ -0,0 +1,255 @@
+From ac2ffac8d4aade216cc361c6c7120c13a8780719 Mon Sep 17 00:00:00 2001
+From: "Soon, Thean Siew" <thean.siew.soon@intel.com>
+Date: Thu, 28 Dec 2023 18:42:59 +0000
+Subject: [PATCH 08/12] Limit INTEL MEDIA ALLOC MODE to MTL and ARL only
+Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754]
+Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
+---
+ .../common/os/i915/include/mos_bufmgr_api.h   |  1 +
+ .../common/os/i915/include/mos_bufmgr_priv.h  |  2 +-
+ .../linux/common/os/i915/mos_bufmgr.c         | 69 +++++++++++++++----
+ .../linux/common/os/i915/mos_bufmgr_api.c     | 19 +++++
+ .../os/i915_production/mos_bufmgr_priv.h      |  1 +
+ .../common/os/mos_context_specific_next.cpp   | 36 +++++-----
+ 6 files changed, 94 insertions(+), 34 deletions(-)
+diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
+index 71cc01099..ab4f1ba89 100644
+--- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
+++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
+@@ -299,6 +299,7 @@ void mos_bufmgr_enable_vmbind(struct mos_bufmgr *bufmgr);
+ void mos_bufmgr_disable_object_capture(struct mos_bufmgr *bufmgr);
+ int mos_bufmgr_get_memory_info(struct mos_bufmgr *bufmgr, char *info, uint32_t length);
+ int mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr);
+void mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode);
+ 
+ int mos_bo_map_unsynchronized(struct mos_linux_bo *bo);
+ int mos_bo_map_gtt(struct mos_linux_bo *bo);
+diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
+index 63f69f985..6fd58f827 100644
+--- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
+++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
+@@ -358,9 +358,9 @@ struct mos_bufmgr {
+     void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr;
+     int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr;
+     int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr;
+    void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr;
+     int (*query_engines_count)(struct mos_bufmgr *bufmgr,
+                           unsigned int *nengine) = nullptr;
+-    
+     int (*query_engines)(struct mos_bufmgr *bufmgr,
+                           __u16 engine_class,
+                           __u64 caps,
+diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c
+index b623d0129..2814ddbb7 100644
+--- a/media_softlet/linux/common/os/i915/mos_bufmgr.c
+++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c
+@@ -2426,19 +2426,9 @@ mos_gem_bo_start_gtt_access(struct mos_linux_bo *bo, int write_enable)
+ }
+ 
+ static void
+-mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
+mos_bufmgr_cleanup_cache(struct mos_bufmgr_gem *bufmgr_gem)
+ {
+-    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *) bufmgr;
+-    struct drm_gem_close close_bo;
+-    int i, ret;
+-
+-    free(bufmgr_gem->exec2_objects);
+-    free(bufmgr_gem->exec_objects);
+-    free(bufmgr_gem->exec_bos);
+-    pthread_mutex_destroy(&bufmgr_gem->lock);
+-
+-    /* Free any cached buffer objects we were going to reuse */
+-    for (i = 0; i < bufmgr_gem->num_buckets; i++) {
+    for (int i = 0; i < bufmgr_gem->num_buckets; i++) {
+         struct mos_gem_bo_bucket *bucket =
+             &bufmgr_gem->cache_bucket[i];
+         struct mos_bo_gem *bo_gem;
+@@ -2450,7 +2440,25 @@ mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
+ 
+             mos_gem_bo_free(&bo_gem->bo);
+         }
+        bufmgr_gem->cache_bucket[i].size = 0;
+     }
+    bufmgr_gem->num_buckets = 0;
+}
+
+static void
+mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
+{
+    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr;
+    struct drm_gem_close close_bo;
+    int ret;
+
+    free(bufmgr_gem->exec2_objects);
+    free(bufmgr_gem->exec_objects);
+    free(bufmgr_gem->exec_bos);
+    pthread_mutex_destroy(&bufmgr_gem->lock);
+
+    /* Free any cached buffer objects we were going to reuse */
+    mos_bufmgr_cleanup_cache(bufmgr_gem);
+ 
+     /* Release userptr bo kept hanging around for optimisation. */
+     if (bufmgr_gem->userptr_active.ptr) {
+@@ -3852,9 +3860,41 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size)
+ }
+ 
+ static void
+-init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode)
+init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
+{
+    unsigned long size, cache_max_size = 64 * 1024 * 1024;
+
+    /* OK, so power of two buckets was too wasteful of memory.
+     * Give 3 other sizes between each power of two, to hopefully
+     * cover things accurately enough.  (The alternative is
+     * probably to just go for exact matching of sizes, and assume
+     * that for things like composited window resize the tiled
+     * width/height alignment and rounding of sizes to pages will
+     * get us useful cache hit rates anyway)
+     */
+    add_bucket(bufmgr_gem, 4096);
+    add_bucket(bufmgr_gem, 4096 * 2);
+    add_bucket(bufmgr_gem, 4096 * 3);
+
+    /* Initialize the linked lists for BO reuse cache. */
+    for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
+        add_bucket(bufmgr_gem, size);
+
+        add_bucket(bufmgr_gem, size + size * 1 / 4);
+        add_bucket(bufmgr_gem, size + size * 2 / 4);
+        add_bucket(bufmgr_gem, size + size * 3 / 4);
+    }
+}
+
+static void
+mos_gem_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode)
+ {
+     unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size;
+    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr;
+
+    // Clean up the pre-allocated cache before re-allocating according
+    // to alloc_mode
+    mos_bufmgr_cleanup_cache(bufmgr_gem);
+ 
+     /* OK, so power of two buckets was too wasteful of memory.
+      * Give 3 other sizes between each power of two, to hopefully
+@@ -5218,6 +5258,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
+     bufmgr_gem->bufmgr.disable_object_capture = mos_gem_disable_object_capture;
+     bufmgr_gem->bufmgr.get_memory_info = mos_gem_get_memory_info;
+     bufmgr_gem->bufmgr.get_devid = mos_gem_get_devid;
+    bufmgr_gem->bufmgr.realloc_cache = mos_gem_realloc_cache;
+     bufmgr_gem->bufmgr.set_context_param = mos_gem_set_context_param;
+     bufmgr_gem->bufmgr.set_context_param_parallel = mos_gem_set_context_param_parallel;
+     bufmgr_gem->bufmgr.set_context_param_load_balance = mos_gem_set_context_param_load_balance;
+@@ -5404,7 +5445,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
+     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
+ 
+     DRMINITLISTHEAD(&bufmgr_gem->named);
+-    init_cache_buckets(bufmgr_gem,alloc_mode);
+    init_cache_buckets(bufmgr_gem);
+ 
+     DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list);
+ 
+diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
+index abe8ef96a..d0e02c267 100644
+--- a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
+++ b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
+@@ -1204,6 +1204,25 @@ mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr)
+     }
+ }
+ 
+void
+mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode)
+{
+    if(!bufmgr)
+    {
+        MOS_OS_CRITICALMESSAGE("Input null ptr\n");
+        return;
+    }
+
+    if (bufmgr->realloc_cache)
+    {
+        return bufmgr->realloc_cache(bufmgr, alloc_mode);
+    }
+    else
+    {
+        MOS_OS_CRITICALMESSAGE("Unsupported\n");
+    }
+}
+
+ int
+ mos_query_engines_count(struct mos_bufmgr *bufmgr,
+                       unsigned int *nengine)
+diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
+index c3b765a4c..1d7f7edb0 100644
+--- a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
+++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
+@@ -358,6 +358,7 @@ struct mos_bufmgr {
+     void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr;
+     int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr;
+     int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr;
+    void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr;
+     int (*query_engines_count)(struct mos_bufmgr *bufmgr,
+                           unsigned int *nengine) = nullptr;
+     
+diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
+index 543e262d1..87059f538 100644
+--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
+@@ -90,25 +90,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
+ 
+         userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext);
+ 
+-        mode = BATCH_BUFFER_SIZE;
+-        ReadUserSetting(
+-            userSettingPtr,
+-            value,
+-            "INTEL MEDIA ALLOC MODE",
+-            MediaUserSetting::Group::Device);
+-
+-        if (value)
+-        {
+-            mode |= (value & 0x000000ff);
+-        }
+-        value = 0;
+-        /* no need to set batch buffer size after switch to softpin
+-         * keep it, just for test during relocation to softpin transition
+-         * now , it could be a debug method , but is actually useless
+-         * so it is safe to reuse the lowest 8bit to convey addtional information
+-         * more suitable solution is deleting it , or add additional parameter*/
+-
+-        m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType);
+        m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType);
+         if (nullptr == m_bufmgr)
+         {
+             MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd);
+@@ -151,6 +133,22 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
+             return eStatus;
+         }
+ 
+        if (m_platformInfo.eProductFamily == IGFX_METEORLAKE ||
+            m_platformInfo.eProductFamily == IGFX_ARROWLAKE)
+        {
+            ReadUserSetting(
+                userSettingPtr,
+                value,
+                "INTEL MEDIA ALLOC MODE",
+                MediaUserSetting::Group::Device);
+
+            if (value)
+            {
+                mode = (value & 0x000000ff);
+            }
+            mos_bufmgr_realloc_cache(m_bufmgr, mode);
+        }
+
+         ReadUserSetting(
+             userSettingPtr,
+             value,
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch
new file mode 100644
index 00000000..8ee7ef14
--- /dev/null
+++ b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch
@@ -0,0 +1,33 @@
+From 18c32247cbc0e9fabff7a847add099496af9e53f Mon Sep 17 00:00:00 2001
+From: "Soon, Thean Siew" <thean.siew.soon@intel.com>
+Date: Mon, 8 Jan 2024 18:12:30 +0000
+Subject: [PATCH 09/12] Skip cache bucket realloc for default mode 0
+Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754]
+Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
+---
+ .../linux/common/os/mos_context_specific_next.cpp          | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
+index 87059f538..9dbd5da79 100644
+--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
+@@ -146,7 +146,12 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
+             {
+                 mode = (value & 0x000000ff);
+             }
+-            mos_bufmgr_realloc_cache(m_bufmgr, mode);
+
+            // Realloc cache only if it's not mode 0
+            if (mode)
+            {
+                mos_bufmgr_realloc_cache(m_bufmgr, mode);
+            }
+         }
+ 
+         ReadUserSetting(
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch
new file mode 100644
index 00000000..0100df77
--- /dev/null
+++ b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch
@@ -0,0 +1,195 @@
+From 7291ab5206c5e172c6c94dcfbe4f1bc258f3b7a5 Mon Sep 17 00:00:00 2001
+From: WenshengZhang <wensheng.zhang@intel.com>
+Date: Wed, 10 Jan 2024 14:08:37 +0800
+Subject: [PATCH 10/12] Fix failed 4k video wall test case and color corruption
+ of video composition
+Fix failed 4k video wall test case from 16CH video only show 1CH output and
+corruption observed on certain number of video composition when doing
+sample_multi_transcode.
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/38e14b1b97170b51586d00d1fa607e496b0c5825]
+Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../common/vp/kdll/hal_kerneldll_next.h       |  1 +
+ .../vp/hal/packet/vp_render_fc_kernel.cpp     |  7 ++
+ .../common/vp/kdll/hal_kerneldll_next.c       | 70 +++++++++++--------
+ .../linux/common/vp/ddi/ddi_vp_functions.cpp  | 20 ++----
+ 4 files changed, 55 insertions(+), 43 deletions(-)
+diff --git a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
+index 6447999b7..8e2ab371e 100644
+--- a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
+++ b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
+@@ -588,6 +588,7 @@ typedef struct tagKdll_FilterEntry
+     Kdll_Scalingratio      ScalingRatio;
+     Kdll_RenderMethod      RenderMethod;
+     Kdll_SetCSCCoeffMethod SetCSCCoeffMode;
+    bool                   forceToTargetColorSpace;
+ } Kdll_FilterEntry, *PKdll_FilterEntry;
+ 
+ // Structure that defines a compositing filter
+diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
+index 8e982f67e..f8308fed1 100644
+--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
+++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
+@@ -775,6 +775,13 @@ MOS_STATUS VpRenderFcKernel::BuildFilter(
+ 
+     for (i = 0; (i < (int)compParams->sourceCount) && (iMaxFilterSize > 0); i++)
+     {
+        if (i > 0)
+        {
+            if (!RECT1_CONTAINS_RECT2(compParams->source[0].surf->rcDst, compParams->source[i].surf->rcDst))
+            {
+                pFilter->forceToTargetColorSpace = true;
+            }
+        }
+         src = &compParams->source[i];
+ 
+         //--------------------------------
+diff --git a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
+index d8f7d429a..151f3b039 100644
+--- a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
+++ b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
+@@ -2378,6 +2378,7 @@ bool KernelDll_SetupCSC(
+     Kdll_CSC_Matrix  curr_matrix;
+     Kdll_CSC_Matrix *matrix   = pCSC->Matrix;    // Color Space conversion matrix
+     uint8_t *        matrixID = pCSC->MatrixID;  // CSC coefficient allocation table
+    bool forceToTargetColorSpace = false;
+ 
+     // Clear all CSC matrices
+     MOS_ZeroMemory(matrix, sizeof(pCSC->Matrix));
+@@ -2395,6 +2396,10 @@ bool KernelDll_SetupCSC(
+     //---------------------------------------------------------------//
+     for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
+     {
+        if (pFilter->forceToTargetColorSpace)
+        {
+            forceToTargetColorSpace = true;
+        }
+         // Disable Procamp for all layers except Main Video
+         // Disable Procamp if source is RGB
+         if (pFilter->layer != Layer_MainVideo ||
+@@ -2456,44 +2461,51 @@ bool KernelDll_SetupCSC(
+     //---------------------------------------------------------------//
+     if (sel_cspace == CSpace_Any)
+     {
+-        int cs;
+-        for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++)
+        if (forceToTargetColorSpace)
+         {
+-            // Skip color spaces not in use
+-            cspace = (VPHAL_CSPACE)cs;
+-            if (!cspace_in_use[cspace])
+-            {
+-                continue;
+-            }
+-
+-            // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I)
+-            cspace = KernelDll_TranslateCspace(cspace);
+-
+-            // Count # of CS conversions and matrices
+-            csc_count = 0;
+-            for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
+            sel_cspace = out_cspace;
+        }
+        else
+        {
+            int cs;
+            for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++)
+             {
+-                // Ignore layers where the Color Space may be set in software (colorfill, palletized)
+-                if (pFilter->cspace == CSpace_Any)
+                // Skip color spaces not in use
+                cspace = (VPHAL_CSPACE)cs;
+                if (!cspace_in_use[cspace])
+                 {
+                     continue;
+                 }
+ 
+-                // Check if CSC/PA is required
+-                if (KernelDll_TranslateCspace(pFilter->cspace) != cspace ||
+-                    pFilter->procamp != DL_PROCAMP_DISABLED)
+                // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I)
+                cspace = KernelDll_TranslateCspace(cspace);
+
+                // Count # of CS conversions and matrices
+                csc_count = 0;
+                for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
+                 {
+-                    csc_count++;
+                    // Ignore layers where the Color Space may be set in software (colorfill, palletized)
+                    if (pFilter->cspace == CSpace_Any)
+                    {
+                        continue;
+                    }
+
+                    // Check if CSC/PA is required
+                    if (KernelDll_TranslateCspace(pFilter->cspace) != cspace ||
+                        pFilter->procamp != DL_PROCAMP_DISABLED)
+                    {
+                        csc_count++;
+                    }
+                 }
+-            }
+ 
+-            // Save best choice as requiring minimum number of CSC operations
+-            if ((sel_csc_count < 0) ||                              // Initial value
+-                (csc_count < sel_csc_count) ||                      // Minimum number of CSC operations
+-                (csc_count == sel_csc_count && cs == main_cspace))  // Use main cspace as default if same CSC count
+-            {
+-                sel_cspace    = cspace;
+-                sel_csc_count = csc_count;
+                // Save best choice as requiring minimum number of CSC operations
+                if ((sel_csc_count < 0) ||                              // Initial value
+                    (csc_count < sel_csc_count) ||                      // Minimum number of CSC operations
+                    (csc_count == sel_csc_count && cs == main_cspace))  // Use main cspace as default if same CSC count
+                {
+                    sel_cspace    = cspace;
+                    sel_csc_count = csc_count;
+                }
+             }
+         }
+     }
+diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
+index 40d0b3fad..e60a6c69c 100644
+--- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
+++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
+@@ -2115,9 +2115,8 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill(
+ {
+     DDI_VP_FUNC_ENTER;
+     DDI_VP_CHK_NULL(vpHalRenderParams, "nullptr vpHalRenderParams.", VA_STATUS_ERROR_INVALID_PARAMETER);
+-    DDI_VP_CHK_NULL(vpHalRenderParams->pTarget[0],"nullptr pTarget[0].", VA_STATUS_ERROR_INVALID_PARAMETER);
+ 
+-    if ((outBackGroundcolor >> 24) != 0 || vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB)
+    if ((outBackGroundcolor >> 24) != 0)
+     {
+         if (vpHalRenderParams->pColorFillParams == nullptr)
+         {
+@@ -2126,18 +2125,11 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill(
+ 
+         DDI_VP_CHK_NULL(vpHalRenderParams->pColorFillParams, "nullptr pColorFillParams.", VA_STATUS_ERROR_UNKNOWN);
+ 
+-        if (vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB && (outBackGroundcolor >> 24) == 0)
+-        {
+-            // set color space for sRGB output
+-            vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
+-        }
+-        else
+-        {
+-            // set background colorfill option
+-            vpHalRenderParams->pColorFillParams->Color   = outBackGroundcolor;
+-            vpHalRenderParams->pColorFillParams->bYCbCr  = false;
+-            vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
+-        }
+        // set background colorfill option
+        vpHalRenderParams->pColorFillParams->Color   = outBackGroundcolor;
+        vpHalRenderParams->pColorFillParams->bYCbCr  = false;
+        vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
+
+     }
+     else
+     {
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch
new file mode 100644
index 00000000..2f4aec1e
--- /dev/null
+++ b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch
@@ -0,0 +1,33 @@
+From f8b4d982232d4c1330e1e5f5dcd7cd8ca94decba Mon Sep 17 00:00:00 2001
+From: WenshengZhang <wensheng.zhang@intel.com>
+Date: Thu, 25 Jan 2024 16:35:10 +0800
+Subject: [PATCH 11/12] Disable 422H format output
+Disable 422H format output.
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/eab411768e61a46e096793291f5f992eecf76cd8]
+Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../agnostic/common/vp/hal/feature_manager/policy.cpp       | 6 ++++++
+ 1 file changed, 6 insertions(+)
+diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
+index 317cec25a..12f1124fa 100644
+--- a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
+++ b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
+@@ -1140,6 +1140,12 @@ MOS_STATUS Policy::GetScalingExecutionCaps(SwFilter *feature, bool isHdrEnabled)
+     bool isAlphaSettingSupportedByVebox =
+         IsAlphaSettingSupportedByVebox(scalingParams->formatInput, scalingParams->formatOutput, scalingParams->pCompAlpha);
+ 
+    if (scalingParams->formatOutput == Format_422H)
+    {
+        VP_PUBLIC_ASSERTMESSAGE("Scaling not support 422H format output.");
+        return MOS_STATUS_UNIMPLEMENTED;
+    }
+
+     // Clean usedForNextPass flag.
+     if (scalingEngine->usedForNextPass)
+     {
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch
new file mode 100644
index 00000000..1be9139d
--- /dev/null
+++ b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch
@@ -0,0 +1,32 @@
+From b93904533d3ee66c7919fa8e23d26b852a37a917 Mon Sep 17 00:00:00 2001
+From: Lim Siew Hoon <siew.hoon.lim@intel.com>
+Date: Tue, 30 Jan 2024 13:27:52 +0800
+Subject: [PATCH 12/12] [Decode] Fix AVC decode SFC 4K hang issue
+Updated VDSFC input width and height for AVC decode
+Upstream-Status: Submitted [https://github.com/intel-innersource/drivers.gpu.unified/pull/151401]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../hal/dec/avc/packet/decode_avc_downsampling_packet.cpp     | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
+index e75fd8137..9cc236bd7 100644
+--- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
+++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
+@@ -59,6 +59,10 @@ MOS_STATUS AvcDownSamplingPkt::InitSfcParams(VDBOX_SFC_PARAMS &sfcParams)
+ 
+     AvcBasicFeature *avcBasicFeature = dynamic_cast<AvcBasicFeature*>(m_basicFeature);
+     DECODE_CHK_NULL(avcBasicFeature);
+
+    sfcParams.input.width  = avcBasicFeature->m_width;
+    sfcParams.input.height = avcBasicFeature->m_height;
+
+     CODEC_PICTURE curPic = avcBasicFeature->m_avcPicParams->CurrPic;
+ 
+     if (avcBasicFeature->m_avcPicParams->seq_fields.mb_adaptive_frame_field_flag == true)
+-- 
+2.40.1
diff --git a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb b/recipes-multimedia/libva/intel-media-driver_23.4.3.bb
new file mode 100644
index 00000000..6513d574
--- /dev/null
+++ b/recipes-multimedia/libva/intel-media-driver_23.4.3.bb
@@ -0,0 +1,61 @@
+SUMMARY = "VA driver for Intel Gen based graphics hardware"
+DESCRIPTION = "Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) \
+user mode driver supporting hardware accelerated decoding, encoding, \
+and video post processing for GEN based graphics hardware."
+HOMEPAGE = "https://github.com/intel/media-driver"
+BUGTRACKER = "https://github.com/intel/media-driver/issues"
+LICENSE = "MIT & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \
+                    file://media_driver/media_libvpx.LICENSE;md5=d5b04755015be901744a78cc30d390d4 \
+                    "
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "opengl"
+DEPENDS += "libva gmmlib"
+SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
+           file://0001-Disable-vp9-padding-on-mtl.patch \
+           file://0002-Force-ARGB-surface-to-tile4-for-ACM.patch \
+           file://0004-Add-device-ID-for-ARL.patch \
+           file://0005-Add-XR24-support-to-DMABuf.patch \
+           file://0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch \
+           file://0007-Skip-report-keys.patch \
+           file://0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch \
+           file://0009-Skip-cache-bucket-realloc-for-default-mode-0.patch \
+           file://0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch \
+           file://0011-Disable-422H-format-output.patch \
+           file://0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch \
+          "
+SRCREV = "a9f272496fc0f3e823cc4a814666ea27b443d902"
+S = "${WORKDIR}/git"
+COMPATIBLE_HOST:x86-x32 = "null"
+UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P<pver>(?!600\..*)\d+(\.\d+)+)$"
+inherit cmake pkgconfig
+MEDIA_DRIVER_ARCH:x86    = "32"
+MEDIA_DRIVER_ARCH:x86-64 = "64"
+EXTRA_OECMAKE += " \
+                   -DMEDIA_RUN_TEST_SUITE=OFF \
+                   -DARCH=${MEDIA_DRIVER_ARCH} \
+                   -DMEDIA_BUILD_FATAL_WARNINGS=OFF \
+                  "
+CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+do_configure:prepend:toolchain-clang() {
+    sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake
+}
+FILES:${PN} += " \
+                 ${libdir}/dri/ \
+                 "
diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.1.0.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb
index d0fbf2da..5038d8d7 100644
--- a/recipes-multimedia/libva/intel-vaapi-driver_2.1.0.bb
+++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb
@@ -13,21 +13,22 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 DEPENDS = "libva libdrm"
-SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.bz2"
+SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.bz2 \
-SRC_URI[md5sum] = "ab4c33ab31183787dece9b99a86f7b8c"
+           "
-SRC_URI[sha256sum] = "ecfaf2ccc4b9af7340e002d2ef807d1e33051d4992f1983f5f4d60e516f86bdf"
+SRC_URI[sha256sum] = "0081fce08eb3a83f7d99c3b853c8fdfa0af437b8f5b0fb7c66faeb83bcbe0c19"
 UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases"
-inherit autotools pkgconfig distro_features_check
+inherit meson pkgconfig features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
                   ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}"
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11"
+PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no"
-PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native virtual/egl"
+PACKAGECONFIG[wayland] = "-Dwith_wayland=yes, -Dwith_wayland=no, wayland wayland-native virtual/egl"
-FILES_${PN} += "${libdir}/dri/*.so"
+FILES:${PN} += "${libdir}/dri/*.so"
-FILES_${PN}-dev += "${libdir}/dri/*.la"
+FILES:${PN}-dev += "${libdir}/dri/*.la"
-FILES_${PN}-dbg += "${libdir}/dri/.debug"
+FILES:${PN}-dbg += "${libdir}/dri/.debug"
diff --git a/recipes-multimedia/libva/va-intel.bb b/recipes-multimedia/libva/va-intel.bb
deleted file mode 100644
index 33b81a30..00000000
--- a/recipes-multimedia/libva/va-intel.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Video Acceleration Add-ons for Intel BSPs"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-S = "${WORKDIR}"
-PR = "r1"
-def map_valibs(d):
-    # The intel implementation requires the intel-vaapi-driver package
-    if bb.utils.contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
-       return "libva intel-vaapi-driver"
-    # All meta-intel video acceleration requires libva
-    return "libva"
-VA_IMPL = "${@map_valibs(d)}"
-PACKAGES = "\
-    va-intel \
-    "
-ALLOW_EMPTY_va-intel = "1"
-RDEPENDS_va-intel = " \
-    ${VA_IMPL} \
-    "
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux*'
-inherit distro_features_check
-REQUIRED_DISTRO_FEATURES = "opengl"
diff --git a/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch b/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch
deleted file mode 100644
index a4a4029c..00000000
--- a/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From b7e66182788cd925570bb4c310e21fbcd3185040 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 12 Aug 2017 08:49:20 -0700
-Subject: [PATCH] Fix build with clang
-Fix errors e.g.
-error: comparison of constant -1 with expression of type 'char' is always true [-Werror,-Wtautological-constant-out-of-range-compare]error: comparison of constant -1 with expression of type 'char' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
-and
-psnr.cpp:225:17: error: bool literal returned from 'main' [-Werror,-Wmain]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- tests/decodehelp.cpp    | 2 +-
- tests/encodehelp.h      | 2 +-
- tests/vpp.cpp           | 2 +-
- tests/yamitranscode.cpp | 2 +-
- testscripts/psnr.cpp    | 4 ++--
- 5 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/tests/decodehelp.cpp b/tests/decodehelp.cpp
-index a69eab6..2d96598 100644
--- a/tests/decodehelp.cpp
-+++ b/tests/decodehelp.cpp
-@@ -70,7 +70,7 @@ bool processCmdLine(int argc, char** argv, DecodeParameter* parameters)
-         {"capi", no_argument, NULL, 0},
-         {NULL, no_argument, NULL, 0}};
- 
-    char opt;
-+    int opt;
-     while ((opt = getopt_long_only(argc, argv, "h:m:n:i:f:o:w:?", long_opts,&option_index)) != -1){
-         switch (opt) {
-         case 'h':
-diff --git a/tests/encodehelp.h b/tests/encodehelp.h
-index 57ccd77..76df801 100644
--- a/tests/encodehelp.h
-+++ b/tests/encodehelp.h
-@@ -107,7 +107,7 @@ static VideoRateControl string_to_rc_mode(char *str)
- 
- static bool process_cmdline(int argc, char *argv[])
- {
-    char opt;
-+    int opt;
-     const struct option long_opts[] = {
-         { "help", no_argument, NULL, 'h' },
-         { "qp", required_argument, NULL, 0 },
-diff --git a/tests/vpp.cpp b/tests/vpp.cpp
-index 5a60c0a..52da43b 100644
--- a/tests/vpp.cpp
-+++ b/tests/vpp.cpp
-@@ -151,7 +151,7 @@ public:
- private:
-     bool processCmdLine(int argc, char* argv[])
-     {
-        char opt;
-+        int opt;
-         const struct option long_opts[] = {
-             { "help", no_argument, NULL, 'h' },
-             { "sharpening", required_argument, NULL, 's' },
-diff --git a/tests/yamitranscode.cpp b/tests/yamitranscode.cpp
-index 4cb72aa..2fc6725 100755
--- a/tests/yamitranscode.cpp
-+++ b/tests/yamitranscode.cpp
-@@ -95,7 +95,7 @@ static VideoRateControl string_to_rc_mode(char *str)
- 
- static bool processCmdLine(int argc, char *argv[], TranscodeParams& para)
- {
-    char opt;
-+    int opt;
-     const struct option long_opts[] = {
-         { "help", no_argument, NULL, 'h' },
-         { "qp", required_argument, NULL, 0 },
-diff --git a/testscripts/psnr.cpp b/testscripts/psnr.cpp
-index 5cc24c9..68bd668 100644
--- a/testscripts/psnr.cpp
-+++ b/testscripts/psnr.cpp
-@@ -215,14 +215,14 @@ int main(int argc, char *argv[])
-     const char* psnrresult = "average_psnr.txt";
-     int width=0,height=0;
-     int standardpsnr = NORMAL_PSNR;
-    char opt;
-+    int opt;
-     while ((opt = getopt(argc, argv, "h:W:H:i:o:s:?")) != -1)
-     {
-         switch (opt) {
-             case 'h':
-             case '?':
-                 print_help(argv[0]);
-                return false;
-+                return -1;
-             case 'i':
-                 filename1 = optarg;
-                 break;
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami-utils_1.3.0.bb b/recipes-multimedia/libyami/libyami-utils_1.3.0.bb
deleted file mode 100644
index 00f14398..00000000
--- a/recipes-multimedia/libyami/libyami-utils_1.3.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Applications and Scripts for libyami."
-DESCRIPTION = "Applications and Scripts for libyami."
-HOMEPAGE = "https://github.com/intel/libyami-utils"
-BUGTRACKER = "https://github.com/intel/libyami-utils/issues/new"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-SRC_URI = "git://github.com/intel/libyami-utils.git \
-           file://0001-Fix-build-with-clang.patch \
-           "
-SRCREV = "d9c62f6a0653aa2e59cd2af9a3c80d82122d2149"
-S = "${WORKDIR}/git"
-DEPENDS = "libva libyami"
-EXTRA_OECONF = "--enable-tests-gles --disable-md5"
-inherit autotools pkgconfig distro_features_check
-REQUIRED_DISTRO_FEATURES = "opengl"
-PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-# --enable-x11 needs libva-x11
-# gles-tests fail to build without x11: see https://github.com/intel/libyami-utils/issues/91
-PACKAGECONFIG[x11] = "--enable-x11 --enable-tests-gles,--disable-x11 --disable-tests-gles, virtual/libx11"
-UPSTREAM_CHECK_URI = "http://github.com/intel/libyami-utils/releases"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch b/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch
deleted file mode 100644
index 673969cf..00000000
--- a/recipes-multimedia/libyami/libyami/0001-Makefile.am-point-to-build-dir-for-generated-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 00fc21a41bf7e11d468227487c4e9de9e6d608e6 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Mon, 5 Feb 2018 11:16:18 +0800
-Subject: [PATCH] Makefile.am: point to build dir for generated headers
-Otherwise it will give out errors for missing YamiVersion.h.
-Upstream-Status: Submitted [https://github.com/intel/libyami/pull/827]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- common/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/common/Makefile.am b/common/Makefile.am
-index 5ee61da..1a788e5 100644
--- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -40,6 +40,7 @@ extra_includes = \
- libyami_common_cppflags = \
-        $(LIBVA_CFLAGS) \
-        -I$(top_srcdir)/interface \
-+       -I$(top_builddir)/interface \
-        $(extra_includes) \
-        $(NULL)
- 
-- 
-2.7.4
diff --git a/recipes-multimedia/libyami/libyami/0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch b/recipes-multimedia/libyami/libyami/0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch
deleted file mode 100644
index a96c9b85..00000000
--- a/recipes-multimedia/libyami/libyami/0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 294874b610a5b8af9b736b3afc938010af58785e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 17:15:45 -0700
-Subject: [PATCH 1/9] bitWriter.cpp: Delete unused CACHEBYTES
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- codecparsers/bitWriter.cpp | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/codecparsers/bitWriter.cpp b/codecparsers/bitWriter.cpp
-index 9bcb14d..08469bf 100644
--- a/codecparsers/bitWriter.cpp
-+++ b/codecparsers/bitWriter.cpp
-@@ -24,7 +24,6 @@
- 
- namespace YamiParser {
- 
-const uint32_t CACHEBYTES = sizeof(unsigned long int);
- const uint32_t CACHEBITS = sizeof(unsigned long int) * 8;
- 
- // clip to keep lowest n bits
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0002-typecast-index-from-size_t-to-int.patch b/recipes-multimedia/libyami/libyami/0002-typecast-index-from-size_t-to-int.patch
deleted file mode 100644
index a216566c..00000000
--- a/recipes-multimedia/libyami/libyami/0002-typecast-index-from-size_t-to-int.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 88fa048e22ad00b04054b8a64df53bd440e01537 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 17:29:02 -0700
-Subject: [PATCH 2/9] typecast index from size_t to int
-size_t is not consistent across architectures e.g. on arm its unsigned int
-Fixes
-error: comparison of unsigned expression < 0 is always false [-Werror,-Wtautological-compare]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- codecparsers/jpegParser.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/codecparsers/jpegParser.cpp b/codecparsers/jpegParser.cpp
-index 2217028..6da5c36 100644
--- a/codecparsers/jpegParser.cpp
-+++ b/codecparsers/jpegParser.cpp
-@@ -639,7 +639,7 @@ bool Parser::parseDAC()
- 
-         length -= 2;
- 
-        if (index < 0 || index >= (2 * NUM_ARITH_TBLS)) {
-+        if ((int)index < 0 || index >= (2 * NUM_ARITH_TBLS)) {
-             ERROR("Invalid DAC Index");
-             return false;
-         }
-@@ -747,7 +747,7 @@ bool Parser::parseDHT()
-             huffTables = &m_dcHuffTables;
-         }
- 
-        if (index < 0 || index >= NUM_HUFF_TBLS) {
-+        if ((int)index < 0 || index >= NUM_HUFF_TBLS) {
-             ERROR("Bad Huff Table Index");
-             return false;
-         }
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch b/recipes-multimedia/libyami/libyami/0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch
deleted file mode 100644
index 17289602..00000000
--- a/recipes-multimedia/libyami/libyami/0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 533d63287e9dd8f269b137c18fbe6c19206c8668 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 17:49:43 -0700
-Subject: [PATCH 3/9] Add -Wno-invalid-offsetof to compiler commandline
-clang++ is fussy about offsetof on non-POD types
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- codecparsers/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/codecparsers/Makefile.am b/codecparsers/Makefile.am
-index 720bf81..d9226b3 100644
--- a/codecparsers/Makefile.am
-+++ b/codecparsers/Makefile.am
-@@ -118,6 +118,7 @@ libyami_codecparser_cppflags = \
-        -Dvp8dx_start_decode=libyami_vp8dx_start_decode \
-        -Dvp8dx_bool_decoder_fill=libyami_vp8dx_bool_decoder_fill \
-        -I$(top_srcdir)/interface \
-+       -Wno-invalid-offsetof \
-        $(extra_includes) \
-        $(NULL)
- 
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0004-Typecast-POWER32SUB2-to-uint8_t.patch b/recipes-multimedia/libyami/libyami/0004-Typecast-POWER32SUB2-to-uint8_t.patch
deleted file mode 100644
index 27eca39b..00000000
--- a/recipes-multimedia/libyami/libyami/0004-Typecast-POWER32SUB2-to-uint8_t.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d9c831ee38da4551396fad5cd53c3dfc0e5e0cf8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 17:57:34 -0700
-Subject: [PATCH 4/9] Typecast POWER32SUB2 to uint8_t
-Fixes
-h265Parser.cpp:1064:5: error: comparison of constant 4294967294 with expression
-of type 'uint8_t' (aka 'unsigned char') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- codecparsers/h265Parser.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/codecparsers/h265Parser.cpp b/codecparsers/h265Parser.cpp
-index 0dea3a6..c6cded2 100644
--- a/codecparsers/h265Parser.cpp
-+++ b/codecparsers/h265Parser.cpp
-@@ -125,7 +125,7 @@ namespace H265 {
-                                                                                                                  \
-             CHECK_READ_UE(var->var##_max_num_reorder_pics[i], 0, var->var##_max_dec_pic_buffering_minus1[i]);    \
-                                                                                                                  \
-            CHECK_READ_UE(var->var##_max_latency_increase_plus1[i], 0, POWER32SUB2);                             \
-+            CHECK_READ_UE(var->var##_max_latency_increase_plus1[i], 0, (uint8_t)POWER32SUB2);                             \
-         }                                                                                                        \
-     }
- 
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0005-move-c-definitions-out-of-extern-C-block.patch b/recipes-multimedia/libyami/libyami/0005-move-c-definitions-out-of-extern-C-block.patch
deleted file mode 100644
index e77e85f7..00000000
--- a/recipes-multimedia/libyami/libyami/0005-move-c-definitions-out-of-extern-C-block.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 3748cf904089878971cfcf66abf14c4d74f8241a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 18:03:07 -0700
-Subject: [PATCH 5/9] move c++ definitions out of extern "C" block
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- decoder/vaapidecoder_host.cpp    | 2 +-
- encoder/vaapiencoder_host.cpp    | 3 ++-
- interface/VideoDecoderHost.h     | 8 ++++----
- interface/VideoEncoderHost.h     | 8 ++++----
- interface/VideoPostProcessHost.h | 8 ++++----
- vpp/vaapipostprocess_host.cpp    | 3 +--
- 6 files changed, 16 insertions(+), 16 deletions(-)
-diff --git a/decoder/vaapidecoder_host.cpp b/decoder/vaapidecoder_host.cpp
-index bcc9165..d9129f3 100644
--- a/decoder/vaapidecoder_host.cpp
-+++ b/decoder/vaapidecoder_host.cpp
-@@ -100,9 +100,9 @@ void releaseVideoDecoder(IVideoDecoder * p)
- {
-     delete p;
- }
-+} // extern "C"
- 
- std::vector<std::string> getVideoDecoderMimeTypes()
- {
-     return VaapiDecoderFactory::keys();
- }
-} // extern "C"
-diff --git a/encoder/vaapiencoder_host.cpp b/encoder/vaapiencoder_host.cpp
-index 49e903a..3ee9354 100644
--- a/encoder/vaapiencoder_host.cpp
-+++ b/encoder/vaapiencoder_host.cpp
-@@ -78,9 +78,10 @@ void releaseVideoEncoder(IVideoEncoder* p) {
-     delete p;
- }
- 
-+} // extern "C"
-+
- std::vector<std::string> getVideoEncoderMimeTypes()
- {
-     return VaapiEncoderFactory::keys();
- }
- 
-} // extern "C"
-diff --git a/interface/VideoDecoderHost.h b/interface/VideoDecoderHost.h
-index 86210fe..fd2ba7b 100644
--- a/interface/VideoDecoderHost.h
-+++ b/interface/VideoDecoderHost.h
-@@ -32,12 +32,12 @@ extern "C" { // for dlsym usage
- YamiMediaCodec::IVideoDecoder *createVideoDecoder(const char *mimeType);
- /// \brief destroy the decoder
- void releaseVideoDecoder(YamiMediaCodec::IVideoDecoder * p);
-/** \fn void getVideoDecoderMimeTypes()
- * \brief return the MimeTypes enabled in the current build
-*/
-std::vector<std::string> getVideoDecoderMimeTypes();
- 
- typedef YamiMediaCodec::IVideoDecoder *(*YamiCreateVideoDecoderFuncPtr) (const char *mimeType);
- typedef void (*YamiReleaseVideoDecoderFuncPtr)(YamiMediaCodec::IVideoDecoder * p);
- }
-+// \fn void getVideoDecoderMimeTypes()
-+// \brief return the MimeTypes enabled in the current build
-+//
-+std::vector<std::string> getVideoDecoderMimeTypes();
- #endif                          /* VIDEO_DECODER_HOST_H_ */
-diff --git a/interface/VideoEncoderHost.h b/interface/VideoEncoderHost.h
-index fb80335..5fb5ab3 100644
--- a/interface/VideoEncoderHost.h
-+++ b/interface/VideoEncoderHost.h
-@@ -32,12 +32,12 @@ extern "C" { // for dlsym usage
- YamiMediaCodec::IVideoEncoder *createVideoEncoder(const char *mimeType);
- ///brief destroy encoder
- void releaseVideoEncoder(YamiMediaCodec::IVideoEncoder * p);
-/** \fn void getVideoEncoderMimeTypes()
- * \brief return the MimeTypes enabled in the current build
-*/
-std::vector<std::string> getVideoEncoderMimeTypes();
- 
- typedef YamiMediaCodec::IVideoEncoder *(*YamiCreateVideoEncoderFuncPtr) (const char *mimeType);
- typedef void (*YamiReleaseVideoEncoderFuncPtr)(YamiMediaCodec::IVideoEncoder * p);
- }
- #endif                          /* VIDEO_ENCODER_HOST_H_ */
-+// \fn void getVideoEncoderMimeTypes()
-+// \brief return the MimeTypes enabled in the current build
-+//
-+std::vector<std::string> getVideoEncoderMimeTypes();
-diff --git a/interface/VideoPostProcessHost.h b/interface/VideoPostProcessHost.h
-index de046cd..f1c5ce5 100644
--- a/interface/VideoPostProcessHost.h
-+++ b/interface/VideoPostProcessHost.h
-@@ -34,12 +34,12 @@ YamiMediaCodec::IVideoPostProcess *createVideoPostProcess(const char *mimeType);
-  * \brief destroy encoder
- */
- void releaseVideoPostProcess(YamiMediaCodec::IVideoPostProcess * p);
-/** \fn void getVideoPostProcessMimeTypes()
- * \brief return the MimeTypes enabled in the current build
-*/
-std::vector<std::string> getVideoPostProcessMimeTypes();
- 
- typedef YamiMediaCodec::IVideoPostProcess *(*YamiCreateVideoPostProcessFuncPtr) (const char *mimeType);
- typedef void (*YamiReleaseVideoPostProcessFuncPtr)(YamiMediaCodec::IVideoPostProcess * p);
- }
- #endif                          /* VIDEO_POST_PROCESS_HOST_H_ */
-+// \fn void getVideoPostProcessMimeTypes()
-+// \brief return the MimeTypes enabled in the current build
-+//
-+std::vector<std::string> getVideoPostProcessMimeTypes();
-diff --git a/vpp/vaapipostprocess_host.cpp b/vpp/vaapipostprocess_host.cpp
-index cd40dea..bc06b38 100644
--- a/vpp/vaapipostprocess_host.cpp
-+++ b/vpp/vaapipostprocess_host.cpp
-@@ -75,10 +75,9 @@ void releaseVideoPostProcess(IVideoPostProcess * p)
- {
-     delete p;
- }
-+} // extern "C"
- 
- std::vector<std::string> getVideoPostProcessMimeTypes()
- {
-     return VaapiPostProcessFactory::keys();
- }
-
-} // extern "C"
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch b/recipes-multimedia/libyami/libyami/0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch
deleted file mode 100644
index c9c74520..00000000
--- a/recipes-multimedia/libyami/libyami/0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 27b61f5ab1b1643436f56517e4980734b4b9acca Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 18:38:05 -0700
-Subject: [PATCH 6/9] Avoid namespace conflicts by adding explicit using
- <namespace>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- decoder/vaapidecoder_h264.h | 1 +
- decoder/vaapidecoder_h265.h | 1 +
- 2 files changed, 2 insertions(+)
-diff --git a/decoder/vaapidecoder_h264.h b/decoder/vaapidecoder_h264.h
-index 57e2c27..ea5c2f2 100644
--- a/decoder/vaapidecoder_h264.h
-+++ b/decoder/vaapidecoder_h264.h
-@@ -30,6 +30,7 @@ namespace YamiMediaCodec {
- 
- class VaapiDecPictureH264;
- class VaapiDecoderH264 : public VaapiDecoderBase {
-+using YamiMediaCodec::VaapiDecoderBase::createPicture;
- public:
-     typedef SharedPtr<VaapiDecPictureH264> PicturePtr;
-     typedef std::vector<PicturePtr> RefSet;
-diff --git a/decoder/vaapidecoder_h265.h b/decoder/vaapidecoder_h265.h
-index f7e2303..159e25f 100644
--- a/decoder/vaapidecoder_h265.h
-+++ b/decoder/vaapidecoder_h265.h
-@@ -38,6 +38,7 @@ namespace YamiMediaCodec {
- 
- class VaapiDecPictureH265;
- class VaapiDecoderH265:public VaapiDecoderBase {
-+    using YamiMediaCodec::VaapiDecoderBase::createPicture;
-     typedef YamiParser::H265::SPS SPS;
-     typedef YamiParser::H265::SliceHeader SliceHeader;
-     typedef YamiParser::H265::NalUnit NalUnit;
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0007-Delete-unused-variables.patch b/recipes-multimedia/libyami/libyami/0007-Delete-unused-variables.patch
deleted file mode 100644
index b80774c9..00000000
--- a/recipes-multimedia/libyami/libyami/0007-Delete-unused-variables.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b982997c96e11b9c0b3cd58a31af2d0a219713a3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 18:39:58 -0700
-Subject: [PATCH 7/9] Delete unused variables
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- decoder/vaapidecoder_vp8.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/decoder/vaapidecoder_vp8.cpp b/decoder/vaapidecoder_vp8.cpp
-index 5fc89ec..ff5b896 100644
--- a/decoder/vaapidecoder_vp8.cpp
-+++ b/decoder/vaapidecoder_vp8.cpp
-@@ -32,12 +32,12 @@ typedef VaapiDecoderVP8::PicturePtr PicturePtr;
- 
- // the following parameter apply to Intra-Predicted Macroblocks,
- // $11.2 $11.4: key frame default probs
-static const uint8_t keyFrameYModeProbs[4] = { 145, 156, 163, 128 };
-static const uint8_t keyFrameUVModeProbs[3] = { 142, 114, 183 };
-+//static const uint8_t keyFrameYModeProbs[4] = { 145, 156, 163, 128 };
-+//static const uint8_t keyFrameUVModeProbs[3] = { 142, 114, 183 };
- 
- // $16.1: non-key frame default probs
-static const uint8_t nonKeyFrameDefaultYModeProbs[4] = { 112, 86, 140, 37 };
-static const uint8_t nonKeyFrameDefaultUVModeProbs[3] = { 162, 101, 204 };
-+//static const uint8_t nonKeyFrameDefaultYModeProbs[4] = { 112, 86, 140, 37 };
-+//static const uint8_t nonKeyFrameDefaultUVModeProbs[3] = { 162, 101, 204 };
- 
- static const uint32_t surfaceNumVP8 = 3;
- 
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0008-NalUnit-is-declared-in-different-namespace.patch b/recipes-multimedia/libyami/libyami/0008-NalUnit-is-declared-in-different-namespace.patch
deleted file mode 100644
index 18b98be8..00000000
--- a/recipes-multimedia/libyami/libyami/0008-NalUnit-is-declared-in-different-namespace.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c54130511c91e457f1c5bb47729f5e3a0fc0cb91 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 18:42:28 -0700
-Subject: [PATCH 8/9] NalUnit is declared in different namespace
-Fixes
-vaapidecoder_h265.h:32:5: error: struct 'NalUnit' was previously declared as a class       [-Werror,-Wmismatched-tags]                                                                                    struct NalUnit;
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- decoder/vaapidecoder_h265.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/decoder/vaapidecoder_h265.h b/decoder/vaapidecoder_h265.h
-index 159e25f..674638f 100644
--- a/decoder/vaapidecoder_h265.h
-+++ b/decoder/vaapidecoder_h265.h
-@@ -29,7 +29,7 @@ namespace YamiParser {
- namespace H265 {
-     struct SPS;
-     struct SliceHeader;
-    struct NalUnit;
-+    class NalUnit;
-     class Parser;
- };
- };
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami/0009-Fix-clang-warnings.patch b/recipes-multimedia/libyami/libyami/0009-Fix-clang-warnings.patch
deleted file mode 100644
index 08ef455b..00000000
--- a/recipes-multimedia/libyami/libyami/0009-Fix-clang-warnings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a54dc7b6a777882f55a3f31bd97748a261db03d2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Aug 2017 18:53:06 -0700
-Subject: [PATCH 9/9] Fix clang warnings
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- encoder/vaapiencoder_h264.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/encoder/vaapiencoder_h264.cpp b/encoder/vaapiencoder_h264.cpp
-index 98bc2ed..94015cb 100644
--- a/encoder/vaapiencoder_h264.cpp
-+++ b/encoder/vaapiencoder_h264.cpp
-@@ -509,7 +509,7 @@ bit_writer_write_sps(BitWriter* bitwriter,
-         }
-         /* vcl_hrd_parameters_present_flag */
-         bitwriter->writeBits(0, 1);
-        if (nal_hrd_parameters_present_flag || 0/*vcl_hrd_parameters_present_flag*/) {
-+        if (nal_hrd_parameters_present_flag || !!(0)/*vcl_hrd_parameters_present_flag*/) {
-             /* low_delay_hrd_flag */
-             bitwriter->writeBits(0, 1);
-         }
-@@ -1889,7 +1889,7 @@ bool VaapiEncoderH264::addSliceHeaders (const PicturePtr& picture) const
-         sliceParam->num_macroblocks = curSliceMbs;
-         sliceParam->macroblock_info = VA_INVALID_ID;
-         sliceParam->slice_type = h264_get_slice_type (picture->m_type);
-        assert (sliceParam->slice_type != -1);
-+        assert ((int)sliceParam->slice_type != -1);
-         sliceParam->idr_pic_id = m_idrNum;
-         sliceParam->pic_order_cnt_lsb = picture->m_poc % m_maxPicOrderCnt;
- 
-- 
-2.14.1
diff --git a/recipes-multimedia/libyami/libyami_1.3.0.bb b/recipes-multimedia/libyami/libyami_1.3.0.bb
deleted file mode 100644
index ce4f253a..00000000
--- a/recipes-multimedia/libyami/libyami_1.3.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Yami is media infrastructure base on libva"
-DESCRIPTION = "Yet Another Media Infrastructure \
-light weight hardware codec library base on VA-API "
-HOMEPAGE = "https://github.com/intel/libyami"
-BUGTRACKER = "https://github.com/intel/libyami/issues/new"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/intel/libyami.git;branch=apache \
-           file://0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch \
-           file://0002-typecast-index-from-size_t-to-int.patch \
-           file://0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch \
-           file://0004-Typecast-POWER32SUB2-to-uint8_t.patch \
-           file://0005-move-c-definitions-out-of-extern-C-block.patch \
-           file://0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch \
-           file://0007-Delete-unused-variables.patch \
-           file://0008-NalUnit-is-declared-in-different-namespace.patch \
-           file://0009-Fix-clang-warnings.patch \
-           file://0001-Makefile.am-point-to-build-dir-for-generated-headers.patch \
-"
-SRCREV = "0192c3c041e02e8eb753e9e3e02bfc7b55756ce2"
-S = "${WORKDIR}/git"
-PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender"
-DEPENDS = "libva"
-inherit autotools pkgconfig distro_features_check
-REQUIRED_DISTRO_FEATURES = "opengl"
-UPSTREAM_CHECK_URI = "https://github.com/intel/libyami/releases"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch b/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch
new file mode 100644
index 00000000..87c4e82e
--- /dev/null
+++ b/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch
@@ -0,0 +1,49 @@
+From be7cec47777bd35c44a59f2af73f12ce9c26d65c Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 7 Oct 2020 09:33:06 +0800
+Subject: [PATCH] FindITT.cmake: fix detection of header/library
+Use find_library to check for the library so distributions installing to
+standard locations can also work in addition to custom paths specified
+using CMAKE_ITT_HOME.
+Also add ittnotify to PATH_SUFFIXES for header for cases when
+ittnotify.h is installed in /usr/include/ittnotify for example.
+Upstream-Status: Submitted
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ builder/FindITT.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/builder/FindITT.cmake b/builder/FindITT.cmake
+index ba2542c5..d96acf2e 100644
+--- a/builder/FindITT.cmake
+++ b/builder/FindITT.cmake
+@@ -35,19 +35,19 @@ if( ENABLE_ITT )
+ 
+     find_path( ITT_INCLUDE_DIRS ittnotify.h
+       PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
+-      PATH_SUFFIXES include )
+      PATH_SUFFIXES include ittnotify)
+ 
+     # Unfortunately SEAPI and VTune uses different names for itt library:
+     #  * SEAPI uses libittnotify${arch}.a
+     #  * VTune uses libittnotify.a
+     # We are trying to check both giving preference to SEAPI name.
+-    find_path( ITT_LIBRARY_DIRS libittnotify${arch}.a
+    find_library( ITT_LIBRARY_DIRS ittnotify${arch}
+       PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
+       PATH_SUFFIXES lib64 )
+     if( NOT ITT_LIBRARY_DIRS MATCHES NOTFOUND )
+       set( ITT_LIBRARIES "ittnotify${arch}" )
+     else()
+-      find_path( ITT_LIBRARY_DIRS libittnotify.a
+      find_library( ITT_LIBRARY_DIRS ittnotify
+         PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
+         PATH_SUFFIXES lib64 )
+       if( NOT ITT_LIBRARY_PATH MATCHES NOTFOUND )
+-- 
+2.26.2
diff --git a/recipes-multimedia/mediasdk/files/fix-gcc13.patch b/recipes-multimedia/mediasdk/files/fix-gcc13.patch
new file mode 100644
index 00000000..fb973870
--- /dev/null
+++ b/recipes-multimedia/mediasdk/files/fix-gcc13.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inactive-Upstream
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+diff --git a/api/mfx_dispatch/linux/mfxparser.cpp b/api/mfx_dispatch/linux/mfxparser.cpp
+index 9d3823ec3e..12e46d1881 100644
+--- a/api/mfx_dispatch/linux/mfxparser.cpp
+++ b/api/mfx_dispatch/linux/mfxparser.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <ctype.h>
+ #include <stdio.h>
+#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb
new file mode 100644
index 00000000..f00a4404
--- /dev/null
+++ b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb
@@ -0,0 +1,63 @@
+SUMMARY = "Intel(R) Media SDK for hardware accelerated media processing"
+DESCRIPTION = "Intel(R) Media SDK provides an API to access hardware-accelerated \
+video decode, encode and filtering on Intel® platforms with integrated graphics."
+HOMEPAGE = "https://github.com/Intel-Media-SDK/MediaSDK"
+BUGTRACKER = "https://github.com/Intel-Media-SDK/MediaSDK/issues"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3cb331af679cd8f968bf799a9c55b46e"
+CVE_DETAILS = "intel:media_sdk"
+# Only for 64 bit until media-driver issues aren't fixed
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:x86-x32 = "null"
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "opengl"
+DEPENDS += "libva"
+RDEPENDS:${PN} += "intel-media-driver"
+PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \
+                   samples \
+                   itt \
+                   "
+PACKAGECONFIG[dri3]     = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF"
+PACKAGECONFIG[itt]      = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt"
+PACKAGECONFIG[opencl]   = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, virtual/opencl-icd opencl-clhpp opencl-headers"
+PACKAGECONFIG[samples]  = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF"
+PACKAGECONFIG[wayland]  = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native"
+SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \
+           file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
+           file://fix-gcc13.patch \
+           "
+SRCREV = "869b60a6c3d7b5e9f7c3b3b914986322dca4bbae"
+S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$"
+inherit cmake pkgconfig
+EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include"
+do_install:append() {
+        mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples
+}
+PACKAGE_BEFORE_PN = " ${PN}-samples"
+FILES:${PN} += " \
+                 ${libdir}/mfx \
+                 ${datadir}/mfx/plugins.cfg \
+                 "
+FILES:${PN}-samples = "${libdir}/mfx/samples"
+INSANE_SKIP:${PN}-samples += "staticdev"
diff --git a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch
new file mode 100644
index 00000000..8d1f3380
--- /dev/null
+++ b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch
@@ -0,0 +1,39 @@
+From a425927469b36e7bc597bff4fdc24d42a1168d1a Mon Sep 17 00:00:00 2001
+From: gfxVPLsdm <gfxvplsdm@intel.com>
+Date: Mon, 18 Dec 2023 09:58:35 +0800
+Subject: [PATCH] ARLH DID open source (#6286)
+Co-authored-by: huangli <li.h.huang@intel.com>
+Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/66f1b4d60a367eb1b0774e0b4369f906e0e632ae]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ _studio/shared/include/mfxstructures-int.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+diff --git a/_studio/shared/include/mfxstructures-int.h b/_studio/shared/include/mfxstructures-int.h
+index 363d9a63..8f16b0a8 100644
+--- a/_studio/shared/include/mfxstructures-int.h
+++ b/_studio/shared/include/mfxstructures-int.h
+@@ -1,4 +1,4 @@
+-// Copyright (c) 2007-2021 Intel Corporation
+// Copyright (c) 2007-2023 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
+@@ -569,6 +569,11 @@ typedef struct {
+     /* ARL S */
+     { 0x7D67, MFX_HW_ARL, MFX_GT2 },
+ 
+    /* ARL H*/
+    { 0x7D51, MFX_HW_ARL, MFX_GT2 },
+    { 0x7DD1, MFX_HW_ARL, MFX_GT2 },
+    { 0x7D41, MFX_HW_ARL, MFX_GT2 },
+
+ };
+ 
+ /*
+-- 
+2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
new file mode 100644
index 00000000..8e014c97
--- /dev/null
+++ b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
@@ -0,0 +1,32 @@
+From e118062518c95d8fb0080cc8276b123a90bd0eb9 Mon Sep 17 00:00:00 2001
+From: gfxVPLsdm <gfxvplsdm@intel.com>
+Date: Wed, 21 Feb 2024 17:11:52 +0800
+Subject: [PATCH] Fix SetBuffersYV12() V & U plane offsets calculation (#6475)
+Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
+Co-authored-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
+Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/ce704ddfe11724767ba86c9425a3917dc3100d4a]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ _studio/shared/src/libmfx_core_vaapi.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp
+index 2cad86f8..fd5fc269 100644
+--- a/_studio/shared/src/libmfx_core_vaapi.cpp
+++ b/_studio/shared/src/libmfx_core_vaapi.cpp
+@@ -462,8 +462,8 @@ public:
+         }
+         else
+         {
+-            eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[1] / 2);
+-            eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[2] / 2);
+            eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[0]);
+            eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[1] / 2);
+         }
+         eb.num_planes = 3;
+         eb.data_size = eb.offsets[2] + (eb.height * eb.pitches[2] / 2);
+-- 
+2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch
new file mode 100644
index 00000000..e3854407
--- /dev/null
+++ b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch
@@ -0,0 +1,96 @@
+From 40c0bc6d3dfe172dd25908df2c16de29c34fa4d4 Mon Sep 17 00:00:00 2001
+From: gfxVPLsdm <gfxvplsdm@intel.com>
+Date: Mon, 5 Feb 2024 17:14:07 +0800
+Subject: [PATCH] [JPEGe] Enable BGR4 JPEG Enc support (#6470)
+Co-authored-by: vcheah <vincent.beng.keat.cheah@intel.com>
+Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/e73763d05f8fdc348c356b58dcb83075b5e868f8]
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ .../mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp  | 6 ++++--
+ .../encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp    | 9 +++++----
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
+index 141564b1..332f6372 100644
+--- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
+++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
+@@ -212,7 +212,8 @@ mfxStatus MFXVideoENCODEMJPEG_HW::QueryImplsDescription(
+     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YV12;
+     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YUY2;
+     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_RGB4;
+-    memCaps.NumColorFormats = 4;
+    ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_BGR4;
+    memCaps.NumColorFormats = 5;
+ 
+     ah.PushBack(profileCaps.MemDesc);
+     profileCaps.MemDesc[1] = profileCaps.MemDesc[0];
+@@ -392,7 +393,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Query(VideoCORE * core, mfxVideoParam *in, mfx
+         if ((fourCC == 0 && chromaFormat == 0) ||
+             (fourCC == MFX_FOURCC_NV12 && (chromaFormat == MFX_CHROMAFORMAT_YUV420 || chromaFormat == MFX_CHROMAFORMAT_YUV400)) ||
+             (fourCC == MFX_FOURCC_YUY2 && chromaFormat == MFX_CHROMAFORMAT_YUV422H) ||
+-            (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444))
+            ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444))
+         {
+             out->mfx.FrameInfo.FourCC = in->mfx.FrameInfo.FourCC;
+             out->mfx.FrameInfo.ChromaFormat = in->mfx.FrameInfo.ChromaFormat;
+@@ -698,6 +699,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Init(mfxVideoParam *par)
+             doubleBytesPerPx = 4;
+             break;
+         case MFX_FOURCC_RGB4:
+        case MFX_FOURCC_BGR4:
+         default:
+             doubleBytesPerPx = 8;
+             break;
+diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
+index 3fc619d1..b1ab556e 100644
+--- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
+++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
+@@ -108,6 +108,7 @@ mfxStatus MfxHwMJpegEncode::CheckJpegParam(VideoCORE *core, mfxVideoParam & par,
+             BytesPerPx = 2;
+             break;
+         case MFX_FOURCC_RGB4:
+        case MFX_FOURCC_BGR4:
+         default:
+             BytesPerPx = 4;
+     }
+@@ -157,7 +158,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
+ 
+     m_payload_base.length = 0;
+     m_payload_list.clear();
+-    if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)
+    if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)  && chromaFormat == MFX_CHROMAFORMAT_YUV444)
+     {
+         m_app14_data.header    = 0xEEFF;//APP14
+         m_app14_data.lenH      = 0;
+@@ -287,7 +288,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
+         m_pps.num_components = 3;
+     else if (fourCC == MFX_FOURCC_NV12 && chromaFormat == MFX_CHROMAFORMAT_YUV400)
+         m_pps.num_components = 1;
+-    else if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)
+    else if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444)
+         m_pps.num_components = 3;
+     else
+         MFX_RETURN(MFX_ERR_UNDEFINED_BEHAVIOR);
+@@ -341,7 +342,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
+     {
+         // No external tables - use Quality parameter
+         m_dqt_list.resize(0);
+-        if (fourCC == MFX_FOURCC_RGB4)
+        if (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)
+         {
+             m_pps.quantiser_table_selector[0] = 0;
+             m_pps.quantiser_table_selector[1] = 0;
+@@ -393,7 +394,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
+         {
+             m_dht_list.resize(0);
+         }
+-        else if (hwCaps->MaxNumHuffTable == 1 || fourCC == MFX_FOURCC_RGB4)
+        else if (hwCaps->MaxNumHuffTable == 1 || (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4))
+         {
+             m_dht_list.resize(1);
+ 
+-- 
+2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch b/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
new file mode 100644
index 00000000..762a4902
--- /dev/null
+++ b/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
@@ -0,0 +1,28 @@
+From 630c32194f53c70f4f654fb3d198790df253ba1f Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Thu, 15 Jun 2023 13:43:32 +0200
+Subject: [PATCH] vpl.pc.in: dont pass pcfiledir to cflags
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Inappropriate [oe specific]
+---
+ libvpl/pkgconfig/vpl.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/libvpl/pkgconfig/vpl.pc.in b/libvpl/pkgconfig/vpl.pc.in
+index ab468a9..05c020e 100644
+--- a/libvpl/pkgconfig/vpl.pc.in
+++ b/libvpl/pkgconfig/vpl.pc.in
+@@ -8,6 +8,6 @@ Description: oneAPI Video Processing Library
+ Version: @API_VERSION_MAJOR@.@API_VERSION_MINOR@
+ URL: https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html
+ 
+-Libs: -L${libdir} -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@
+Libs: -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@
+ Libs.private: @VPL_PKGCONFIG_PRIVATE_LIBS@
+-Cflags: -I${includedir} -I${includedir}/vpl
+Cflags: -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/vpl
+-- 
+2.40.1
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb
new file mode 100644
index 00000000..0b849bf1
--- /dev/null
+++ b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Intel(R) oneVPL runtime for Intel GPU accelerated media processing"
+DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \
+video decode, encode and filtering on Intel® graphics."
+HOMEPAGE = "https://github.com/oneapi-src/oneVPL-intel-gpu"
+BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b"
+PE = "1"
+# Only for 64 bit
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:x86-x32 = "null"
+DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native"
+RDEPENDS:${PN} += "intel-media-driver"
+SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \
+           file://0001-ARLH-DID-open-source-6286.patch \
+           file://0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch \
+           file://0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch \
+          "
+SRCREV = "852fa9f705ef44c004d014548601f3804a6de705"
+S = "${WORKDIR}/git"
+FILES:${PN} += " \
+                ${libdir}/libmfx-gen/enctools.so \
+               "
+inherit cmake
diff --git a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb b/recipes-multimedia/onevpl/onevpl_2023.4.0.bb
new file mode 100644
index 00000000..513c7f2c
--- /dev/null
+++ b/recipes-multimedia/onevpl/onevpl_2023.4.0.bb
@@ -0,0 +1,40 @@
+SUMMARY = "oneAPI Video Processing Library"
+DESCRIPTION = "The oneAPI Video Processing Library (oneVPL) provides \
+a single video processing API for encode, decode, and video processing \
+that works across a wide range of accelerators."
+HOMEPAGE = "https://github.com/oneapi-src/oneVPL"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \
+                    file://third-party-programs.txt;md5=0e35a23482445dd089b4eabe19103a06"
+SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \
+           file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \
+            "
+SRCREV = "2274efcd3672b43297ef774f332e1fed6781381c"
+S = "${WORKDIR}/git"
+inherit cmake
+DEPENDS += "libva pkgconfig-native"
+PACKAGECONFIG ??= "tools"
+PACKAGECONFIG[tools] = "-DBUILD_TOOLS=ON, -DBUILD_TOOLS=OFF, wayland wayland-native wayland-protocols"
+do_install:append() {
+        mkdir -p ${D}${datadir}/oneVPL/samples
+        mv ${D}${bindir}/sample_* ${D}${datadir}/oneVPL/samples
+}
+COMPATIBLE_HOST = '(x86_64).*-linux'
+PACKAGES =+ "${PN}-examples"
+FILES:${PN}-examples = "${datadir}/vpl \
+                       "
+FILES_SOLIBSDEV = ""
+FILES:${PN}-dev += "${libdir}/libvpl.so"
+FILES:${PN} += " ${datadir}/oneVPL/samples  \
+                ${libdir}/vpl/libvpl_wayland.so \
+                "
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch b/recipes-oneapi/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch
new file mode 100644
index 00000000..58ed1c9a
--- /dev/null
+++ b/recipes-oneapi/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch
@@ -0,0 +1,27 @@
+From efedbf9080c19241c2aa9ee7ba901245d38c8fa2 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Mon, 7 Mar 2022 16:44:24 +0800
+Subject: [PATCH 1/2] CMakeLists.txt: exclude host system headers
+Upstream-Status: Inappropriate
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ sources/ippcp/crypto_mb/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+diff --git a/sources/ippcp/crypto_mb/CMakeLists.txt b/sources/ippcp/crypto_mb/CMakeLists.txt
+index c4cc82a..4094f34 100644
+--- a/sources/ippcp/crypto_mb/CMakeLists.txt
+++ b/sources/ippcp/crypto_mb/CMakeLists.txt
+@@ -82,7 +82,6 @@ include_directories(
+      ${CRYPTO_MB_INCLUDE_DIR}
+      ${OPENSSL_INCLUDE_DIR}
+      $<$<C_COMPILER_ID:Intel>:$ENV{ROOT}/compiler/include $ENV{ROOT}/compiler/include/icc>
+-     $<$<NOT:$<C_COMPILER_ID:Intel>>:${CMAKE_SYSTEM_INCLUDE_PATH}>
+      $<$<OR:$<C_COMPILER_ID:Intel>,$<BOOL:${MSVC_IDE}>>:$ENV{INCLUDE}>
+ )
+ 
+-- 
+2.17.1
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch
new file mode 100644
index 00000000..c47c8de5
--- /dev/null
+++ b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch
@@ -0,0 +1,42 @@
+From 3b7b4eca54aa8d851e37f60c74e4a027fa7b21f2 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 14 Jun 2023 13:18:45 +0800
+Subject: [PATCH] crypto-mb: Make sure libs are installed correctly
+Dont assume that "lib" is always the correct destination. This fixes
+multilib builds when libdir != /usr/lib.
+Upstream-Status: Pending
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ sources/ippcp/crypto_mb/src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/sources/ippcp/crypto_mb/src/CMakeLists.txt b/sources/ippcp/crypto_mb/src/CMakeLists.txt
+index c9cad06..31f52bd 100644
+--- a/sources/ippcp/crypto_mb/src/CMakeLists.txt
+++ b/sources/ippcp/crypto_mb/src/CMakeLists.txt
+@@ -123,8 +123,8 @@ endif(DYNAMIC_LIB OR MB_STANDALONE)
+ # Installation of the shared library
+ if (MB_STANDALONE) # standalone crypto_mb's cmake run
+     install(TARGETS ${MB_DYN_LIB_TARGET}
+-            LIBRARY DESTINATION "lib"
+-            RUNTIME DESTINATION "lib"
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+             PUBLIC_HEADER DESTINATION "include/crypto_mb")
+ elseif (DYNAMIC_LIB) # build from ippcp's cmake
+     install(TARGETS ${MB_DYN_LIB_TARGET}
+@@ -154,7 +154,7 @@ endif()
+ # Static lib installation
+ if(MB_STANDALONE)
+     install(TARGETS ${MB_STATIC_LIB_TARGET}
+-            ARCHIVE DESTINATION "lib"
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+             PUBLIC_HEADER DESTINATION "include/crypto_mb")
+ else()
+     install(TARGETS ${MB_STATIC_LIB_TARGET}
+-- 
+2.37.3
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch b/recipes-oneapi/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch
new file mode 100644
index 00000000..62b56ea2
--- /dev/null
+++ b/recipes-oneapi/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch
@@ -0,0 +1,45 @@
+From b4549bb765d279b5ba042c6340e1dd69d0890b64 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Thu, 10 Mar 2022 14:30:01 +0800
+Subject: [PATCH 2/2] cmake: exclude Yocto build flags
+Ipp-crypto has its own set of flags and -march values,
+which causes conflict with default -march=nehalem in gcc
+Upstream-Status: Inappropriate
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ sources/ippcp/crypto_mb/src/CMakeLists.txt        | 2 +-
+ sources/ippcp/crypto_mb/src/cmake/linux/GNU.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/sources/ippcp/crypto_mb/src/CMakeLists.txt b/sources/ippcp/crypto_mb/src/CMakeLists.txt
+index 1ca1a8c..5284d62 100644
+--- a/sources/ippcp/crypto_mb/src/CMakeLists.txt
+++ b/sources/ippcp/crypto_mb/src/CMakeLists.txt
+@@ -81,7 +81,7 @@ endif()
+ set(MB_LIB_TARGET ${MB_DYN_LIB_TARGET})
+ 
+ set_source_files_properties(${CRYPTO_MB_SOURCES} PROPERTIES COMPILE_DEFINITIONS  "${AVX512_LIBRARY_DEFINES}"
+-                                                            COMPILE_FLAGS        "${AVX512_CFLAGS} ${CMAKE_ASM_FLAGS} ${CMAKE_C_FLAGS_SECURITY}")
+                                                            COMPILE_FLAGS        "${AVX512_CFLAGS} ${CMAKE_C_FLAGS_SECURITY}")
+ 
+ # Don't specify architectural flags for the assembler for this sources, because of the bug in Intel® C Compiler under MacOS: error: invalid instruction mnemonic 'vkmovb'
+ # The bug has been fixed since version 2021.3. This is a workaround to support older versions of Intel® C Compiler.
+diff --git a/sources/ippcp/crypto_mb/src/cmake/linux/GNU.cmake b/sources/ippcp/crypto_mb/src/cmake/linux/GNU.cmake
+index a2abeeb..aadd6e2 100644
+--- a/sources/ippcp/crypto_mb/src/cmake/linux/GNU.cmake
+++ b/sources/ippcp/crypto_mb/src/cmake/linux/GNU.cmake
+@@ -58,7 +58,7 @@ set(LINK_FLAGS_DYNAMIC "${LINK_FLAGS_DYNAMIC} ${CRYPTO_MB_SOURCES_DIR}/cmake/dll
+ # Compiler flags
+ 
+ # Tells the compiler to align functions and loops
+-set(CMAKE_C_FLAGS " -falign-functions=32 -falign-loops=32")
+set(CMAKE_C_FLAGS " -falign-functions=32 -falign-loops=32 ${TOOLCHAIN_OPTIONS}")
+ # Ensures that compilation takes place in a freestanding environment
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffreestanding")
+ 
+-- 
+2.17.1
diff --git a/recipes-oneapi/crypto/intel-crypto-mb_2021.11.1.bb b/recipes-oneapi/crypto/intel-crypto-mb_2021.11.1.bb
new file mode 100644
index 00000000..be72fd85
--- /dev/null
+++ b/recipes-oneapi/crypto/intel-crypto-mb_2021.11.1.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Crypto Multi-buffer Library"
+DESCRIPTION = "Intel® Integrated Performance Primitives (Intel® IPP) Cryptography \
+is a secure, fast and lightweight library of building blocks for cryptography, \
+highly-optimized for various Intel® CPUs."
+HOMEPAGE = "https://github.com/intel/ipp-crypto"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://../../../LICENSE;md5=e787af283468feca985d6b865d27d95b"
+IPP_BRANCH = "ipp-crypto_${@'_'.join(d.getVar('PV').rsplit('.')[-3:])}"
+SRC_URI = "git://github.com/intel/ipp-crypto;protocol=https;branch=${IPP_BRANCH} \
+           file://0001-CMakeLists.txt-exclude-host-system-headers.patch;striplevel=4 \
+           file://0002-cmake-exclude-Yocto-build-flags.patch;striplevel=4 \
+           file://0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch;striplevel=4 \
+           "
+SRCREV = "d02611e34328898d16025467d3deeb7d62b6076b"
+S = "${WORKDIR}/git/sources/ippcp/crypto_mb"
+DEPENDS = "openssl"
+inherit cmake pkgconfig
+COMPATIBLE_HOST = '(x86_64).*-linux'
+EXTRA_OECMAKE += " -DARCH=intel64"
+EXTRA_OECMAKE += " -DTOOLCHAIN_OPTIONS='${TOOLCHAIN_OPTIONS}'"
diff --git a/recipes-oneapi/onedpl/onedpl_2022.3.0.bb b/recipes-oneapi/onedpl/onedpl_2022.3.0.bb
new file mode 100644
index 00000000..d80b64c9
--- /dev/null
+++ b/recipes-oneapi/onedpl/onedpl_2022.3.0.bb
@@ -0,0 +1,26 @@
+SUMMARY  = "oneAPI DPC++ Library (oneDPL)"
+DESCRIPTION = "The oneAPI DPC++ Library (oneDPL) aims to work with the \
+oneAPI DPC++ Compiler to provide high-productivity APIs to developers, \
+which can minimize DPC++ programming efforts across devices for high \
+performance parallel applications."
+HOMEPAGE = "https://github.com/oneapi-src/oneDPL"
+LICENSE  = "Apache-2.0-with-LLVM-exception"
+LIC_FILES_CHKSUM = "file://licensing/LICENSE.txt;md5=2e982d844baa4df1c80de75470e0c5cb \
+                    file://licensing/third-party-programs.txt;md5=cfb8d6b1f04a8fcc7d0dddd817619634"
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/oneapi-src/oneDPL.git;protocol=https;branch=release/2022.3 \
+            "
+SRCREV = "180f18ad25fbc39fa13bad43f1df7d54ee8f5609"
+do_compile[noexec] = "1"
+do_configure[noexec] = "1"
+do_install() {
+     install -d -m 755 ${D}${includedir}/onedpl
+     cp -r ${S}/include/* ${D}${includedir}/onedpl
+}
+UPSTREAM_CHECK_GITTAGREGEX = "^oneDPL-(?P<pver>(\d+(\.\d+)+))-release$"
diff --git a/recipes-oneapi/setup-oneapi-env/files/intel-oneapi-runtime.conf b/recipes-oneapi/setup-oneapi-env/files/intel-oneapi-runtime.conf
new file mode 100644
index 00000000..5faf9854
--- /dev/null
+++ b/recipes-oneapi/setup-oneapi-env/files/intel-oneapi-runtime.conf
@@ -0,0 +1,4 @@
+/opt/intel/oneapi/lib
+/opt/intel/oneapi/lib/intel64
+/opt/intel/oneapi/lib/ia32
+/opt/intel/oneapi/lib/emu
diff --git a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
new file mode 100644
index 00000000..702f794e
--- /dev/null
+++ b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Intel® oneAPI runtime libraries environment set up"
+DESCRIPTION = "Recipe to set up the environment for Intel® oneAPI runtime libraries \
+via configuration file in ld.so.conf.d directory."
+LICENSE = "EULA"
+LIC_FILES_CHKSUM = "file://${CUSTOM_LICENSES_PATH}/EULA;md5=7bfc91523de2e84e7131d0eacf2827d4"
+SRC_URI = "file://intel-oneapi-runtime.conf"
+do_install() {
+    mkdir -p ${D}${sysconfdir}/ld.so.conf.d/
+    install -m 644 ${WORKDIR}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
+}
+pkg_postinst_ontarget:${PN}() {
+if [ x"$D" = "x" ]; then
+    if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
+fi
+}
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-rt/images/core-image-rt-sdk.bb b/recipes-rt/images/core-image-rt-sdk.bb
index 6b43a872..920c4cee 100644
--- a/recipes-rt/images/core-image-rt-sdk.bb
+++ b/recipes-rt/images/core-image-rt-sdk.bb
@@ -11,7 +11,7 @@ python () {
 DESCRIPTION = "Small image capable of booting a device with a test suite and \
 tools for real-time use. It includes the full meta-toolchain, development \
 headers and libraries to form a standalone SDK."
-DEPENDS = "linux-intel-rt"
+DEPENDS += "linux-intel-rt"
 IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
diff --git a/recipes-rt/images/core-image-rt.bb b/recipes-rt/images/core-image-rt.bb
index 4db0a579..1578c9e6 100644
--- a/recipes-rt/images/core-image-rt.bb
+++ b/recipes-rt/images/core-image-rt.bb
@@ -10,7 +10,7 @@ python () {
 DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
 real-time test suite and tools appropriate for real-time use."
-DEPENDS = "linux-intel-rt"
+DEPENDS += "linux-intel-rt"
 IMAGE_INSTALL += "rt-tests hwlatdetect"
diff --git a/recipes-selftest/images/secureboot-selftest-image-unsigned.bb b/recipes-selftest/images/secureboot-selftest-image-unsigned.bb
index e03e7b47..d0fa6405 100644
--- a/recipes-selftest/images/secureboot-selftest-image-unsigned.bb
+++ b/recipes-selftest/images/secureboot-selftest-image-unsigned.bb
@@ -1,12 +1,12 @@
 require recipes-core/images/core-image-minimal.bb
-DEPENDS_remove = "grub-efi"
+DEPENDS:remove = "grub-efi"
 inherit uefi-comboapp
 WKS_FILE = "generic-bootdisk.wks.in"
-do_uefiapp_deploy_append() {
+do_uefiapp_deploy:append() {
    for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi; do
        target=`basename $i`
        target=`echo $target | sed -e 's/${IMAGE_LINK_NAME}.//'`
diff --git a/recipes-support/isa-l/isa-l_2.31.0.bb b/recipes-support/isa-l/isa-l_2.31.0.bb
new file mode 100644
index 00000000..d5d09002
--- /dev/null
+++ b/recipes-support/isa-l/isa-l_2.31.0.bb
@@ -0,0 +1,19 @@
+SUMMARY  = "Intelligent Storage Acceleration Library"
+DESCRIPTION = "ISA-L is a collection of optimized low-level functions \
+targeting storage applications."
+LICENSE  = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2476688d0948d4a3f7c69473a603540d"
+SECTION = "lib"
+inherit autotools pkgconfig
+S = "${WORKDIR}/git"
+SRCREV = "bd226375027899087bd48f3e59b910430615cc0a"
+SRC_URI = "git://github.com/intel/isa-l.git;branch=master;protocol=https"
+DEPENDS = "nasm-native"
+AS[unexport] = "1"
+TARGET_CC_ARCH += "${LDFLAGS}"
+COMPATIBLE_HOST = '(x86_64).*-linux'
diff --git a/recipes-support/libipt/libipt_2.1.1.bb b/recipes-support/libipt/libipt_2.1.1.bb
new file mode 100644
index 00000000..205967c1
--- /dev/null
+++ b/recipes-support/libipt/libipt_2.1.1.bb
@@ -0,0 +1,34 @@
+SUMMARY  = "Intel(R) Processor Trace Decoder Library"
+DESCRIPTION = "The Intel Processor Trace (Intel PT) Decoder Library is Intel's \
+reference implementation for decoding Intel PT. It can be used as a standalone \
+library or it can be partially or fully integrated into your tool."
+HOMEPAGE = "https://github.com/intel/libipt"
+LICENSE  = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a429afa59f273b5d12778eda69d10313"
+inherit pkgconfig cmake
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/intel/libipt.git;protocol=https;branch=stable/v2.1"
+SRCREV = "1c9bc700f4b9a71fd2d1cf1742de7e2351ddb281"
+EXTRA_OECMAKE += " \
+                  -DPTDUMP=ON  \
+                  -DPTTC=ON \
+                  -DPTSEG=ON \
+                  -DCMAKE_SKIP_RPATH=ON \
+                  "
+do_install:append() {
+    install -d ${D}${bindir}/libipt
+    install -d ${D}${bindir}/libipt/tests
+    cp -r ${B}/bin/* ${D}${bindir}/libipt/
+    cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests
+}
+FILES:${PN}-test = "${bindir}"
+PACKAGES =+ "${PN}-test"
diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb
index 430a6a78..5a9f5b4d 100644
--- a/recipes-support/sbsigntool/sbsigntool-native_git.bb
+++ b/recipes-support/sbsigntool/sbsigntool-native_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Utility for signing and verifying files for UEFI Secure Boot"
-LICENSE = "GPLv3 & LGPL-2.1 & LGPL-3.0 & MIT"
+LICENSE = "GPL-3.0-only & LGPL-2.1-only & LGPL-3.0-only & MIT"
 # sbsigntool statically links to libccan.a which is built with modules
 # passed to "create-ccan-tree" (and their dependencies). Therefore,
@@ -19,25 +19,29 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=9eef91148a9b14ec7f9df333daebc746 \
 # The original upstream is git://kernel.ubuntu.com/jk/sbsigntool but it has
 # not been maintained and many patches have been backported in this repo.
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \
-           git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan \
+           git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \
-          "
+           file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \
+           "
-SRCREV_sbsigntools  ?= "efbb550858e7bd3f43e64228d22aea440ef6a14d"
+SRCREV_sbsigntools  ?= "9cfca9fe7aa7a8e29b92fe33ce8433e212c9a8ba"
 SRCREV_ccan         ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5"
 SRCREV_FORMAT       =  "sbsigntools_ccan"
-DEPENDS = "binutils-native gnu-efi-native help2man-native openssl10-native util-linux-native"
+DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native"
-PV = "0.8-git${SRCPV}"
+PV = "0.9.5"
 S = "${WORKDIR}/git"
-inherit native autotools pkgconfig
+inherit autotools pkgconfig
+inherit native
-do_configure_prepend() {
+do_configure:prepend() {
        cd ${S}
+        sed -i s#RECIPE_SYSROOT#${RECIPE_SYSROOT_NATIVE}#g configure.ac
        if [ ! -e lib/ccan ]; then
                # Use empty SCOREDIR because 'make scores' is not run.
@@ -75,3 +79,5 @@ EXTRA_OEMAKE = "\
              -I${STAGING_INCDIR_NATIVE} \
              -I${STAGING_INCDIR_NATIVE}/efi/${@efi_arch(d)}' \
    "
+CFLAGS:append = " -Wno-error"
diff --git a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch b/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch
new file mode 100644
index 00000000..ea7bee29
--- /dev/null
+++ b/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch
@@ -0,0 +1,54 @@
+From c3533b8da1e1425801d2fc0bcd231e13d593f16b Mon Sep 17 00:00:00 2001
+From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
+Date: Tue, 19 Feb 2019 20:07:45 +0800
+Subject: [PATCH] configure: Fixup build dependencies for cross-compiling
+When cross-compiling, custom header files and libraries need to be
+specified. sbsign assumes that all the dependencies are located
+under /usr/include and /usr/lib.
+Prepend these paths with a placeholder that can be replaced with the
+actual paths once they are resolved.
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
+Taken from :
+https://github.com/intel/luv-yocto/tree/master/meta-luv/recipes-devtools/sbsigntool/sbsigntool
+Corrected typo error and ported to version 0.9.2
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ configure.ac | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index 1459e91..3e34c8d 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -70,7 +70,10 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
+ ##
+ # no consistent view of where gnu-efi should dump the efi stuff, so find it
+ ##
+-for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
+for path in RECIPE_SYSROOT/lib RECIPE_SYSROOT/lib64 RECIPE_SYSROOT/usr/lib \
+            RECIPE_SYSROOT/usr/lib64 RECIPE_SYSROOT/usr/lib32 \
+            RECIPE_SYSROOT/lib/efi RECIPE_SYSROOT/lib64/efi \
+            RECIPE_SYSROOT/usr/lib/efi RECIPE_SYSROOT/usr/lib64/efi; do
+     if test -e $path/crt0-efi-$EFI_ARCH.o; then
+        CRTPATH=$path
+     fi
+@@ -79,7 +82,7 @@ if test -z "$CRTPATH"; then
+    AC_MSG_ERROR([cannot find the gnu-efi crt path])
+ fi
+ 
+-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
+EFI_CPPFLAGS="-IRECIPE_SYSROOT/usr/include/efi -IRECIPE_SYSROOT/usr/include/efi/$EFI_ARCH \
+  -DEFI_FUNCTION_WRAPPER"
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
+-- 
+2.7.4
diff --git a/wic/grub-bootdisk-microcode.wks.in b/wic/grub-bootdisk-microcode.wks.in
new file mode 100644
index 00000000..7dc66f98
--- /dev/null
+++ b/wic/grub-bootdisk-microcode.wks.in
@@ -0,0 +1,12 @@
+# short-description: Create an EFI disk image with grub-efi
+# long-description: Creates a partitioned EFI disk image that the user
+# can directly dd to boot media. The selected bootloader is grub-efi.
+# It also includes intel-microcode as an initrd for early update support.
+part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=microcode.cpio" --ondisk sda --label msdos --active --align 1024 --use-uuid
+part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid
+bootloader --ptable gpt --timeout=5 --append=" rootfstype=ext4 "
diff --git a/wic/image-installer.wks.in b/wic/image-installer.wks.in
new file mode 100644
index 00000000..933e8d85
--- /dev/null
+++ b/wic/image-installer.wks.in
@@ -0,0 +1,8 @@
+# create an installer disk image
+# populate content to install using IMAGE_BOOT_FILES
+part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER},title=install,label=install-efi,initrd=microcode.cpio;${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_FSTYPES}" --ondisk sda --label install --active --align 1024 --use-uuid
+part / --source bootimg-partition --ondisk sda --fstype=ext4 --label image --use-uuid --align 1024
+bootloader --ptable gpt --timeout=5 --append=" rootwait "
diff --git a/wic/systemd-bootdisk-microcode.wks b/wic/systemd-bootdisk-microcode.wks.in
index c171fd8e..925c1fa3 100644
--- a/wic/systemd-bootdisk-microcode.wks
+++ b/wic/systemd-bootdisk-microcode.wks.in
@@ -10,4 +10,4 @@ part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
 part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid
-bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"
+bootloader --ptable gpt --timeout=5 --append=" rootfstype=ext4 "