37 files changed, 15 insertions, 64 deletions

diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb
index 7a627e83..6d4f69a3 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb
@@ -14,7 +14,6 @@ inherit pkgconfig cmake ptest
 
 DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 
-S = "${WORKDIR}/git"
 SRCREV = "66f0cb9eb66affd2da3bf5f8d897376f04aae6af"
 SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
            file://run-ptest \
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb
index 635e8c2f..b13daaa8 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=rele
 
 SRCREV = "a9961bdfaa07250fd52ff930bf8f31fb4e3b7799"
 
-S = "${WORKDIR}/git"
-
 DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native"
 
 RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
index b6d8ddeb..05611cbf 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
                     file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880"
 
 SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/2.10.x \
-           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=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 \
+           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vc-intrinsics;name=vc;nobranch=1 \
+           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/SPIRV-Tools;name=spirv-tools;branch=main \
+           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/SPIRV-Headers;name=spirv-headers;branch=main \
            file://0003-Improve-Reproducibility-for-src-package.patch \
            file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
            file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \
@@ -30,8 +30,6 @@ 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"
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
index 31a3fb21..726b035d 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=htt
            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"
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
index c71ac9ea..0a5a57ed 100644
--- 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
@@ -23,8 +23,6 @@ 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 \
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
index fee089de..575a00e8 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
            "
 
 SRCREV = "df3b9ab0ffe780c4fbad7750987eff76f659cfd5"
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools systemd gtk-doc
 
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.24.0.bb b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.24.0.bb
index 77797041..f40e445c 100644
--- a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.24.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.24.0.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \
 
 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 \
diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.21.1.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.21.1.bb
index 2e022f4a..21b3956f 100644
--- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.21.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.21.1.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc"
 
 SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master"
 SRCREV = "9536683855b17a21508e5b54ba358225d6a976da"
-S = "${WORKDIR}/git"
 
 inherit cmake
 DEPENDS += "opencl-headers"
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
index 2014e448..852bc0c1 100644
--- a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7b256470048be42466f7d10e1d6482e6 \
                     file://third_party/vpux_elf/LICENSE;md5=a7a2dfa2b52a22cf2257893ee87ba11c"
 
 SRC_URI = "git://github.com/intel/linux-npu-driver.git;protocol=https;name=linux-npu-driver;branch=main;lfs=1 \
-            git://github.com/openvinotoolkit/npu_plugin_elf.git;protocol=https;destsuffix=git/third_party/vpux_elf;name=vpux-elf;nobranch=1 \
-            git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=git/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \
-            git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=git/third_party/level-zero-npu-extensions;name=lzvext;nobranch=1 \
-            git://github.com/google/googletest.git;protocol=https;destsuffix=git/third_party/googletest;name=googletest;nobranch=1 \
+            git://github.com/openvinotoolkit/npu_plugin_elf.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/vpux_elf;name=vpux-elf;nobranch=1 \
+            git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \
+            git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/level-zero-npu-extensions;name=lzvext;nobranch=1 \
+            git://github.com/google/googletest.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/third_party/googletest;name=googletest;nobranch=1 \
             file://0001-linux-npu-driver-fix-multilib-install-issue.patch \
         "
 
@@ -20,8 +20,6 @@ SRCREV_lzvext = "c7d8f849d6a8195c1db38cbaca8d431cbabf3a6e"
 SRCREV_googletest = "b514bdc898e2951020cbdca1304b75f5950d1f59"
 SRCREV_FORMAT = "linux-npu-driver_vpux-elf_yaml-cpp_lzvext_googletest"
 
-S = "${WORKDIR}/git"
-
 inherit cmake
 
 
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
index d881610f..106b3ad5 100644
--- 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
@@ -37,7 +37,7 @@ SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c
 SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6"
 SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit bin_package
 
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
index 74af3f93..d2bd72a3 100644
--- 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
@@ -26,7 +26,7 @@ SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77
 SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236"
 SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit bin_package
 
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.3.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.3.bb
index 416deec1..77549479 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.3.bb
@@ -11,8 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master"
 SRCREV = "5730b150471602d6dc02d9b7d8a4a6ce9ceffe16"
 
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
index 1841253e..d10f50f9 100644
--- 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
@@ -21,7 +21,7 @@ SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd
 SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005"
 SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 COMPATIBLE_HOST:libc-musl = "null"
 
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
index e3e93028..e77ac588 100644
--- 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
@@ -34,7 +34,7 @@ SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c816
 SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84"
 SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit bin_package
 
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
index a2d709a1..1b0b32ed 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
@@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \
            "
 SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.2.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.2.0.bb
index d3a23653..d4e85cbc 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.2.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.2.0.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \
+           git://github.com/nothings/stb;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/apps/common/external/stb_image/stb;name=stb;nobranch=1 \
           "
 SRCREV = "85af2929937d516997451cbd52d352cf93125ed2"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.14.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.14.0.bb
index bec36593..5289e9eb 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.14.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.14.0.bb
@@ -8,8 +8,6 @@ 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 = "4a00047ae5a3ac705b6b33b4a7574588d91e7953"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
index 695e29e9..7b95ffe4 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
@@ -16,7 +16,7 @@ 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_3_0;name=ipmctl; \
-        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
+        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/edk2;branch=master \
         file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
         file://0001-CMakeLists-disable-Werror.patch \
 "
@@ -26,8 +26,6 @@ SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
 SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
 SRCREV_FORMAT = "ipmctl_edk2"
 
-S = "${WORKDIR}/git"
-
 inherit cmake dos2unix
 
 DEPENDS = "ndctl pkgconfig-native"
diff --git a/recipes-bsp/intel-cmt-cat/intel-cmt-cat_25.04.bb b/recipes-bsp/intel-cmt-cat/intel-cmt-cat_25.04.bb
index a0e8d214..4f9efc7d 100644
--- a/recipes-bsp/intel-cmt-cat/intel-cmt-cat_25.04.bb
+++ b/recipes-bsp/intel-cmt-cat/intel-cmt-cat_25.04.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4b63c65942e1c16fd897f8cd20abebf8"
 SRC_URI = "git://github.com/intel/intel-cmt-cat;protocol=https;branch=master"
 SRCREV = "17629d0b726875836af6c7d9cb38b8ed23f32089"
 
-S = "${WORKDIR}/git"
-
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
diff --git a/recipes-bsp/metee/metee_3.2.4.bb b/recipes-bsp/metee/metee_3.2.4.bb
index da8220b9..7b505453 100644
--- a/recipes-bsp/metee/metee_3.2.4.bb
+++ b/recipes-bsp/metee/metee_3.2.4.bb
@@ -14,5 +14,3 @@ SRC_URI = "git://github.com/intel/metee.git;branch=master;protocol=https \
 "
 SRCREV = "db45e37e146fd9c06907a15ade55eba06ad1f951"
 
-S = "${WORKDIR}/git"
-
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb
index df459d72..7f67b55b 100644
--- a/recipes-core/libxcam/libxcam_1.5.0.bb
+++ b/recipes-core/libxcam/libxcam_1.5.0.bb
@@ -6,7 +6,6 @@ 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 \
diff --git a/recipes-core/microcode/intel-microcode_20250512.bb b/recipes-core/microcode/intel-microcode_20250512.bb
index de011fda..ff383f85 100644
--- a/recipes-core/microcode/intel-microcode_20250512.bb
+++ b/recipes-core/microcode/intel-microcode_20250512.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git
 SRCREV = "eeb93b7a818bb27cb6b7a2be0454f8a0a75f1bd6"
 
 DEPENDS = "iucode-tool-native"
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/gmmlib/gmmlib_22.7.1.bb b/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
index 590141f1..d61a2fa1 100644
--- a/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
+++ b/recipes-graphics/gmmlib/gmmlib_22.7.1.bb
@@ -12,8 +12,6 @@ SRC_URI = " \
 
 SRCREV = "aa4e5d6c8f1d798b78ffd7ea85296fdd3a3946b2"
 
-S = "${WORKDIR}/git"
-
 COMPATIBLE_HOST:x86-x32 = "null"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^intel-gmmlib-(?P<pver>(\d+(\.\d+)+))$"
diff --git a/recipes-graphics/hdcp/hdcp_21.2.0.bb b/recipes-graphics/hdcp/hdcp_21.2.0.bb
index 8529b5ab..f45dea02 100644
--- a/recipes-graphics/hdcp/hdcp_21.2.0.bb
+++ b/recipes-graphics/hdcp/hdcp_21.2.0.bb
@@ -13,7 +13,6 @@ 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"
 
diff --git a/recipes-graphics/libva/libva-intel-utils_2.22.0.bb b/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
index 4ad97eed..041ea1ed 100644
--- a/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
+++ b/recipes-graphics/libva/libva-intel-utils_2.22.0.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
 SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.22-branch;protocol=https"
 SRCREV = "1a13ae13382b7b548f3a7e8035e1d7df66662c0a"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
diff --git a/recipes-graphics/libva/libva-intel_2.22.0.bb b/recipes-graphics/libva/libva-intel_2.22.0.bb
index 2405f440..b6b1f6ed 100644
--- a/recipes-graphics/libva/libva-intel_2.22.0.bb
+++ b/recipes-graphics/libva/libva-intel_2.22.0.bb
@@ -22,8 +22,6 @@ SRC_URI = "git://github.com/intel/libva.git;protocol=https;branch=v2.22-branch \
 
 SRCREV = "217da1c28336d6a7e9c0c4cb8f1c303968a675f1"
 
-S = "${WORKDIR}/git"
-
 UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
 
 DEPENDS = "libdrm"
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
index dbc17c1d..decac761 100644
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.13.178.bb
@@ -7,7 +7,6 @@ SECTION = "lib"
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
 SRCREV = "65ffef89cf79d704f618768bcd3d95f4dd6d875b"
 SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
           "
diff --git a/recipes-multimedia/itt/itt_3.26.1.bb b/recipes-multimedia/itt/itt_3.26.1.bb
index 0043b5de..27b967f5 100644
--- a/recipes-multimedia/itt/itt_3.26.1.bb
+++ b/recipes-multimedia/itt/itt_3.26.1.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c7
 
 SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master"
 SRCREV = "e535d565c88e4407f044719e2e9ec70c0b023d23"
-S = "${WORKDIR}/git"
 PE = "1"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
diff --git a/recipes-multimedia/libva/intel-media-driver_25.1.4.bb b/recipes-multimedia/libva/intel-media-driver_25.1.4.bb
index b972e230..d2ab0f43 100644
--- a/recipes-multimedia/libva/intel-media-driver_25.1.4.bb
+++ b/recipes-multimedia/libva/intel-media-driver_25.1.4.bb
@@ -24,7 +24,6 @@ SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
           "
 
 SRCREV = "14e2e7bcf1014186dbf1c099089c7c05cd880ae8"
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST:x86-x32 = "null"
 
diff --git a/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb b/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb
index e89a9d46..9154eb62 100644
--- a/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb
+++ b/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/intel/libvpl-tools.git;protocol=https;branch=main \
           "
 
 SRCREV = "82eab13ecec99f34e0f1d5dac490611b604406c9"
-S = "${WORKDIR}/git"
 
 inherit cmake
 DEPENDS += "libva libvpl pkgconfig-native"
diff --git a/recipes-multimedia/vpl/libvpl_2.14.0.bb b/recipes-multimedia/vpl/libvpl_2.14.0.bb
index d52ca076..3c35a892 100644
--- a/recipes-multimedia/vpl/libvpl_2.14.0.bb
+++ b/recipes-multimedia/vpl/libvpl_2.14.0.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/intel/libvpl.git;protocol=https;branch=main \
            file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \
             "
 SRCREV = "025d43d086a3e663184cb49febe86152bf05409f"
-S = "${WORKDIR}/git"
 
 inherit cmake
 DEPENDS += "libva pkgconfig-native"
diff --git a/recipes-multimedia/vpl/vpl-gpu-rt_25.1.4.bb b/recipes-multimedia/vpl/vpl-gpu-rt_25.1.4.bb
index d182ce53..0a0e6972 100644
--- a/recipes-multimedia/vpl/vpl-gpu-rt_25.1.4.bb
+++ b/recipes-multimedia/vpl/vpl-gpu-rt_25.1.4.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/intel/vpl-gpu-rt.git;protocol=https;nobranch=1;lfs=0
           "
 
 SRCREV = "c65990e456acf901597a76b22407232679152547"
-S = "${WORKDIR}/git"
 
 FILES:${PN} += " \
                 ${libdir}/libmfx-gen/enctools.so \
diff --git a/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb b/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb
index 61383f82..2b3fcca7 100644
--- a/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb
+++ b/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/intel/ipp-crypto;protocol=https;branch=${IPP_BRANCH}
            "
 SRCREV = "7d6ac349507258f49d00909df33d5dea4ff77f39"
 
-S = "${WORKDIR}/git/sources/ippcp/crypto_mb"
+S = "${UNPACKDIR}/${PN}-${PV}/sources/ippcp/crypto_mb"
 
 DEPENDS = "openssl"
 
diff --git a/recipes-oneapi/onedpl/onedpl_2022.8.0.bb b/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
index 7e3f309f..9e2547a1 100644
--- a/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
+++ b/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
@@ -9,8 +9,6 @@ LICENSE  = "Apache-2.0-with-LLVM-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e982d844baa4df1c80de75470e0c5cb \
                     file://third-party-programs.txt;md5=409cd5c825a23043b6bb347861d34b35"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/uxlfoundation/oneDPL.git;protocol=https;branch=release/2022.8.0 \
             "
 SRCREV = "89d8d8befd4da2cb52f3724f668d17d7e39d42cf"
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
index a1762a16..f66ffeea 100644
--- 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
@@ -7,12 +7,9 @@ LIC_FILES_CHKSUM = "file://${CUSTOM_LICENSES_PATH}/EULA;md5=7bfc91523de2e84e7131
 
 SRC_URI = "file://intel-oneapi-runtime.conf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
 do_install() {
     mkdir -p ${D}${sysconfdir}/ld.so.conf.d/
-    install -m 644 ${S}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
+    install -m 644 ${UNPACKDIR}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
 }
 
 pkg_postinst_ontarget:${PN}() {
diff --git a/recipes-support/isa-l/isa-l_2.31.1.bb b/recipes-support/isa-l/isa-l_2.31.1.bb
index 78850579..93178942 100644
--- a/recipes-support/isa-l/isa-l_2.31.1.bb
+++ b/recipes-support/isa-l/isa-l_2.31.1.bb
@@ -7,7 +7,6 @@ SECTION = "lib"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 SRCREV = "c387163fcbca62701d646149564c550c78a4f985"
 SRC_URI = "git://github.com/intel/isa-l.git;branch=master;protocol=https"
 
diff --git a/recipes-support/libipt/libipt_2.1.2.bb b/recipes-support/libipt/libipt_2.1.2.bb
index edc9c371..7806cf6b 100644
--- a/recipes-support/libipt/libipt_2.1.2.bb
+++ b/recipes-support/libipt/libipt_2.1.2.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=491799fd9431e57ad52cb0ef3497afce"
 
 inherit pkgconfig cmake
 
-S = "${WORKDIR}/git"
-
 SRC_URI = "git://github.com/intel/libipt.git;protocol=https;branch=stable/v2.1"
 
 SRCREV = "ffc548e5fbc2fa3e9795d4593f861e1df99cf906"