13 files changed, 662 insertions, 271 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.29.1.bb b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.29.1.bb
index ed36df43..9b564461 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.29.1.bb
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.29.1.bb
@@ -42,41 +42,45 @@ INSANE_SKIP:${PN} += "file-rdeps buildpaths"
 INSANE_SKIP:${PN}-dbg += "buildpaths"
 # Only need native tools for building, LLVM 20.1 is bundled
-# ncurses needed for libedit (LLVM dependency)
+# ARCHITECTURAL NOTE: This recipe uses a superbuild approach that builds LLVM internally.
-DEPENDS = "bison-native flex-native ninja-native ncurses"
+# CMake isolation flags prevent the superbuild from finding libraries in recipe-sysroot-native.
+# 
+# DEPENDS: Only native build tools, NO native libraries
+DEPENDS = "bison-native flex-native ninja-native"
 RDEPENDS:${PN}-ptest += "bash python3-multiprocessing"
 PACKAGECONFIG ??= ""
 # Default to Threads tasking model; override with TBB if enabled
 PACKAGECONFIG[tbb] = "-DISPCRT_BUILD_TASK_MODEL=TBB, , tbb"
-do_compile:prepend() {
+# Use superbuild with bundled LLVM 20.1
-    # Clean OE-specific flags from toolchain files for bundled LLVM build
+OECMAKE_SOURCEPATH = "${S}/superbuild"
+# Minimal patching of generated toolchain files to use full compiler paths
+do_configure:append() {
    for toolchain in stage1-toolchain.cmake stage2-toolchain.cmake; do
-        [ -f ${B}/${toolchain} ] || continue
+        if [ -f ${B}/${toolchain} ]; then
-        sed -i -e 's|set(CMAKE_C\(XX\)\?_FLAGS.*|set(CMAKE_C\1_FLAGS "")|g' \
+            # Replace symbolic compiler names with full paths for Yocto build environment
-               -e 's|set(CMAKE_\(EXE\|SHARED\|MODULE\)_LINKER_FLAGS.*|set(CMAKE_\1_LINKER_FLAGS "")|g' \
+            sed -i -e "s|set(CMAKE_C_COMPILER   cc)|set(CMAKE_C_COMPILER   ${BUILD_CC})|" \
-               ${B}/${toolchain}
+                   -e "s|set(CMAKE_CXX_COMPILER c++)|set(CMAKE_CXX_COMPILER ${BUILD_CXX})|" \
+                   ${B}/${toolchain}
+            
+            # Clear Yocto cross-compilation flags incompatible with host superbuild
+            sed -i -e 's|set(CMAKE_C\(XX\)\?_FLAGS .*|set(CMAKE_C\1_FLAGS "" CACHE STRING "CFLAGS")|' \
+                   -e 's|set(CMAKE_\(EXE\|SHARED\|MODULE\)_LINKER_FLAGS .*|set(CMAKE_\1_LINKER_FLAGS "" CACHE STRING "LDFLAGS")|' \
+                   ${B}/${toolchain}
+        fi
    done
-    
-    # Use native compilers for stage1
-    [ -f ${B}/stage1-toolchain.cmake ] && sed -i \
-        -e "s|set(CMAKE_C_COMPILER   cc)|set(CMAKE_C_COMPILER   ${BUILD_CC})|" \
-        -e "s|set(CMAKE_CXX_COMPILER c++)|set(CMAKE_CXX_COMPILER ${BUILD_CXX})|" \
-        ${B}/stage1-toolchain.cmake && \
-        echo "set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)" >> ${B}/stage1-toolchain.cmake
 }
-# Use superbuild with bundled LLVM 20.1
-OECMAKE_SOURCEPATH = "${S}/superbuild"
 EXTRA_OECMAKE += " \
                  --preset os \
-                  -G Ninja \
                  -DLLVM_VERSION=20.1 \
                  -DLLVM_DISABLE_ASSERTIONS=ON \
+                  -DLLVM_ENABLE_LIBEDIT=OFF \
+                  -DLLVM_ENABLE_TERMINFO=OFF \
+                  -DLLVM_ENABLE_ZLIB=OFF \
+                  -DLLVM_ENABLE_ZSTD=OFF \
                  -DLLVM_URL=${UNPACKDIR}/git/llvm-project \
                  -DVC_INTRINSICS_URL=${UNPACKDIR}/git/vc-intrinsics \
                  -DVC_INTRINSICS_SHA=${SRCREV_vc} \
@@ -98,16 +102,25 @@ EXTRA_OECMAKE += " \
                  -DISPC_IOS_TARGET=OFF \
                  -DISPC_PS_TARGET=OFF \
                  -DXE_DEPS=OFF \
+                  -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=NEVER \
+                  -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=NEVER \
+                  -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER \
                  "
 do_compile() {
-    # Unset OE-specific flags for stage1 LLVM build
-    export CFLAGS_FOR_BUILD=""
-    export CXXFLAGS_FOR_BUILD=""
-    export LDFLAGS_FOR_BUILD=""
-    
    bbnote "Building ispc with bundled LLVM 20.1"
-    cmake --build "${B}" --target all -- ${EXTRA_OECMAKEBUILD}
+    
+    # Scope environment clearing to just the cmake build command
+    # This prevents Yocto cross-compilation flags from contaminating the host superbuild
+    env \
+        CFLAGS= \
+        CXXFLAGS= \
+        CPPFLAGS= \
+        LDFLAGS= \
+        CMAKE_PREFIX_PATH= \
+        CMAKE_LIBRARY_PATH= \
+        CMAKE_INCLUDE_PATH= \
+        cmake --build "${B}" --target all -- ${EXTRA_OECMAKEBUILD}
 }
 # Superbuild installs ispc to build/ispc-stage2 instead of ${D}
@@ -123,9 +136,9 @@ do_install:append:class-target() {
    install -m 0755 ${S}/scripts/run_tests.py ${D}${libdir}/ispc/gio/
    install -m 0644 ${S}/scripts/common.py ${D}${libdir}/ispc/gio/
    cp -r ${S}/tests ${D}${libdir}/ispc/gio/
-    cp ${S}/test_static.isph ${D}${libdir}/ispc/gio/ || true
+    cp ${S}/tests/test_static.isph ${D}${libdir}/ispc/gio/ || true
-    cp ${S}/fail_db.txt ${D}${libdir}/ispc/gio/ || true
+    cp ${S}/tests/fail_db.txt ${D}${libdir}/ispc/gio/ || true
-    cp ${S}/test_static.cpp ${D}${libdir}/ispc/gio/ || true
+    cp ${S}/tests/test_static.cpp ${D}${libdir}/ispc/gio/ || true
 }
 do_install_ptest:class-target() {
@@ -133,15 +146,11 @@ do_install_ptest:class-target() {
    install -m 0755 ${S}/scripts/run_tests.py ${D}${PTEST_PATH}/
    install -m 0644 ${S}/scripts/common.py ${D}${PTEST_PATH}/
    cp -r ${S}/tests ${D}${PTEST_PATH}/
-    cp ${S}/test_static.isph ${D}${PTEST_PATH}/ || true
+    cp ${S}/tests/test_static.isph ${D}${PTEST_PATH}/ || true
-    cp ${S}/fail_db.txt ${D}${PTEST_PATH}/ || true
+    cp ${S}/tests/fail_db.txt ${D}${PTEST_PATH}/ || true
-    cp ${S}/test_static.cpp ${D}${PTEST_PATH}/ || true
+    cp ${S}/tests/test_static.cpp ${D}${PTEST_PATH}/ || true
 }
-PACKAGES:prepend:class-target = "${PN}-test "
-FILES:${PN}-test:class-target = "${libdir}/ispc/gio/*"
-RDEPENDS:${PN}-test:class-target += "bash python3-multiprocessing ${PN}"
 pkg_postinst:${PN}() {
    #!/bin/sh
    # Create /lib64 symlink if it doesn't exist (needed for ispc binary built with /lib64 interpreter path)
diff --git a/dynamic-layers/clang-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb b/dynamic-layers/clang-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
deleted file mode 100644
index 106b3ad5..00000000
--- a/dynamic-layers/clang-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files"
-DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
-that help your applications run faster on Intel® 64 architectures with support \
-for the latest C, C++, and SYCL language standards. This compiler produces \
-optimized code that can run significantly faster by taking advantage of the \
-ever-increasing core count and vector register width in Intel® Xeon® processors \
-and compatible processors."
-HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
-LICENSE = "EULA"
-COMPILERMAINVER = "2024.0"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/licensing/${COMPILERMAINVER}/licensing/${COMPILERMAINVER}/license.htm;md5=5ff64c6ff3ef98089ed69360e7a84c39 \
-                     "
-COMPILERDOTVER = "2024.0.0-49406"
-DEVUTILITVERSION = "2024.0-2024.0.0-49320"
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=common-vars \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=openmp-common \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-${COMPILERMAINVER}-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=license \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dev-utilities-${DEVUTILITVERSION}_amd64.deb;subdir=${BPN};name=dev-utils \
-            "
-SRC_URI[dpcpp-runtime.sha256sum] = "e24f0ba69daf3f66ceaf23d5e632f183cdb90bac69f65407fdb4407fc9034f33"
-SRC_URI[dpcpp-common.sha256sum] = "f5a3db6a725598224edf1099260955aee3e36beadcaed2af5b8b453e873a82fa"
-SRC_URI[compiler-shared-runtime.sha256sum] = "bce010cbe076259ddd3feb8e69792869e22fccd5b4e2c9af9e815826f2c1a394"
-SRC_URI[common-vars.sha256sum] = "368553c99db1b52060b8225355336778be0b00e5991d0f769c42f891c6328750"
-SRC_URI[openmp.sha256sum] = "154ff1e81adfdc872ba1d47bd860de70d62188417c7128422435dfd0ceca62fe"
-SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c3843ba57d7894d15c07d"
-SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6"
-SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50"
-S = "${UNPACKDIR}/${BPN}"
-inherit bin_package
-RDEPENDS:${PN} += "virtual-opencl-icd zlib tbb level-zero-loader bash tcsh"
-SKIP_FILEDEPS:${PN} = '1'
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-# doesn't have GNU_HASH (didn't pass LDFLAGS?)
-INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps"
-FILES_SOLIBSDEV = ""
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/clang-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb b/dynamic-layers/clang-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
deleted file mode 100644
index d2bd72a3..00000000
--- a/dynamic-layers/clang-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Intel® oneAPI DPC++/C++ Compiler"
-DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
-that help your applications run faster on Intel® 64 architectures with support \
-for the latest C, C++, and SYCL language standards. This compiler produces \
-optimized code that can run significantly faster by taking advantage of the \
-ever-increasing core count and vector register width in Intel® Xeon® processors \
-and compatible processors."
-HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
-LICENSE = "EULA"
-COMPILERMAINVER = "2024.0"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/compiler/${COMPILERMAINVER}/share/doc/compiler/credist.txt;md5=b41f55af9f479b9570fc35b955d5ba1a \
-                     "
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=shared-common \
-            "
-SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77638f3f849796b62cd82"
-SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236"
-SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558"
-S = "${UNPACKDIR}/${BPN}"
-inherit bin_package
-RDEPENDS:${PN} += "intel-oneapi-dpcpp-cpp-runtime"
-SKIP_FILEDEPS:${PN} = '1'
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-# doesn't have GNU_HASH (didn't pass LDFLAGS?)
-INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped file-rdeps staticdev rpaths arch useless-rpaths"
-FILES_SOLIBSDEV = ""
-EXCLUDE_FROM_SHLIBS = "1"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/clang-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb b/dynamic-layers/clang-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
deleted file mode 100644
index e77ac588..00000000
--- a/dynamic-layers/clang-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
-DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
- math library of highly optimized and extensively parallelized routines \
- for applications that require maximum performance. oneMKL contains \
- the high-performance optimizations from the full Intel® Math Kernel Library \
- for CPU architectures (with C/Fortran programming language interfaces)\
- and adds to them a set of DPC++ programming language interfaces for \
- achieving performance on various CPU architectures \
- and Intel Graphics Technology for certain key functionalities."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
-LICENSE = "ISSL"
-MKLMAINVER = "2024.0"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/license.txt;md5=8510d21bf355a76e378c3216c3929ccd  \
-                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
-                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
-                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
-                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
-                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs.txt;md5=27de873e4084d62530fe828406b33ca9 \
-                     "
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-devel \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-devel-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=devel \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-vars \
-            "
-SRC_URI[runtime.sha256sum] = "10a86e24051d6ef4a80fd839c570e629190638a3c0ac9bcca99ab855f534b959"
-SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c81655b268aa2c7bb908192"
-SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84"
-SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef"
-S = "${UNPACKDIR}/${BPN}"
-inherit bin_package
-do_install:append () {
-        install -d ${D}${bindir}
-        (cd ${D}${bindir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/bin/* .)
-        install -d ${D}${libdir}
-        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.so* .)
-        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.a* .)
-        install -d ${D}${libdir}/pkgconfig
-        (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .)
-        install -d ${D}${libdir}/cmake
-        (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .)
-        install -d ${D}${includedir}
-        find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read srcdir; do
-            install -d ${D}${includedir}/$srcdir
-            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcdir/* ./$srcdir/)
-        done
-        find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type f -printf '%f\n' | while read srcfile; do
-            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcfile .)
-        done
-}
-AUTO_LIBNAME_PKGS = ""
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-RDEPENDS:${PN} += "bash tbb intel-oneapi-dpcpp-cpp-runtime setup-intel-oneapi-env virtual-opencl-icd"
-INSANE_SKIP:${PN} = "ldflags textrel dev-so staticdev arch already-stripped"
-FILES:${PN}-staticdev += "/opt/intel/oneapi/mkl/${MKLMAINVER}/lib/*.a*"
-SKIP_FILEDEPS:${PN} = '1'
-SYSROOT_DIRS += "/opt"
diff --git a/dynamic-layers/clang-layer/recipes-oneapi/toolkit/files/license.txt b/dynamic-layers/clang-layer/recipes-oneapi/toolkit/files/license.txt
new file mode 100644
index 00000000..955e4cba
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-oneapi/toolkit/files/license.txt
@@ -0,0 +1,120 @@
+Intel End User License Agreement for Developer Tools (Version August 2024)
+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. "AI" means computer or machine technology that functions to simulate human intelligence, cognition, and problem-solving capabilities.
+B. "Cloud Provider" means a third party service provider offering a cloud-based platform, infrastructure, application or storage services, such as Microsoft Azure, Google Cloud or Amazon Web Services, which You may only utilize to host the Materials subject to the restrictions set forth in Section 2.3 B.
+C. "Derivative Work" means a derivative work, as defined in 17 U.S.C. § 101, of the Materials in Source Code.
+D. "Executable Code" means software in binary form suitable for machine execution by a processor without the intervening steps of interpretation or compilation.
+E. "GAI" means AI that functions to generate content based on inputs.
+F. "Materials" mean the software, documentation, and other collateral, including any updates, made available to You by Intel under this Agreement. Materials include Executable Code, Source Code, Sample Source Code, and Redistributables, and Pre-Release Materials, but do not include Third Party Software.
+G. "Pre-Release Materials" mean 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 software (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 and not Section 2.1.
+H. "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.
+I. "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.
+J. "Sample Source Code" means the software portion of the Materials that are provided in Source Code and are identified as sample code or example code. Sample Source Code may not have been tested or validated by Intel and is provided purely as a programming example.
+K. "Source Code" means software in human readable format.
+L. "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.
+M. "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 of the Redistributables 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 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;
+(2)     Any Redistributables provided to You by Intel in Executable Code can only be distributed (i) in Executable Code, and (ii) subject to a license agreement that prohibits reverse engineering, decompiling or disassembly of those 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 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 attorneys' 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, alter, or translate the Materials in whole or in part, including during execution; (v) reverse engineer, decompile, or disassemble the Materials, or otherwise attempt to derive the Source Code or operation of the Materials; (vi) work around any technical limitations in the Materials; (vii) distribute, sublicense or transfer any Materials in Source Code, or modifications or Derivative Works of any Materials in 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 production 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.
+3.5 Use of GAI and AI.
+A. Use of GAI in Developing the Materials. Some Materials may have been developed using GAI. Intel's use of GAI, if any, in the development of Materials complied with the then-current industry practices and laws applicable to the use of GAI at the time of development.
+B. AI Features in the Materials. Some Materials may include or implement components, features, or functionality of AI technologies ("AI Features"). You can find more information about included AI Features in documentation accompanying the Materials. While Intel strives to ensure the quality, accuracy, and reliability of included AI Features, due to the nature of AI, such features and their output may contain inaccuracies, biases, and omissions. You are solely responsible for determining the fitness of the AI Features and their output for Your use cases, and for evaluating the accuracy and completeness of the output. Intel makes no warranty or representation as to the completeness, accuracy, or reliability of the AI Features, their output, or their suitability for any purpose.
+C. Using the Materials to Develop Your AI Applications. You may not use the Materials to develop an AI application ("Your AI Application") if the documentation accompanying the Materials prohibits such use. You can only use the Materials to develop Your AI Application in the absence of such prohibition and in accordance with standard industry practice and all applicable laws and regulations, and Your AI Application must not violate, or contribute to, the violation of an internationally recognized human right.
+D. GAI and AI Features in Third Party Software.  Some Third Party Software may have been developed using GAI or may include or implement components, features, or functionality of AI Features. Intel does not take any responsibility for Third Party Software, how it may have been developed using GAI or any AI Features therein.  You can find more information about Third Party Software use of GAI and AI Features in the documentation accompanying the Third Party Software.
+4.      DATA COLLECTION AND PRIVACY.
+4.1     Data Collection. The Materials may collect anonymous data and/or optional data (which may include other anonymous and/or non-anonymous data) about the Materials and/or Your development environment and transmit that data to Intel; however, optional data will not be transmitted to Intel without Your permission. 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://www.intel.com/content/www/us/en/developer/get-help/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. This Agreement will terminate immediately if You are in breach of any of its terms and conditions. The term for Pre-Release Materials terminates immediately upon release of a production version or at any time upon notice from Intel.  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, 3.5.B (last sentence), 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 August 2024)"). 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  TRADE COMPLIANCE. You must comply with all applicable laws and regulations of the U.S. and other countries governing the export, re-export, import, transfer, distribution, use, and servicing ("Export") of the Materials and all related materials provided by Intel. In particular, but without limitation, You must not, without first obtaining all authorizations required by all applicable laws and regulations, Export Materials or any related materials (a) to any prohibited or restricted entity or country; or (b) for the development, design, manufacture, or production of nuclear, missile, chemical, or biological weapons, or for any other purpose prohibited by all applicable governments. Upon Intel's request, You will provide export classifications for all Materials and technical data. Intel will not be obligated to perform any of its obligations under this Agreement if performance would result in violation of any applicable trade or sanctions controls or restrictions. No failure or delay on the part of Intel to exercise any right under this clause will operate as a waiver of this clause.
+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/dynamic-layers/clang-layer/recipes-oneapi/toolkit/intel-oneapi-toolkit_2026.0.0.198.bb b/dynamic-layers/clang-layer/recipes-oneapi/toolkit/intel-oneapi-toolkit_2026.0.0.198.bb
new file mode 100644
index 00000000..e7a8f0f3
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-oneapi/toolkit/intel-oneapi-toolkit_2026.0.0.198.bb
@@ -0,0 +1,320 @@
+SUMMARY = "Intel® oneAPI Toolkit (2026.0) - unified Base + HPC toolkit"
+DESCRIPTION = "The Intel® oneAPI Toolkit unifies the former Base and HPC \
+toolkits into a single bundle. It ships the DPC++/C++ compiler (icx, \
+icpx, dpcpp), Fortran compiler (ifx), DPC++ Compatibility Tool, Intel® \
+Distribution for GDB*, oneAPI DPC++ Library (oneDPL), oneAPI Threading \
+Building Blocks (oneTBB), oneAPI Math Kernel Library (oneMKL), oneAPI \
+Deep Neural Network Library (oneDNN), oneCCL, Intel® IPP, Intel® \
+Cryptography Primitives Library, and VTune Profiler. \
+\
+This recipe consumes the upstream offline self-extracting installer \
+(intel-oneapi-toolkit-${PV}_offline.sh) and unpacks it into the target \
+rootfs under /opt/intel/oneapi via Intel's silent installer. Each \
+component is split into its own sub-package (intel-oneapi-toolkit-\
+{compiler,runtime,mkl,tbb,dpl,debugger,ipp,ccl,vtune,onednn,common,\
+licensing}). \
+\
+Note: oneDAL is no longer included by Intel and must be installed \
+separately."
+HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/oneapi-toolkit-download.html"
+LICENSE = "EULA"
+LIC_FILES_CHKSUM = "\
+    file://license.txt;md5=cff4e57efd53801fcdfcb4c8aead1245 \
+"
+# Self-extracting installer; treat as opaque blob (no auto-unpack).
+SRC_URI = " \
+    https://registrationcenter-download.intel.com/akdlm/IRC_NAS/71180075-e4e3-4c6f-bbbb-19017ed0cf7d/intel-oneapi-toolkit-${PV}_offline.sh;unpack=0;name=installer \
+    file://license.txt \
+"
+SRC_URI[installer.sha256sum] = "155a52896bd24239ddc733f487eccb2af5cad9957eed1e2bfe60ce1453694e5b"
+S = "${UNPACKDIR}"
+inherit bin_package
+B = "${WORKDIR}/build"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+SKIP_FILEDEPS:${PN} = "1"
+SKIP_FILEDEPS:${PN}-runtime = "1"
+SKIP_FILEDEPS:${PN}-compiler = "1"
+SKIP_FILEDEPS:${PN}-common = "1"
+SKIP_FILEDEPS:${PN}-licensing = "1"
+SKIP_FILEDEPS:${PN}-mkl = "1"
+SKIP_FILEDEPS:${PN}-mkl-sycl = "1"
+SKIP_FILEDEPS:${PN}-mkl-staticdev = "1"
+SKIP_FILEDEPS:${PN}-mkl-dev = "1"
+SKIP_FILEDEPS:${PN}-tbb = "1"
+SKIP_FILEDEPS:${PN}-dpl = "1"
+SKIP_FILEDEPS:${PN}-debugger = "1"
+SKIP_FILEDEPS:${PN}-ipp = "1"
+SKIP_FILEDEPS:${PN}-ipp-staticdev = "1"
+SKIP_FILEDEPS:${PN}-ipp-dev = "1"
+SKIP_FILEDEPS:${PN}-ccl = "1"
+SKIP_FILEDEPS:${PN}-vtune = "1"
+SKIP_FILEDEPS:${PN}-onednn = "1"
+# dev-deps is set on the meta-package and -common because the umbrella
+# RDEPENDS pulls the -mkl-dev / -ipp-dev sub-packages so a single
+# IMAGE_INSTALL of intel-oneapi-toolkit still ships the full SDK.
+ONEAPI_INSANE = "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps libdir buildpaths host-user-contaminated installed-vs-shipped 32bit-time dev-deps"
+INSANE_SKIP:${PN} += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-runtime += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-compiler += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-common += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-licensing += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-mkl += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-mkl-sycl += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-mkl-staticdev += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-mkl-dev += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-tbb += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-dpl += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-debugger += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-ipp += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-ipp-staticdev += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-ipp-dev += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-ccl += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-vtune += "${ONEAPI_INSANE}"
+INSANE_SKIP:${PN}-onednn += "${ONEAPI_INSANE}"
+FILES_SOLIBSDEV = ""
+EXCLUDE_FROM_SHLIBS = "1"
+PACKAGE_DEBUG_FLAGS = ""
+# Versions of components used in do_install runtime registration.
+# (Component sub-directories are matched by name in FILES, so per-component
+# version variables are not needed.)
+COMPILERMAINVER = "2026.0"
+ONEAPI_INSTALLER = "${S}/intel-oneapi-toolkit-${PV}_offline.sh"
+ONEAPI_STAGE     = "${B}/oneapi-staging"
+# do_unpack_vendor runs without pseudo. ${B} (B = ${WORKDIR}/build) is a
+# sibling of ${T}, so the installer's cleanup never reaches the fifo.
+do_unpack_vendor() {
+    rm -rf "${ONEAPI_STAGE}"
+    install -d "${ONEAPI_STAGE}/opt/intel/oneapi"
+    # WARNING: never reference ${HOME} or ${TMPDIR} as bitbake-expanded
+    # variables inside this function — bitbake expands them at parse
+    # time to the build host's real values, and a later `rm -rf` would
+    # nuke the developer's home directory. Use plain shell locals only.
+    oneapi_home="${B}/oneapi-installer-home"
+    oneapi_tmp="${B}/oneapi-installer-tmp"
+    oneapi_extract="${B}/oneapi-installer-extract"
+    rm -rf "$oneapi_home" "$oneapi_tmp" "$oneapi_extract"
+    install -d "$oneapi_home" "$oneapi_tmp" "$oneapi_extract"
+    # The installer needs a writable HOME and TMPDIR.
+    export HOME="$oneapi_home"
+    export TMPDIR="$oneapi_tmp"
+    cd "$oneapi_extract"
+    bash ${ONEAPI_INSTALLER} \
+        --extract-folder "$oneapi_extract" \
+        --remove-extracted-files no \
+        -a --silent --eula accept \
+        --install-dir "${ONEAPI_STAGE}/opt/intel/oneapi" \
+        --log-dir "$oneapi_tmp" \
+        --intel-sw-improvement-program-consent decline
+    # Free the makeself extraction tree once the install completed.
+    rm -rf "$oneapi_extract" "$oneapi_home" "$oneapi_tmp"
+    # Rewrite any absolute build-time paths the installer baked into
+    # generated wrapper scripts so the on-target tree is self-contained.
+    find "${ONEAPI_STAGE}/opt/intel/oneapi" -type f \
+        \( -name '*.sh' -o -name '*.cfg' -o -name 'modulefiles-setup.sh' \) \
+        -exec sed -i "s|${ONEAPI_STAGE}/opt/intel/oneapi|/opt/intel/oneapi|g" {} +
+}
+do_unpack_vendor[network] = "0"
+do_unpack_vendor[cleandirs] = "${B}"
+addtask unpack_vendor after do_patch before do_install
+do_install() {
+    install -d ${D}
+    cp -a ${ONEAPI_STAGE}/. ${D}/
+    # The vendor installer in do_unpack_vendor runs outside pseudo, so
+    # all staged files inherit the build host's uid/gid. Reset ownership
+    # to root:root under pseudo to avoid host-contamination QA failures
+    # ("getpwuid(): uid not found ...") in do_package.
+    chown -R 0:0 ${D}
+    # Drop the installer's transient log directory (build-time noise).
+    rm -rf ${D}/opt/intel/oneapi/logs
+    # Auto-register the Intel CPU OpenCL runtime as an ICD.
+    install -d ${D}${sysconfdir}/OpenCL/vendors
+    cpu_icd="/opt/intel/oneapi/compiler/${COMPILERMAINVER}/lib/libintelocl.so"
+    if [ -e "${D}${cpu_icd}" ]; then
+        echo "${cpu_icd}" > ${D}${sysconfdir}/OpenCL/vendors/intel-cpu.icd
+    fi
+    # libxml2.so.2 SONAME compat shim (oe-core ships libxml2 3.x = .so.16).
+    install -d ${D}${libdir}
+    if [ ! -e ${D}${libdir}/libxml2.so.2 ]; then
+        ln -s libxml2.so.16 ${D}${libdir}/libxml2.so.2
+    fi
+}
+SYSROOT_DIRS += "/opt"
+# Sub-packages. Order matters in PACKAGES — first-match wins for FILES
+# patterns, so put specific component packages before the catch-all ${PN}.
+# Within a component, list the more specific sub-subpackages (-sycl,
+# -staticdev, -dev) before the component's own catch-all so the
+# heavyweight bits land in their dedicated package and not in the
+# default runtime package.
+PACKAGES =+ " \
+    ${PN}-runtime \
+    ${PN}-compiler \
+    ${PN}-mkl-sycl \
+    ${PN}-mkl-staticdev \
+    ${PN}-mkl-dev \
+    ${PN}-mkl \
+    ${PN}-tbb \
+    ${PN}-dpl \
+    ${PN}-debugger \
+    ${PN}-ipp-staticdev \
+    ${PN}-ipp-dev \
+    ${PN}-ipp \
+    ${PN}-ccl \
+    ${PN}-vtune \
+    ${PN}-onednn \
+    ${PN}-licensing \
+    ${PN}-common \
+"
+FILES:${PN}-licensing = "/opt/intel/oneapi/licensing"
+FILES:${PN}-common = " \
+    /opt/intel/oneapi/setvars.sh \
+    /opt/intel/oneapi/modulefiles-setup.sh \
+    /opt/intel/oneapi/support.txt \
+    /opt/intel/oneapi/common \
+    /opt/intel/oneapi/2026.0 \
+    /opt/intel/oneapi/oneapi-toolkit \
+"
+FILES:${PN}-onednn = "/opt/intel/oneapi/dnnl"
+FILES:${PN}-tbb = "/opt/intel/oneapi/tbb"
+FILES:${PN}-dpl = "/opt/intel/oneapi/dpl"
+# MKL is split four ways. Order in PACKAGES above ensures the specific
+# patterns match before the catch-all /opt/intel/oneapi/mkl.
+#
+#   -mkl-sycl       GPU/SYCL offload libraries (~470 MB)
+#   -mkl-staticdev  Static archives, lib/intel64/*.a (~900 MB)
+#   -mkl-dev        Headers, cmake/pkgconfig modules, share/ examples
+#   -mkl            CPU runtime shared libs + env/etc/bin + symlinks
+FILES:${PN}-mkl-sycl = "/opt/intel/oneapi/mkl/[0-9]*/lib/libmkl_sycl*"
+FILES:${PN}-mkl-staticdev = "/opt/intel/oneapi/mkl/[0-9]*/lib/*.a"
+FILES:${PN}-mkl-dev = " \
+    /opt/intel/oneapi/mkl/[0-9]*/include \
+    /opt/intel/oneapi/mkl/[0-9]*/lib/cmake \
+    /opt/intel/oneapi/mkl/[0-9]*/lib/pkgconfig \
+    /opt/intel/oneapi/mkl/[0-9]*/share \
+"
+FILES:${PN}-mkl = "/opt/intel/oneapi/mkl"
+FILES:${PN}-debugger = "/opt/intel/oneapi/debugger"
+# IPP is split three ways. ippcp (Cryptography Primitives) is bundled
+# with ipp in this distribution and shares the same split policy.
+#
+#   -ipp-staticdev  Static archives, lib/intel64/*.a (~560 MB)
+#   -ipp-dev        Headers, cmake/pkgconfig modules, share/ examples
+#   -ipp            Runtime shared libs + env/etc/bin + symlinks
+FILES:${PN}-ipp-staticdev = " \
+    /opt/intel/oneapi/ipp/[0-9]*/lib/*.a \
+    /opt/intel/oneapi/ippcp/[0-9]*/lib/*.a \
+"
+FILES:${PN}-ipp-dev = " \
+    /opt/intel/oneapi/ipp/[0-9]*/include \
+    /opt/intel/oneapi/ipp/[0-9]*/lib/cmake \
+    /opt/intel/oneapi/ipp/[0-9]*/lib/pkgconfig \
+    /opt/intel/oneapi/ipp/[0-9]*/share \
+    /opt/intel/oneapi/ippcp/[0-9]*/include \
+    /opt/intel/oneapi/ippcp/[0-9]*/lib/cmake \
+    /opt/intel/oneapi/ippcp/[0-9]*/lib/pkgconfig \
+    /opt/intel/oneapi/ippcp/[0-9]*/share \
+"
+FILES:${PN}-ipp = " \
+    /opt/intel/oneapi/ipp \
+    /opt/intel/oneapi/ippcp \
+"
+FILES:${PN}-ccl = "/opt/intel/oneapi/ccl"
+FILES:${PN}-vtune = "/opt/intel/oneapi/vtune"
+FILES:${PN}-compiler = " \
+    /opt/intel/oneapi/compiler \
+    /opt/intel/oneapi/dev-utilities \
+    /opt/intel/oneapi/tcm \
+    /opt/intel/oneapi/umf \
+    /opt/intel/oneapi/mpi \
+"
+FILES:${PN}-runtime = " \
+    ${sysconfdir}/OpenCL/vendors/intel-cpu.icd \
+    ${libdir}/libxml2.so.2 \
+"
+# Inter-package dependencies.
+#
+# Hard RDEPENDS are intentionally minimal -- only the link/load-time
+# closure the dynamic linker will demand at runtime. This lets a
+# consumer install a single subpackage (e.g. intel-oneapi-toolkit-mkl
+# for PyTorch CPU BLAS) without dragging in the full bundle.
+#
+#   * -common    : setvars.sh / modulefiles / version-umbrella dirs.
+#                  Required only when the consumer sources env/vars.sh;
+#                  apps that link the .so files directly do not need it.
+#   * -runtime   : OpenCL/Level Zero ICD shim + libxml2 SONAME compat.
+#                  Required only for SYCL/GPU offload paths. Pure CPU
+#                  MKL/IPP/oneDNN do not need it.
+#   * -licensing : EULA text (~1 MB). Kept on every binary subpackage.
+#   * -tbb       : oneTBB shared library. Required by every component
+#                  whose libraries link -ltbb (mkl, compiler, onednn).
+RDEPENDS:${PN}-licensing += ""
+RDEPENDS:${PN}-common    += "${PN}-licensing"
+RDEPENDS:${PN}-runtime   += "virtual-opencl-icd zlib level-zero-loader bash libxml2 ${PN}-licensing"
+RDEPENDS:${PN}-tbb       += "${PN}-licensing"
+RDEPENDS:${PN}-dpl       += "${PN}-licensing"
+RDEPENDS:${PN}-debugger  += "${PN}-licensing"
+RDEPENDS:${PN}-ipp           += "${PN}-licensing"
+RDEPENDS:${PN}-ipp-dev       += "${PN}-ipp"
+RDEPENDS:${PN}-ipp-staticdev += "${PN}-ipp-dev"
+RDEPENDS:${PN}-vtune     += "${PN}-licensing"
+RDEPENDS:${PN}-mkl           += "${PN}-tbb ${PN}-licensing"
+RDEPENDS:${PN}-mkl-sycl      += "${PN}-mkl ${PN}-runtime"
+RDEPENDS:${PN}-mkl-dev       += "${PN}-mkl"
+RDEPENDS:${PN}-mkl-staticdev += "${PN}-mkl-dev"
+RDEPENDS:${PN}-onednn    += "${PN}-tbb ${PN}-licensing"
+RDEPENDS:${PN}-compiler  += "${PN}-runtime ${PN}-common ${PN}-tbb ${PN}-licensing"
+RDEPENDS:${PN}-ccl       += "${PN}-runtime ${PN}-licensing"
+# Top-level meta package pulls in the full bundle, including the
+# heavyweight optional pieces (SYCL/GPU offload libs, static archives
+# and development headers) so that "IMAGE_INSTALL += intel-oneapi-toolkit"
+# behaves like the legacy single-package install.
+RDEPENDS:${PN} = " \
+    ${PN}-compiler \
+    ${PN}-runtime \
+    ${PN}-mkl \
+    ${PN}-mkl-sycl \
+    ${PN}-mkl-staticdev \
+    ${PN}-mkl-dev \
+    ${PN}-tbb \
+    ${PN}-dpl \
+    ${PN}-debugger \
+    ${PN}-ipp \
+    ${PN}-ipp-staticdev \
+    ${PN}-ipp-dev \
+    ${PN}-ccl \
+    ${PN}-vtune \
+    ${PN}-onednn \
+    ${PN}-common \
+    ${PN}-licensing \
+"
+# This bundle is amd64-only.
+COMPATIBLE_HOST = "x86_64.*-linux"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0004-refactor-use-std-numeric_limits-to-get-max-value.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0004-refactor-use-std-numeric_limits-to-get-max-value.patch
new file mode 100644
index 00000000..2d857c6b
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0004-refactor-use-std-numeric_limits-to-get-max-value.patch
@@ -0,0 +1,107 @@
+From 3e7b32bf2d6042314772249532e80517e9126bc5 Mon Sep 17 00:00:00 2001
+From: Bartosz Dunajski <bartosz.dunajski@intel.com>
+Date: Wed, 7 Jan 2026 08:11:57 +0000
+Subject: [PATCH] refactor: use std::numeric_limits to get max value
+Newer GCC (16.x) no longer pulls in <climits> transitively, so the use
+of ULONG_MAX failed to build. Upstream replaced ULONG_MAX with
+std::numeric_limits<uint64_t>::max(), which removes the dependency on
+the macro entirely. Backported verbatim to fix the build on the pinned
+releases/25.48 branch.
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/3e7b32bf2d6042314772249532e80517e9126bc5]
+Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ shared/source/os_interface/linux/pmt_util.cpp            | 9 ++++-----
+ .../linux/product_helper_uuid_xehp_and_later.inl         | 4 ++--
+ shared/source/xe_hpc_core/linux/product_helper_pvc.cpp   | 4 +++-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+diff --git a/shared/source/os_interface/linux/pmt_util.cpp b/shared/source/os_interface/linux/pmt_util.cpp
+index 1f8546afb8e17..6ac63aa99a400 100644
+--- a/shared/source/os_interface/linux/pmt_util.cpp
+++ b/shared/source/os_interface/linux/pmt_util.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2026 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -11,12 +11,11 @@
+ #include "shared/source/os_interface/linux/sys_calls.h"
+ #include "shared/source/utilities/directory.h"
+ 
+-#include <climits>
+-
+ #include <algorithm>
+ #include <array>
+ #include <cstdint>
+ #include <fcntl.h>
+#include <limits>
+ #include <map>
+ #include <sstream>
+ #include <string_view>
+@@ -75,7 +74,7 @@ bool PmtUtil::readOffset(std::string_view telemDir, uint64_t &offset) {
+     ssize_t bytesRead = 0;
+     std::array<char, 16> offsetString = {'\0'};
+     if (fd > 0) {
+-        offset = ULONG_MAX;
+        offset = std::numeric_limits<uint64_t>::max();
+         bytesRead = SysCalls::pread(fd, offsetString.data(), offsetString.size() - 1, 0);
+     }
+     if (bytesRead <= 0) {
+@@ -85,7 +84,7 @@ bool PmtUtil::readOffset(std::string_view telemDir, uint64_t &offset) {
+     std::replace(offsetString.begin(), offsetString.end(), '\n', '\0');
+     offset = std::strtoul(offsetString.data(), nullptr, 10);
+ 
+-    if (offset == ULONG_MAX) {
+    if (offset == std::numeric_limits<uint64_t>::max()) {
+         return false;
+     }
+     return true;
+diff --git a/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl b/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl
+index d2187052db709..cd940cd149b41 100644
+--- a/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl
+++ b/shared/source/os_interface/linux/product_helper_uuid_xehp_and_later.inl
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2025 Intel Corporation
+ * Copyright (C) 2021-2026 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -37,7 +37,7 @@ bool ProductHelperHw<gfxProduct>::getUuid(DriverModel *driverModel, const uint32
+         return false;
+     }
+ 
+-    uint64_t offset = ULONG_MAX;
+    uint64_t offset = std::numeric_limits<uint64_t>::max();
+     if (!PmtUtil::readOffset(telemDir, offset)) {
+         return false;
+     }
+diff --git a/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp b/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp
+index 6451de9b4f6a6..8ea0239c7ef90 100644
+--- a/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp
+++ b/shared/source/xe_hpc_core/linux/product_helper_pvc.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2025 Intel Corporation
+ * Copyright (C) 2021-2026 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -18,6 +18,8 @@
+ #include "shared/source/utilities/directory.h"
+ #include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
+ 
+#include <limits>
+
+ constexpr static auto gfxProduct = IGFX_PVC;
+ 
+ namespace NEO {
+-- 
+2.34.1
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0005-include-cstdint-for-drm-tip-helper.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0005-include-cstdint-for-drm-tip-helper.patch
new file mode 100644
index 00000000..5aed9c60
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0005-include-cstdint-for-drm-tip-helper.patch
@@ -0,0 +1,30 @@
+From 1c113f79f6ad9c6a2f943ea7e5f82f81de98b739 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Mon, 9 Jun 2026 12:05:00 +0000
+Subject: [PATCH] include cstdint for drm tip helper
+Fixes compile failure where fixed-width integer types are used without
+including <cstdint> in drm_tip_helper.cpp.
+This is only required on the pinned releases/25.48 branch. Upstream
+removed this file entirely when deprecating DG1 support, so there is no
+upstream change to submit:
+  873fbd09c38dba9416b62526fa601d1ffe480142
+  ("refactor: Remove deprecated code for DG1")
+Upstream-Status: Inappropriate [file removed upstream in 873fbd09c38d; needed only on releases/25.48]
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ .../source/os_interface/linux/local/dg1/drm_tip_helper.cpp     | 1 +
+ 1 file changed, 1 insertion(+)
+Index: intel-compute-runtime-25.48.36300.8/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+===================================================================
+--- intel-compute-runtime-25.48.36300.8.orig/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+++ intel-compute-runtime-25.48.36300.8/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+@@ -10,1 +10,2 @@
+-#include <memory>
+#include <cstdint>
+#include <memory>
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0006-test-excludes-include-cstdint.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0006-test-excludes-include-cstdint.patch
new file mode 100644
index 00000000..278f1e13
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0006-test-excludes-include-cstdint.patch
@@ -0,0 +1,32 @@
+From c6f4f71684d40f96f0f401ecf5f873fc855b9231 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Tue, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] test excludes include cstdint
+Fixes compile failure in shared test helper where uint32_t is used
+without including <cstdint>.
+Upstream already added this include on master; backported here for the
+pinned releases/25.48 branch:
+  d682c49ef1c9782873ed3c7684e6a07180531b48
+  ("test: add more missing headers for GCC 15")
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/d682c49ef1c9782873ed3c7684e6a07180531b48]
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ .../shared/test/common/test_macros/test_excludes.cpp        | 1 +
+ 1 file changed, 1 insertion(+)
+Index: intel-compute-runtime-25.48.36300.8/shared/test/common/test_macros/test_excludes.cpp
+===================================================================
+--- intel-compute-runtime-25.48.36300.8.orig/shared/test/common/test_macros/test_excludes.cpp
+++ intel-compute-runtime-25.48.36300.8/shared/test/common/test_macros/test_excludes.cpp
+@@ -12,6 +12,7 @@
+ #include <map>
+ #include <memory>
+ #include <string>
+#include <cstdint>
+ #include <unordered_set>
+ 
+ using namespace NEO;
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb
index c1209e33..de8ecaa4 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.48.36300.8.bb
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
 SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/25.48 \
           file://0002-Build-not-able-to-locate-cpp_generation_tool.patch \
           file://0003-external-ocloc.patch \
+           file://0004-refactor-use-std-numeric_limits-to-get-max-value.patch \
+           file://0005-include-cstdint-for-drm-tip-helper.patch \
+           file://0006-test-excludes-include-cstdint.patch \
           "
 SRCREV = "762b34beb3f6991e57d1562f587ab91ff220d708"
@@ -42,6 +45,10 @@ EXTRA_OECMAKE:append:class-target = " \
                                     -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
                                     "
+# Newer compilers emit -Wsfinae-incomplete in templates included by image.cpp/task_information.cpp.
+# Keep -Werror globally but do not fail on this single warning class.
+CXXFLAGS:append = " -Wno-error=sfinae-incomplete"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"
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
deleted file mode 100644
index d10f50f9..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
- building blocks for cross-platform performance. Develop high-performance vision, \
- signal, security, and storage applications with this multithreaded software library."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
-LICENSE = "ISSL"
-MAXVER = "2021.10"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/license.txt;md5=d7cdc92ed6c4de1263da879599ddc3e2 \
-                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/third-party-programs.txt;md5=22bd13987911dcf790907041b43081f3 \
-                     "
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-${MAXVER}-${PV}_amd64.deb;subdir=${BPN};name=ipp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-devel-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=headers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=env \
-            "
-SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd23e92bea07"
-SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005"
-SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6"
-S = "${UNPACKDIR}/${BPN}"
-COMPATIBLE_HOST:libc-musl = "null"
-inherit bin_package
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-INHIBIT_DEFAULT_DEPS = ""
-RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "ldflags dev-so"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/setup-oneapi-env/files/intel-oneapi-runtime.conf b/dynamic-layers/openembedded-layer/recipes-oneapi/setup-oneapi-env/files/intel-oneapi-runtime.conf
deleted file mode 100644
index 5faf9854..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/setup-oneapi-env/files/intel-oneapi-runtime.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-/opt/intel/oneapi/lib
-/opt/intel/oneapi/lib/intel64
-/opt/intel/oneapi/lib/ia32
-/opt/intel/oneapi/lib/emu
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
deleted file mode 100644
index cc43c972..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-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"
-S = "${UNPACKDIR}"
-do_install() {
-    mkdir -p ${D}${sysconfdir}/ld.so.conf.d/
-    install -m 644 ${S}/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"