meta-openembedded/all: adapt to UNPACKDIR changes

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

I've verified that bitbake -c patch world works with these, but did not run a world
build; the majority of recipes shouldn't need further fixups, but if there are
some that still fall out, they can be fixed in followups.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

100 files changed, 54 insertions, 130 deletions

diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
index 7d8b813e5f..4afbba963a 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
            file://0002-abseil-ppc-fixes.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb b/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
index 87c09f5118..e027b8d4aa 100644
--- a/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
+++ b/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.gi
 "
 SRCREV = "9bd5e2c7886fca72f139cd8402488a2235957d41"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "bison-native"
 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
index f473d22849..342e7fd1a5 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
@@ -3,8 +3,7 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 SRC_URI = " \
     file://android-gadget-setup \
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
index abf21803e5..764d6b404f 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://android-gadget-setup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index fe915c3e30..ff83b6c2ee 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -21,11 +21,11 @@ SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
 
 SRCREV_FORMAT = "core_extras_libhardware_libselinux_build"
 SRC_URI = " \
-    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \
-    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
-    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \
-    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \
-    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=git/build \
+    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/core \
+    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/extras \
+    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/hardware/libhardware \
+    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/libselinux \
+    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/build \
     file://core/0001-adb-remove-selinux-extensions.patch;patchdir=system/core \
     file://core/0002-adb-Use-local-sockets-where-appropriate.patch;patchdir=system/core \
     file://core/0003-adb-define-shell-command.patch;patchdir=system/core \
@@ -62,7 +62,6 @@ SRC_URI = " \
 "
 
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}"
 
 # http://errors.yoctoproject.org/Errors/Details/133881/
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
index 48ba7dbaea..244d9a3c6f 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
@@ -11,7 +11,6 @@ SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
            file://0001-Explicit-header-stdint.patch \
           "
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "zlib libpng python3-native"
 
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
index 3bf4371e85..0e51289507 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
@@ -27,9 +27,9 @@ SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac"
 SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31"
 
 SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \
-           git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \
-           git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
-           git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \
+           git://github.com/google/googletest.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/testing/gtest;name=gtest;branch=main;protocol=https \
+           git://github.com/protocolbuffers/protobuf.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
+           git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/lss;name=lss \
            file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \
            file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \
            file://0001-Turn-off-sign-compare-for-musl-libc.patch \
@@ -41,7 +41,6 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h
            file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
            file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
 "
-S = "${WORKDIR}/git"
 
 CXXFLAGS += "-D_GNU_SOURCE"
 LDFLAGS:append:libc-musl = " -lucontext"
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
index 77bde79217..0ea243fd20 100644
--- a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
+++ b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};prot
            file://0001-Export-binaries-only-for-native-build.patch"
 SRCREV = "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc"
 
-S = "${WORKDIR}/git/c++"
+S = "${UNPACKDIR}/${BP}/c++"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb b/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
index eb8556ebc6..8a6337a0d2 100644
--- a/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
+++ b/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master \
             file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.155"
 SRCREV = "bd78bbe59b10eda6ef1255e4acda95c56c6d0279"
-S = "${WORKDIR}/git"
 
 inherit cargo pkgconfig
 
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
index bdeab3055c..33c8c28531 100644
--- a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
+++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \
          "
 SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig ptest
 
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
index 47a3d88853..ab4e6148e9 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \
            file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch \
            file://0001-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch"
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*"
 
diff --git a/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
index 961c94205f..6e709b6e7e 100644
--- a/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
+++ b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 SRC_URI = "git://github.com/rm5248/libcppgenerate.git;branch=master;protocol=https"
 SRCREV = "930c5503f76c877b72b9ff8546353d6f422bd010"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
index b404d4131e..98419a8069 100644
--- a/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
+++ b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = "git://github.com/SUSE/cpuset.git;protocol=https;branch=master"
 
 SRCREV = "4f80263208935f0df4f616cf9d8cb7285599a670"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.2.20250608.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20250608.0.bb
index 6f0fbff0b2..845a78da76 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_6.2.20250608.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20250608.0.bb
@@ -17,7 +17,6 @@ inherit autotools-brokensep pkgconfig manpages
 SRCREV = "c06d333b3162660694b26604a364cdab89e2010e"
 SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
     readcmd \
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
index 5fa71896b2..9287962ab7 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
@@ -13,7 +13,7 @@ SRC_URI  = "\
 
 SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b"
 
-S = "${WORKDIR}/debootstrap"
+S = "${UNPACKDIR}/debootstrap"
 
 DEPENDS = " \
     virtual/fakeroot-native \
diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
index 599675a345..bc558b7d62 100644
--- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
+++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
@@ -10,7 +10,6 @@ SRC_URI:append:class-target = " file://oe-remote.repo.sample"
 
 inherit setuptools3-base
 
-S = "${WORKDIR}/git"
 
 do_install:append() {
     install -d ${D}${datadir}/dnf
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb
index 1c8b442eef..512a63549e 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb
@@ -12,7 +12,6 @@ SRC_URI = "\
 
 SRCREV = "cbe58f6237b2238c9af7f51c6b7afb8bbf52c866"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "Release_(?P<pver>\d+(\_\d+)+)"
 
diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
index b567f11f5c..c6db2ef38c 100644
--- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
+++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8"
 
 SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 SRCREV = "e082c947e7f7b14240195d55c060a6e1eda1b0a1"
 
 inherit cmake
diff --git a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
index 74a14f4f08..bdaa39b402 100644
--- a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
+++ b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
@@ -7,7 +7,6 @@ SRCREV = "a4b17d543f072d2e3ba564e4bc5c3a0d2b05c338"
 
 SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=release;protocol=https"
 
-S = "${WORKDIR}/git"
 
 # other packages commonly reference the file directly as "exprtk.hpp"
 # create symlink to allow this usage
diff --git a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
index a4cd7ad157..83e9383d4a 100644
--- a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
+++ b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
@@ -7,7 +7,6 @@ DEPENDS = "openssl"
 SRC_URI = "git://git.pengutronix.de/git/extract-cert;protocol=https;branch=master;"
 SRCREV = "d652b4e8279aef2a85f58676ab472744bafeafc9"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
index 3103fd0091..c51a49ba01 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
@@ -13,7 +13,6 @@ DEPENDS = "flatbuffers-native"
 RDEPENDS:${PN}-compiler = "${PN}"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " \
     -DFLATBUFFERS_BUILD_TESTS=OFF \    
diff --git a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
index 1fab013580..feb206f27c 100644
--- a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 require flatbuffers.inc
 
-S = "${WORKDIR}/git/python"
+S = "${UNPACKDIR}/${BP}/python"
 
 RDEPENDS:${PN} = "flatbuffers"
 
diff --git a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb b/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
index 2530dac526..2565e3b9bd 100644
--- a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
+++ b/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
 "
 SRCREV = "1653ec964730ec7d9892a08a1695ada6d20f5196"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
index 6b1a6e5453..53867b8fe6 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
@@ -23,7 +23,6 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
 # Both dependencies are mutually exclusive
 # RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-S = "${WORKDIR}/git"
 SRCREV_grpc = "4e9357bca1408596663a218c0c608a4c0560a867"
 BRANCH = "v1.71.x"
 SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.9.bb b/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
index 9c956f0ed1..27f39ed1e1 100644
--- a/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
+++ b/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
@@ -10,7 +10,6 @@ PV = "3.9.9"
 SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https;tag=versions/${PV}"
 SRCREV = "118ab61773463e56dedc78f5cf6723b97a4ad946"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
index 599fd2c373..3aca51ee3e 100644
--- a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
+++ b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https;branch=master \
 
 SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
index cc21c8beae..aa1f417604 100644
--- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
+++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
@@ -20,7 +20,6 @@ SRCREV = "630434bb0ac619f7beec927569782d924c459385"
 PV_LONG := "${PV}-171-g${SRCREV}"
 PV .= "+git"
 
-S = "${WORKDIR}/git"
 
 inherit autotools ptest
 
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
index 02dcdb2696..241fd328d8 100644
--- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
+++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=
 
 SRCREV = "6b17782d6a5d1dee5d2c4fc5d25ffb1123913431"
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "nlohmann-json"
 
diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
index d6e42c81d5..56ddaf59a5 100644
--- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
@@ -16,7 +16,7 @@ SRC_URI = "file://json_spirit_v${PV}.zip \
            file://0001-Link-to-libatomic.patch \
 "
 
-S = "${WORKDIR}/json_spirit_v${PV}"
+S = "${UNPACKDIR}/json_spirit_v${PV}"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
index 28820baf48..f68ffd2c0f 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
@@ -16,7 +16,6 @@ PE = "1"
 SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6"
 SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
index 75f2a53b10..ae86e20a4a 100644
--- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
+++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=http
 
 SRCREV = "ec5ce12fc9c0299e1454cc002c70218b5a6f005b"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[coverage] = "-DWITH_COVERAGE=YES,-DWITH_COVERAGE=NO,,"
diff --git a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
index 57a9cbade1..5ad953d260 100644
--- a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
+++ b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https
 
 SRCREV = "e71e0c2d584baff06925bbb3aad683f677e4d498"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "openssl"
 
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
index efa8c936b4..43a61908f5 100644
--- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
+++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
@@ -23,7 +23,6 @@ SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 do_configure:prepend () {
diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
index 7cb6c097f3..63069b4b83 100644
--- a/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
+++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
@@ -20,7 +20,6 @@ SRCREV = "5ebe92156143a341ab7b14bf76560d30093cfc54"
 SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \
            ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
           "
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF"
diff --git a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
index 2904a454dc..8a8491b76b 100644
--- a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
+++ b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/sqlite/sqlite;protocol=https;branch=branch-3.44"
 
 SRCREV = "c8f9803dc32bfee78a9ca2b1abbe39499729219b"
 
-S = "${WORKDIR}/git"
 
 do_compile() {
     ${CC} ${CFLAGS} ${LDFLAGS} tool/lemon.c -o lemon
diff --git a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
index 9b18269bcb..3616eb519d 100644
--- a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
+++ b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
@@ -16,7 +16,6 @@ inherit autotools-brokensep pkgconfig
 # sombok-2.4.0
 SRCREV = "0098d85a037ef5c99a648a3669a077781a45e8cc"
 
-S = "${WORKDIR}/git"
 
 # Disable libthai support
 EXTRA_OECONF = "--disable-libthai"
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
index 5b357e2492..38786b79ed 100644
--- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
@@ -16,14 +16,13 @@ SRCREV_json = "8c391e04fe4195d8be862c97f38cfe10e2a3472e"
 SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2"
 
 SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \
-           git://github.com/nlohmann/json;destsuffix=git/tests/extlib/json;name=json;branch=develop;protocol=https \
-           git://github.com/doctest/doctest;destsuffix=git/tests/extlib/doctest;name=doctest;branch=master;protocol=https \
+           git://github.com/nlohmann/json;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/json;name=json;branch=develop;protocol=https \
+           git://github.com/doctest/doctest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/doctest;name=doctest;branch=master;protocol=https \
            file://0001-Remove-whitespace-in-operator.patch \
            file://run-ptest \
 "
 SRCREV_FORMAT = "json_doctest"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-oe/recipes-devtools/libubox/libubox_git.bb
index 131929b30e..394cf9c000 100644
--- a/meta-oe/recipes-devtools/libubox/libubox_git.bb
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -25,7 +25,6 @@ PV = "1.0.1+git"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
index 0fb68d8684..95e2084255 100644
--- a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
+++ b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
     file://0001-disable-docbook2man.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
index 58cfcb2f06..f84d989eef 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
@@ -31,7 +31,6 @@ SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \
            "
 SRC_URI:append:libc-musl = " file://add_ppc64le.patch"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index cbad79f3ae..f4a1345ab2 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_git.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
 PV = "2.1"
 SRCREV = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig binconfig siteinfo
 
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb b/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
index 7fb0965813..59bc4dfcfe 100644
--- a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
+++ b/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
@@ -8,7 +8,6 @@ DEPENDS += "lua-native lua virtual/crypt"
 SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v36.2;protocol=https \
 "
 SRCREV = "5a8d8c768fc3c51f42cb591e9523a60399efc6a1"
-S = "${WORKDIR}/git"
 LUA_VERSION = "5.4"
 
 B = "${S}"
diff --git a/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
index f94025dd05..57c8417f44 100644
--- a/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
+++ b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "\
 
 SRCREV = "09488c50c6bdc40aec8e3a9b23a539c5054a634c"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
index 028a8f9e46..4590b49955 100644
--- a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
+++ b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
@@ -11,6 +11,5 @@ DEPENDS = "libmodbus (>=3.1.4)"
 SRC_URI = "git://github.com/epsilonrt/mbpoll;protocol=https;branch=master"
 SRCREV = "a0bd6c08d3d15b086f2104477295c0705aed366a"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig cmake
diff --git a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
index 502843c0d1..a65782d017 100644
--- a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
+++ b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
@@ -8,7 +8,7 @@ SECTION = "devtool"
 
 LICENSE = "GPL-2.0-only"
 
-S = "${WORKDIR}/memstattool"
+S = "${UNPACKDIR}/memstattool"
 
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=87be186443b1ac2cfa466f475e1ee0cb"
 
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
index 9331cd16fe..a312be4aa7 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
@@ -12,7 +12,7 @@ inherit python3native python3targetconfig
 SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
 SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307"
 
-S = "${WORKDIR}/mercurial-${PV}"
+S = "${UNPACKDIR}/mercurial-${PV}"
 
 BBCLASSEXTEND = "native"
 
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
index 8ba121d5ea..2fbbf8f06a 100644
--- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
+++ b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=main \
 "
 SRCREV = "a3534567187d2edc428efd3f13466ff75fe5805c"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig ptest
 
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
index 40d997a52c..aa7629763c 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/msgpack/msgpack-c;branch=c_master;protocol=https \
            "
 SRCREV = "8160ede5e20fd3019a77eea46d9c72cf6163f802"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
index ccbaf9cea7..3457964609 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "5fd555742e37bbd58d166199e669f01f743c7b3c6177191dd7b31fb0c3
 UPSTREAM_CHECK_URI = "https://github.com/msgpack/msgpack-c/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/msgpack-cxx-${PV}"
+S = "${UNPACKDIR}/msgpack-cxx-${PV}"
 
 DEPENDS += "boost"
 
diff --git a/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb b/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
index 51fb98ccc8..2183170ba6 100644
--- a/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
+++ b/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
@@ -7,7 +7,7 @@ SECTION = "devel"
 SRC_URI = "https://01.org/sites/default/files/downloads/msr-tools/msr-tools-${PV}.zip"
 SRC_URI[sha256sum] = "f9457b5340f5f274da4239a461f0db6b514142b40461559d9c6150f05aab1d1e"
 
-S = "${WORKDIR}/msr-tools-master"
+S = "${UNPACKDIR}/msr-tools-master"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
diff --git a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
index 82e5c3bc5e..ef2553760d 100644
--- a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
+++ b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools-brokensep
 
-S = "${WORKDIR}/git"
 
 do_configure () {
     # no debug set -s flag
diff --git a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
index 36e46021bb..ec87535ec7 100644
--- a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
+++ b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
@@ -12,7 +12,6 @@ SRCREV = "d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 # nlohmann-fifo is a header only C++ library, so the main package will be empty.
 
diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 58567a781e..1dfcc6ad75 100644
--- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
+++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
 CVE_PRODUCT = "json-for-modern-cpp"
 
 SRC_URI = "git://github.com/nlohmann/json.git;branch=master;protocol=https \
-           git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
+           git://github.com/nlohmann/json_test_data.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/json_test_data;name=json-test-data;branch=master;protocol=https \
            file://run-ptest \
 "
 
@@ -16,7 +16,6 @@ SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
 
 SRCREV_FORMAT .= "_json-test-data"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
index d4b818f967..1dcd1f7926 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
@@ -8,8 +8,7 @@ SRC_URI = "\
 
 inherit native
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 B = "${WORKDIR}/build"
 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
index b29c83400a..4bc829f140 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
@@ -40,7 +40,7 @@ SRC_URI:append:toolchain-clang:powerpc64le = " \
            "
 SRC_URI[sha256sum] = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37"
 
-S = "${WORKDIR}/node-v${PV}"
+S = "${UNPACKDIR}/node-v${PV}"
 
 CVE_PRODUCT += "node.js"
 
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb
index b1ce2ec168..3bbe33ca1d 100644
--- a/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -7,8 +7,8 @@ RDEPENDS:${PN} = "libusb1"
 SRC_URI = " \
     git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \
     git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \
-    git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \
-    git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
+    git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \
+    git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
     file://0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch \
 "
 
@@ -19,7 +19,6 @@ SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0"
 SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4"
 
 PV = "0.12+git"
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools-brokensep gettext
 
diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb b/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
index d5fa3b4746..aca915bf32 100644
--- a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
+++ b/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
@@ -13,7 +13,6 @@ SRCREV = "b9cc7963051b2099795129450f9b70c81950d02f"
 SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \
            file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
index 52af9b99b1..130980b0cd 100644
--- a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
+++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 do_install() {
     install -D -m 0755 ${B}/pcimem ${D}${bindir}/pcimem
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb
index 6b4e6372d3..e284ec8d1e 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb
@@ -11,20 +11,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d \
 
 # Dependencies from perfetto/tools/install-build-deps
 SRC_URI:append = " \
-           git://github.com/protocolbuffers/protobuf.git;branch=main;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \
-           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=git/buildtools/libcxx;branch=main;name=libcxx \
-           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=git/buildtools/libcxxabi;branch=main;name=libcxxabi \
-           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \
-           git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libbase;name=libbase \
-           git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=git/buildtools/android-unwinding;name=unwinding \
-           git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=git/buildtools/android-logging;name=logging \
-           git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libprocinfo;name=libprocinfo \
-           git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=git/buildtools/android-core;name=core \
-           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \
-           git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \
-           git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=git/buildtools/lzma;name=lzma \
-           git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=git/buildtools/zstd;name=zstd \
-           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \
+           git://github.com/protocolbuffers/protobuf.git;branch=main;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/protobuf;name=protobuf \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libcxx;branch=main;name=libcxx \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libcxxabi;branch=main;name=libcxxabi \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libunwind;branch=main;name=libunwind \
+           git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libbase;name=libbase \
+           git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-unwinding;name=unwinding \
+           git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-logging;name=logging \
+           git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libprocinfo;name=libprocinfo \
+           git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-core;name=core \
+           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/bionic;name=bionic \
+           git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \
+           git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \
+           git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \
+           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/;name=gn \
            \
            file://0001-Remove-check_build_deps-build-steps.patch \
            file://0002-traced-fix-missing-include.patch \
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc
index 3cd0cb91b8..1c7e9144cc 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.inc
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc
@@ -10,4 +10,3 @@ SRCREV_perfetto = "c74251226a8caa0b43377902ee06d2570faa0c15"
 SRCREV_FORMAT = "perfetto"
 PV = "47.0"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
index 3b686f7fdc..65f2ec232a 100644
--- a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
+++ b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "f977a25b4116a0a95a7c8a894fd37097abe19af9a6a9ed4d800604ec17
 
 RDEPENDS:${PN} = "libdbi-perl"
 
-S = "${WORKDIR}/DBD-MariaDB-${PV}"
+S = "${UNPACKDIR}/DBD-MariaDB-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.89.bb b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
index 3d745146f1..69a4f79815 100644
--- a/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
+++ b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
@@ -10,7 +10,6 @@ inherit cpan
 SRCREV = "e04534a40925354187e8432d44248229d774f34a"
 SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} = " \
     perl \
diff --git a/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb b/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
index e28b6ea018..9cdb0a52cc 100644
--- a/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
+++ b/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
@@ -12,7 +12,6 @@ DEPENDS = "perl"
 SRC_URI = "git://github.com/toddr/IPC-Run.git;branch=master;protocol=https"
 SRCREV = "ad56c3b5f5a211d32bbb8ac29f180d707ee58c1b"
 
-S = "${WORKDIR}/git"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb b/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
index 9171cbc89c..4886333f3a 100644
--- a/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
+++ b/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/${SRCNAME}-${PV}.
 
 SRC_URI[sha256sum] = "473d65127b23dac0e8039c01e28bc4072cb9a6e93e81a1ea4893cea08c698db0"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
 
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
index f70f737ba2..c128cb7154 100644
--- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
+++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65f65488c774efe1da488e36ad6c4a36"
 SRC_URI = "${CPAN_MIRROR}/authors/id/H/HM/HMBRAND/DBI-${PV}.tgz"
 SRC_URI[sha256sum] = "0df16af8e5b3225a68b7b592ab531004ddb35a9682b50300ce50174ad867d9aa"
 
-S = "${WORKDIR}/DBI-${PV}"
+S = "${UNPACKDIR}/DBI-${PV}"
 
 inherit cpan ptest-perl
 
diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
index 21e46f5521..43614d55ac 100644
--- a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
+++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV
 "
 SRC_URI[sha256sum] = "869d38c258e646dcef676609f0dd7ca90f085f56cf6fd7001b019a5d5b831fca"
 
-S = "${WORKDIR}/Devel-CheckLib-${PV}"
+S = "${UNPACKDIR}/Devel-CheckLib-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
index 6029b7aae9..1464a84d34 100644
--- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
+++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af"
 
-S = "${WORKDIR}/IO-Tty-${PV}"
+S = "${UNPACKDIR}/IO-Tty-${PV}"
 
 inherit cpan ptest-perl
 
diff --git a/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb b/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
index 407ba39140..ded0dea0d1 100644
--- a/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
+++ b/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https;branch=master"
 
 SRCREV = "39bc0e567c202762a575fed2844ebdb941c3ca09"
 
-S = "${WORKDIR}/git"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb b/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
index b77a5c95a2..a7e05922d6 100644
--- a/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
+++ b/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-${PV}.tar.g
 
 SRC_URI[sha256sum] = "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5"
 
-S = "${WORKDIR}/Parse-Yapp-${PV}"
+S = "${UNPACKDIR}/Parse-Yapp-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
index 1bdb332a75..3e4137a68c 100644
--- a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
+++ b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "5cc834438739bd6e4e837fb7e10bd8befb809cd185ae6cf4b33e5fa916
 UPSTREAM_CHECK_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/"
 UPSTREAM_CHECK_REGEX = "pcsc-perl-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/pcsc-perl-${PV}"
+S = "${UNPACKDIR}/pcsc-perl-${PV}"
 
 inherit cpan pkgconfig
 
diff --git a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
index 4ce31d6fe6..981c946483 100644
--- a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
+++ b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/N/NW/NWCLARK/PerlIO-gzip-${PV}.t
 
 SRC_URI[sha256sum] = "4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5"
 
-S = "${WORKDIR}/PerlIO-gzip-${PV}"
+S = "${UNPACKDIR}/PerlIO-gzip-${PV}"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
 
diff --git a/meta-oe/recipes-devtools/php/php_8.4.6.bb b/meta-oe/recipes-devtools/php/php_8.4.6.bb
index 1b8c019a5d..5118ddd6ab 100644
--- a/meta-oe/recipes-devtools/php/php_8.4.6.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.6.bb
@@ -27,7 +27,7 @@ SRC_URI:append:class-target = " \
             file://php-fpm.service \
           "
 
-S = "${WORKDIR}/php-${PV}"
+S = "${UNPACKDIR}/php-${PV}"
 
 SRC_URI[sha256sum] = "9cf2734509b603f6589617ab52a9712a03e0fe059951cddd2d4623df4bf7c6c6"
 
diff --git a/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb b/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
index feffff623d..b0a20e3ece 100644
--- a/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
+++ b/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/pistacheio/pistache.git;branch=master;protocol=https
 # SRCREV tagged 0.4.26
 SRCREV = "ddffda861aa49012dcda28f1362d0339e718cd52"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "rapidjson"
 
diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb
index 5a39456b2d..916ff29118 100644
--- a/meta-oe/recipes-devtools/ply/ply_git.bb
+++ b/meta-oe/recipes-devtools/ply/ply_git.bb
@@ -10,7 +10,6 @@ PV = "2.4.0"
 SRC_URI = "git://github.com/iovisor/ply;branch=master;protocol=https"
 SRCREV = "282558cfa1c0f0e095354e3a6ec4486b524179dc"
 
-S = "${WORKDIR}/git"
 
 CACHED_CONFIGUREVARS = 'LD="${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}"'
 
diff --git a/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb b/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
index 7b06d10526..f3ffccf626 100644
--- a/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
+++ b/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8cdfa87bc5e09bc07f8cf64135026d91"
 SRC_URI = "git://github.com/pocketpy/pocketpy.git;protocol=https;branch=main"
 SRCREV = "8a3bdd7e0a43b44e3b32548543128d95e68a3802"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
index 7640797771..30c9e19b16 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
@@ -19,7 +19,6 @@ SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-
 
 SRCREV = "185beed28e65494be7505b30c1afeaf199e19b23"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb b/meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb
index 30b805e6b1..61aff1da28 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_5.29.4.bb
@@ -26,7 +26,6 @@ SRC_URI:append:mipsarcho32:toolchain-clang = " file://0001-Fix-build-on-mips-cla
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.(25\.(\d+)))"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 
diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
index 1d54b9f6af..d5c440f413 100644
--- a/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
+++ b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://salsa.debian.org/apt-team/python-apt.git;protocol=https;branch=
 
 SRCREV = "3252935b6224b3bd2e2250894b9559b47c61b2e1"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
index a98dfab6d9..d80eac7756 100644
--- a/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
+++ b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
@@ -10,6 +10,6 @@ SRC_URI[sha256sum] = "723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae
 
 inherit setuptools3
 
-S = "${WORKDIR}/python-distutils-extra-${PV}"
+S = "${UNPACKDIR}/python-distutils-extra-${PV}"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index 8519479c4d..724d329ee2 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -10,7 +10,6 @@ SRCREV = "0ccdbf364c577803e2a751f5aededce935314313"
 
 PV = "1.1.0+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
index 29abfe1af5..672c46055d 100644
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
+++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
@@ -9,7 +9,6 @@ SRC_URI = " \
 
 SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
index b97700e53d..72ccd1d6b7 100644
--- a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
+++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
@@ -7,6 +7,5 @@ BRANCH = "master"
 SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https;tag=v${PV}"
 SRCREV = "d3645392424d47532be90fcbc0abf3148324785b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
index bf5c52fe50..ea4fc5d3dd 100644
--- a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
+++ b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
@@ -9,7 +9,6 @@ DEPENDS = "ncurses"
 SRC_URI = "git://github.com/ColinIanKing/smemstat.git;protocol=https;branch=master"
 SRCREV = "1edc560602aa116b96408110b8b9d66a4edef60e"
 
-S = "${WORKDIR}/git"
 
 inherit bash-completion
 
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
index 17c24d5abf..ee203f83e2 100644
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
@@ -12,7 +12,6 @@ SRC_URI = " \
     git://github.com/fnc12/sqlite_orm;protocol=https;branch=master \
     file://0001-fix-cstdint-error-with-gcc-15.0.1.patch \
 "
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF -DLIB_INSTALL_DIR=${libdir} \
                   -DCMAKE_INSTALL_DIR=${libdir}/cmake \
diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
index 10e0e27a20..966d14874e 100644
--- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
+++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \
 SRCREV = "667faf69cc35215e33e747b4bffdcba3643c2629"
 SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=fixes-1.3.0"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
index 2c01e126ff..7824ed1a68 100644
--- a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
@@ -11,7 +11,6 @@ SRC_URI = " \
 "
 SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251"
 
-S = "${WORKDIR}/git"
 
 # coreutils provides fmt which is used in the Makefile
 DEPENDS = "i2c-tools coreutils-native"
diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
index 29f114a9dc..8effd042fb 100644
--- a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
+++ b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https;branc
            "
 SRCREV = "538273cfd53720a10e34a3d80d3779b607e1ac26"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "cmake-native lapack gmp mpfr chrpath-native"
 
diff --git a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
index 3360ccf357..6c5591b461 100644
--- a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
+++ b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
@@ -7,8 +7,7 @@ inherit nativesdk
 
 SRC_URI = "file://systemctl"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -d ${D}${bindir}
diff --git a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
index 60dbc7b422..6f452d3b93 100644
--- a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
+++ b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5c64b2e8cc50917b2744a90950faa7cd"
 SRCREV = "81b3d2a0c47895c22e9bb8c577f5ab521f76e5d2"
 SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4"
 
-S = "${WORKDIR}/git"
 inherit cmake
 
 ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb
index 8518fb8dfe..8cb9f6cb5e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb
@@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
 UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
 
-S = "${WORKDIR}/tk${PV}"
+S = "${UNPACKDIR}/tk${PV}"
 
 # Short version format: "8.6"
 VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
diff --git a/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb b/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
index 8701686b11..504b40927e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "d6f01a4d598bfc6398be9584e1bab828c907b0758db4bbb351a1429106
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
 UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
 
-S = "${WORKDIR}/${BPN}${PV}"
+S = "${UNPACKDIR}/${BPN}${PV}"
 
 # Short version format: "8.6"
 VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
diff --git a/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
index a6ec89a2ff..da8b1602be 100644
--- a/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
+++ b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/marzer/tomlplusplus.git;protocol=https;branch=master
 
 PV = "3.4.0"
 SRCREV = "30172438cee64926dc41fdd9c11fb3ba5b2ba9de"
-S = "${WORKDIR}/git"
 
 DEPENDS = "cmake-native"
 
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
index 8fecadb22f..776bb014f4 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
@@ -13,7 +13,6 @@ inherit autotools
 SRCREV = "b0d936107edcefb519abbc9c363ca40daaac23b3"
 SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \
            file://0001-include-libgen.h-for-basename.patch"
-S = "${WORKDIR}/git"
 
 LDFLAGS:append:libc-musl = " -largp"
 
diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
index e37dbcd02f..3d92f59ff2 100644
--- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
+++ b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/mvo5/unattended-upgrades.git;protocol=https;branch=m
 
 SRCREV = "5aff8fa2b5b60b7c11bbfb39c884477e72d11d02"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3_legacy
 
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
index 54d33379da..877f1d57f6 100644
--- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
@@ -22,7 +22,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \
 
 SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28"
 
-S = "${WORKDIR}/imap-${PV}"
+S = "${UNPACKDIR}/imap-${PV}"
 
 CVE_STATUS[CVE-2005-0198] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 
diff --git a/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb b/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
index 7f5d0b1416..4e5f02746c 100644
--- a/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
+++ b/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf"
 SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https;tag=v${PV}"
 SRCREV = "4edda758546436462da479bb8c8514f8a95c35ad"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
index e9442697fa..3b923fb99e 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
            "
 SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
 
-S = "${WORKDIR}/git/advanced"
+S = "${UNPACKDIR}/${BP}/advanced"
 
 inherit autotools-brokensep binconfig pkgconfig
 
diff --git a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
index 186f2c8ed0..3e569859b7 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/lloyd/yajl;nobranch=1;protocol=https"
 
 inherit cmake lib_package
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
 
diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
index c5b5e60027..e4434bee45 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https \
            "
 SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb
index de7eb45c1d..68895a1697 100644
--- a/meta-oe/recipes-devtools/yasm/yasm_git.bb
+++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \
            file://0001-bitvect-fix-build-with-gcc-15.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext python3native