3 files changed, 2 insertions, 7 deletions

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}() {