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>

99 files changed, 17 insertions, 102 deletions

diff --git a/meta-oe/recipes-extended/7zip/7zip_24.09.bb b/meta-oe/recipes-extended/7zip/7zip_24.09.bb
index 4b6c7a613c..74e44c44e3 100644
--- a/meta-oe/recipes-extended/7zip/7zip_24.09.bb
+++ b/meta-oe/recipes-extended/7zip/7zip_24.09.bb
@@ -14,7 +14,6 @@ SRCREV = "e5431fa6f5505e385c6f9367260717e9c47dc2ee"
 
 UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest"
 
-S = "${WORKDIR}/git"
 
 # Support Yocto cross compiling
 CXXFLAGS:append:toolchain-clang = " -Wno-error=cast-qual -Wno-error=sign-conversion \
diff --git a/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb b/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
index 645ea1a2ae..033461d614 100644
--- a/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
+++ b/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
@@ -32,7 +32,6 @@ SRCHASH_CPM = "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d"
 TAG_CPM = "0.40.2"
 SRC_URI[sha256sum] = "${SRCHASH_CPM}"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-extended/beep/beep_1.4.12.bb b/meta-oe/recipes-extended/beep/beep_1.4.12.bb
index a4bc10c366..a8d720d9dd 100644
--- a/meta-oe/recipes-extended/beep/beep_1.4.12.bb
+++ b/meta-oe/recipes-extended/beep/beep_1.4.12.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \
            file://0001-beep-library-Make-it-compatible-with-c99.patch"
 SRCREV = "11453a79f2cea81832329b06ca3a284aa7a0a52e"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "prefix='${prefix}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
index 4d560eb4b8..397829c87b 100644
--- a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
+++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1
 UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/${BPN}-v${PV}"
+S = "${UNPACKDIR}/${BPN}-v${PV}"
 
 DEPENDS = "ncurses readline"
 
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
index cfd134dd4f..b2cfd9b874 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
@@ -41,7 +41,6 @@ inherit gettext autotools pkgconfig features_check systemd
 
 REQUIRED_DISTRO_FEATURES += "opengl"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "\
     --enable-libraries \
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb b/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
index 58214ea59c..411f8a7610 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
 SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https"
 SRCREV = "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
index dad8e8e8e2..26c80195b0 100644
--- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
+++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=ma
 
 SRCREV  = "e0760b2e9657907e691be4df384ca7617109635d"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb b/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
index 829e9588c8..e1a6af622b 100644
--- a/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
+++ b/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
@@ -8,7 +8,6 @@ SRC_URI = " \
     file://0001-reproducibility-Prevent-configuration-from-reading-h.patch \
 "
 SRCREV = "adfdf1656f23e5ab3b52c7d7edf91249a4477e8d"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
index e1f6c558df..da710eaedb 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=main
            "
 
 SRCREV = "49d6dcfc71ca421100fcf325e31625817c469fc9"
-S = "${WORKDIR}/git"
 
 inherit cmake python3targetconfig
 
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
index f2dbe4029b..7c596371e5 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz"
 SRC_URI[sha256sum] = "68406329827b783d0a8959cc20a94c6e1791ac861a27f854e06e9020541816dd"
 
 # hardcoded here for use in dialog-static recipe
-S = "${WORKDIR}/dialog-${PV}"
+S = "${UNPACKDIR}/dialog-${PV}"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
index 888289b357..8b48d20aac 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
            "
 SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \
  dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index ec0b4da935..71305cc35f 100644
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -20,7 +20,6 @@ SRC_URI = "\
     git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
index 310081b822..ad2aee4570 100644
--- a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
+++ b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c"
 
 SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf"
 SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
index 82f8366aeb..c3a5a02a3f 100644
--- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
+++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
@@ -16,7 +16,6 @@ inherit cmake
 
 DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON"
 
diff --git a/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-oe/recipes-extended/figlet/figlet_git.bb
index 9789ac16d4..d226806050 100644
--- a/meta-oe/recipes-extended/figlet/figlet_git.bb
+++ b/meta-oe/recipes-extended/figlet/figlet_git.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857"
 SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \
            file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch"
 SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3"
-S = "${WORKDIR}/git"
 PV = "2.2.5+git"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
index 5dfba25140..df7a4e2758 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=
 
 SRCREV = "05abdd7421688be5835a6b12f2b068086c38d4aa"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
index 6696d8347b..f99c8ac36a 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
 
 SRCREV = "1440f4faa67ebf69c7559f31d2cab59e6ec6fe2b"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd
 
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
index 4d82abc783..05e4fd937f 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
@@ -32,7 +32,6 @@ SRC_URI:append:libc-musl = "\
 # prefix tag with "v" to avoid upgrade to random tags like "20220215"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "\
     aws \
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
index 7dcc36080a..69de5628c4 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRCREV = "0ef7dd915ee8be4ca2bb10b5cc2bee92b8ede61d"
 SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \
 "
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases"
 
diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
index d2b23b41b4..2299d55b2b 100644
--- a/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
+++ b/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \
 
 SRCREV = "eab92dcaa34b66bc5182772afc9fda4ac8a27597"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep update-alternatives
 
diff --git a/meta-oe/recipes-extended/highway/highway_1.2.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
index e7dfc706bd..ea38310398 100644
--- a/meta-oe/recipes-extended/highway/highway_1.2.0.bb
+++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master \
            file://0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch"
 
 SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48"
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
 
diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
index dfabbb91a6..8678447cf5 100644
--- a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
+++ b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
     "
 SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
index 9bb2e2f1f3..af9fbda9b8 100644
--- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
+++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
 
 SRC_URI = "file://inputattach.conf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-extended/iotop/iotop_1.30.bb b/meta-oe/recipes-extended/iotop/iotop_1.30.bb
index 7d04a3b17b..9fe774f9f2 100644
--- a/meta-oe/recipes-extended/iotop/iotop_1.30.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_1.30.bb
@@ -7,7 +7,6 @@ DEPENDS = "ncurses"
 SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https;tag=v${PV}"
 SRCREV = "c3366a8a235f9c8ddc4797625f22cfdf12ba2c36"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
index 87fcf8cc61..fc94d2caab 100644
--- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
+++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master;protocol=htt
            file://0002-fix-parallel-error.patch \
 "
 
-S = "${WORKDIR}/git"
 inherit python3native
 
 EXTRA_OEMAKE += " \
diff --git a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
index bfa0e79d8f..7129d6ef8c 100644
--- a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
+++ b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
@@ -7,7 +7,6 @@ PV = "2.3.6+git"
 SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=https;branch=master"
 SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545"
 
-S = "${WORKDIR}/git"
 
 do_compile() {
         oe_runmake
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
index bd3a8f2ff5..f3f70b8da3 100644
--- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=http
            "
 
 SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7"
-S = "${WORKDIR}/git"
 
 inherit cmake python3-dir
 
diff --git a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
index 0c2382fe85..6ca8569bc5 100644
--- a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
+++ b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
@@ -16,7 +16,6 @@ SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613"
 # The current PV is not a git tag but a README content
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
index b98942379e..37c514a219 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.2.x-branch;pro
            file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \
            "
 SRCREV = "b829b60d9ff049abb190f09a3b9a5fac648cd5a3"
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
diff --git a/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb b/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
index 4c5eb8a640..60c3c6fadd 100755
--- a/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
+++ b/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071"
 SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master"
 SRCREV = "ae000f44e8d2a69e1f72a738f7c0b6b4b7cc4fbf"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
index 532179a9bb..2def38d73f 100644
--- a/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
+++ b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https
            file://0001-Enhance-reproducibility.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
index e3de8aca62..6683c396e2 100644
--- a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
+++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master
     file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d"
 
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
index 87778c6314..9f4b2a19d0 100644
--- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
+++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
@@ -14,6 +14,5 @@ SRCREV = "db9371cf9f38b5a3b2f6e4fae3f92eb052d2d929"
 SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \
           "
 
-S = "${WORKDIR}/git"
 
 
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
index 7278299a08..7f01962a97 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
@@ -11,7 +11,6 @@ inherit autotools pkgconfig python3native python3targetconfig
 SRCREV = "2117b8fdb6b4096455bd2041a63e59a028120136"
 SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
 CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
index bfd4af053c..e29ec88e06 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
@@ -13,7 +13,6 @@ PV = "2.3.0+git"
 SRCREV = "2cd858c679d25633077ca78b67182a9b77653816"
 SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
 CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
index 5a7548a7e6..7869fc1941 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
@@ -11,6 +11,5 @@ PKGV = "${GITPKGVTAG}"
 SRCREV = "adf9c22b9010490e4b55eaeb14731991db1c172c"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${base_libdir}/udev/rules.d/"
diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
index b9f5c34094..76759fe69d 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
@@ -12,6 +12,5 @@ PV = "2.0.2+git"
 SRCREV = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${base_libdir}/udev/rules.d/"
diff --git a/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
index e3e4c01acb..8021d8cf06 100644
--- a/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
+++ b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
@@ -14,7 +14,6 @@ SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \
            file://0001-respect-environment-variables.patch \
           "
 
-S = "${WORKDIR}/git"
 
 do_configure () {
         :
diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
index 1d650ac63b..c310e0f527 100644
--- a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
+++ b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
@@ -12,4 +12,3 @@ SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;branch=ma
           "
 SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
index b094337e90..99f23fef05 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
@@ -17,7 +17,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17.orig.tar.gz \
 SRC_URI[sha256sum] = "6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e"
 SRC_URI[1.17-1.sha256sum] = "e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673"
 
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 
 inherit autotools-brokensep
 
diff --git a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
index 0cc128c8c4..89670d10ca 100644
--- a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
+++ b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/rsyslog/liblognorm;branch=master;protocol=https \
            "
 SRCREV = "46c6ee4c8e5f827893e485a4ef1aff04ea881273"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
index 80644b0833..ffbb3a8c8e 100644
--- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "git://github.com/stephane/libmodbus;branch=master;protocol=https"
 SRCREV = "5190e5e141780ae481f24be16d7b39a5f3ad8f8f"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
index f08fea7de3..7ec01ecd3f 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=htt
 "
 SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gettext setuptools3-base
 
diff --git a/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb b/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
index 28c64a1614..ba10f062ec 100644
--- a/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
+++ b/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
@@ -21,7 +21,6 @@ SRCREV = "f6bb06a699617d078fcd4f8b71b4d063bf47b52b"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
index 6e6c8cc226..d7e88f4fd0 100644
--- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
+++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
@@ -11,7 +11,6 @@ PV .= "+0.2.2+git"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 PACKAGES += "${PN}-tools"
 
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
index 7a82f6b4b6..c5411d53a1 100644
--- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
@@ -19,7 +19,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "git://github.com/caolanm/libwmf.git;protocol=https;branch=master"
 SRCREV = "9e4737f2293c0d127bda92e5b01896df10571424"
 
-S = "${WORKDIR}/git"
 
 do_install:append() {
     sed -i -e 's@${RECIPE_SYSROOT}@@g' ${D}${bindir}/libwmf-config ${D}${libdir}/pkgconfig/libwmf.pc
diff --git a/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb b/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
index ea51f6cb14..7fff0b96a1 100644
--- a/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
+++ b/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https;tag=
            file://run-ptest \
            "
 
-S = "${WORKDIR}/git"
 
 # Main dependencies
 inherit cmake pkgconfig lib_package ptest multilib_header
diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
index 53023b99a0..4911cebd16 100644
--- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
+++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
@@ -21,7 +21,7 @@ SRC_URI = "\
 
 SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547"
 
-S = "${WORKDIR}/linuxconsoletools-${PV}"
+S = "${UNPACKDIR}/linuxconsoletools-${PV}"
 
 inherit systemd pkgconfig
 
diff --git a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
index 4557ed0a80..6d5399c8d0 100644
--- a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
+++ b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
@@ -17,7 +17,6 @@ SRC_URI = " \
 "
 
 SRCREV = "e046b69a3736d314fad813e159b1c192eaef92cd"
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-extended/md5deep/md5deep_git.bb b/meta-oe/recipes-extended/md5deep/md5deep_git.bb
index 5351a37db6..4b7192290e 100644
--- a/meta-oe/recipes-extended/md5deep/md5deep_git.bb
+++ b/meta-oe/recipes-extended/md5deep/md5deep_git.bb
@@ -13,6 +13,5 @@ SRC_URI = "git://github.com/jessek/hashdeep.git;branch=master;protocol=https \
            file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
index 44daf94c98..ab08322805 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
@@ -58,7 +58,6 @@ SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765
 # libsodium: 1.0.19
 SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea"
 
-S = "${UNPACKDIR}/git"
 
 inherit pkgconfig cmake systemd
 
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
index c3804ec64d..ceb81d07e5 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
@@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d
 UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/firefox-${PV}"
+S = "${UNPACKDIR}/firefox-${PV}"
 
 inherit pkgconfig perlnative python3native rust cargo
 
diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb
index df487bd769..b53be9803e 100644
--- a/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
            file://0002-gpio-Include-limits.h-for-PATH_MAX.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # CMakeLists.txt checks the architecture, only x86 and ARM supported for now
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
diff --git a/meta-oe/recipes-extended/nana/nana_git.bb b/meta-oe/recipes-extended/nana/nana_git.bb
index d292bb8827..bad5a797a7 100644
--- a/meta-oe/recipes-extended/nana/nana_git.bb
+++ b/meta-oe/recipes-extended/nana/nana_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/pjmaker/nana;protocol=https;branch=master \
     file://0001-Makefile.am-fix-build-with-separate-build-dir.patch \
     file://0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch \
 "
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-2-Clause"
 
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb
index e6e1f9a3b2..b003b52d25 100644
--- a/meta-oe/recipes-extended/networking/mstpd_git.bb
+++ b/meta-oe/recipes-extended/networking/mstpd_git.bb
@@ -9,7 +9,6 @@ SRC_URI = " \
     file://mstpd.service \
 "
 SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
 
diff --git a/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb b/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
index aa6b120037..18a45a3342 100644
--- a/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
+++ b/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
@@ -24,7 +24,7 @@ SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
 
 SRC_URI[sha256sum] = "ef0ca9ee27850d1a5c863bb7ff9aa08096c9ed312ece9087b30f3a426828de82"
 
-S = "${WORKDIR}/newt-${PV}"
+S = "${UNPACKDIR}/newt-${PV}"
 
 inherit autotools-brokensep python3native python3-dir python3targetconfig
 
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
index d8dda6d090..970d7fb5fc 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
@@ -24,7 +24,6 @@ SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \
            file://0001-Link-with-libm-for-floor-function.patch \
            "
 
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba"
diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.10.bb b/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
index 0667fd670f..c33624987a 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
@@ -24,7 +24,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \
            "
 SRC_URI[sha256sum] = "54e3387dee1ff16031a0679aca2b60da90ab7f4a26c211822333c7f23000abee"
 
-S = "${WORKDIR}/libostree-${PV}"
+S = "${UNPACKDIR}/libostree-${PV}"
 
 inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd
 
diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb
index dc7280f099..e69d544b66 100644
--- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb
+++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb
@@ -9,7 +9,6 @@ PV = "2.1.0.1+git"
 SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https"
 SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
index 1637389dba..ab5a8ef342 100644
--- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
+++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https \
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
index d5137f80af..2886137b7d 100644
--- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
+++ b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
@@ -13,7 +13,6 @@ REQUIRED_DISTRO_FEATURES = "pam"
 SRCREV = "3e026863cad1fd45c760ee1bc93ef4f0606cc852"
 SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 do_install () {
     oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security
diff --git a/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb b/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
index 6633656cea..0e2199b066 100644
--- a/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
+++ b/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
 SRC_URI = "git://github.com/FreeRADIUS/pam_radius.git;protocol=https;branch=master"
 SRCREV = "b6442c3e0147f1019990520483fa3a30e4ccf059"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "libpam"
 
diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
index 609d2902c0..d14a20609a 100644
--- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
+++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
@@ -25,7 +25,7 @@ RDEPENDS:${PN} += "openssh-misc"
 
 # Kind of unfortunate to have underscores in the name.
 #
-S = "${WORKDIR}/pam_ssh_agent_auth-${PV}"
+S = "${UNPACKDIR}/pam_ssh_agent_auth-${PV}"
 
 inherit autotools-brokensep perlnative
 
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
index 917cc694c7..4d540d0180 100644
--- a/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
+++ b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
@@ -12,7 +12,6 @@ SRCREV = "be527327653e94b02e711f7eff59285ad13e1db0"
 
 inherit cmake ptest
 
-S = "${WORKDIR}/git"
 
 do_install_ptest () {
     install -d ${D}${PTEST_PATH}/src/test/pegtl/data
diff --git a/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb b/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
index eeb314fdd4..367aedd4c5 100644
--- a/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
+++ b/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
@@ -14,7 +14,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/M/MJ/MJP/File-FnMatch-${PV}.tar.
 
 SRC_URI[sha256sum] = "962454b8e86bea8b132bf8af35757d0c6a8f5d599015bd6a5d68cb7ae7a9e916"
 
-S = "${WORKDIR}/File-FnMatch-${PV}"
+S = "${UNPACKDIR}/File-FnMatch-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb b/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
index 7baa7945b5..5aba331acc 100644
--- a/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
+++ b/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
@@ -9,7 +9,6 @@ DEPENDS = "ndctl"
 # Required to have the fts.h header for musl
 DEPENDS:append:libc-musl = " fts"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https"
 SRCREV = "0f0ab391d8e3db52f745f33c92b9d9a462bb3695"
diff --git a/meta-oe/recipes-extended/polkit/polkit_126.bb b/meta-oe/recipes-extended/polkit/polkit_126.bb
index c503ca9dc4..0438c4e464 100644
--- a/meta-oe/recipes-extended/polkit/polkit_126.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_126.bb
@@ -7,7 +7,6 @@ BUGTRACKER = "https://github.com/polkit-org/polkit/issues"
 
 SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 SRCREV = "d627b0d1e1108563658dabe3fb8d2a065e64df10"
 
 DEPENDS = "expat glib-2.0 duktape"
diff --git a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
index 029ec2337e..20b7f0a5bd 100644
--- a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
+++ b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
     echo " " > ${S}/tests/CMakeLists.txt
diff --git a/meta-oe/recipes-extended/qad/qad_git.bb b/meta-oe/recipes-extended/qad/qad_git.bb
index c68469fce5..189d2f9d15 100644
--- a/meta-oe/recipes-extended/qad/qad_git.bb
+++ b/meta-oe/recipes-extended/qad/qad_git.bb
@@ -17,7 +17,6 @@ SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 PV = "0.0+git"
 
 DEPENDS = "cjson libmicrohttpd libdrm libpng"
diff --git a/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
index b04d8df131..00cae11c4e 100644
--- a/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
+++ b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master
 
 SRCREV = "4487f10e1bf258434fb8a39e4f59c29e31910ad0"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
index 2b09b6bcad..c7f320660f 100644
--- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
+++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
@@ -24,7 +24,7 @@ SRC_URI += "file://0001-rarpd.8-add-man-file.patch \
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://rarpd.c;md5=199b20b172ea93121bc613a9c77b6931"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
index 3e757e6037..d643c6f0b9 100644
--- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
+++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https
            file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch"
 SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
index 330647a210..69c281bd92 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
@@ -13,7 +13,6 @@ SRC_URI = "\
     git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cpan autotools-brokensep gettext pkgconfig python3native python3-dir systemd
 
diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb b/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
index 967018ca1f..f1235d7b96 100644
--- a/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https;branch=master
 
 SRCREV = "3a8402c1de7c7747c95229db26d8d32fb85a7a52"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "rsyslog:libfastjson"
 
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
index 343a2c2840..3ccb87a9c5 100644
--- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \
 
 SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "rsyslog:librelp"
 
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
index 8da180ac05..fe8592be39 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
            "
 SRCREV = "70c268a07273da78a4aadd14c40ffb75138ccebe"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 
diff --git a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
index 29b01d5bf4..03d8d4940c 100644
--- a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
+++ b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
@@ -9,7 +9,7 @@ SECTION = "Development/Libraries"
 
 DEPENDS = "cmpi-bindings"
 
-S = "${WORKDIR}/sblim-sfcCommon-${PV}"
+S = "${UNPACKDIR}/sblim-sfcCommon-${PV}"
 SRC_URI = "http://downloads.sourceforge.net/sblim/sblim-sfcCommon-${PV}.tar.bz2"
 SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297"
 
diff --git a/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-oe/recipes-extended/sedutil/sedutil_git.bb
index 64d5111f45..e8987b2dd0 100644
--- a/meta-oe/recipes-extended/sedutil/sedutil_git.bb
+++ b/meta-oe/recipes-extended/sedutil/sedutil_git.bb
@@ -14,6 +14,5 @@ SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;proto
            file://0001-Fix-build-on-big-endian-architectures.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
index 98e22f1164..1b3a484ccb 100644
--- a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
+++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.ta
            "
 SRC_URI[sha256sum] = "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbbd4a7363d990fc0270b"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE_GPL;md5=393a5ca445f6965873eca0259a17f833"
diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
index bc3bc3aa47..2a49ba99b0 100644
--- a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
+++ b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
@@ -15,7 +15,6 @@ SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \
 
 SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
index fa43c9de58..530e38ce21 100644
--- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
+++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit module
 
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
index 63c1e130ad..5dc41bcb93 100644
--- a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
+++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master \
 
 SRCREV = "01083a64ebf28cc716efe2d2fd51c141042ae34b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig update-alternatives
 
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
index 6989531c81..b92b8086d6 100644
--- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
+++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=https;branch
 
 inherit update-alternatives
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
index f45c2d750d..535f37f84c 100644
--- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
@@ -9,7 +9,6 @@ SRCREV = "077def398ad303043d73339112968e5112d8d7c8"
 
 SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/socketcand_git.bb b/meta-oe/recipes-extended/socketcan/socketcand_git.bb
index 4e58c76460..ba69875c93 100644
--- a/meta-oe/recipes-extended/socketcan/socketcand_git.bb
+++ b/meta-oe/recipes-extended/socketcan/socketcand_git.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = " \
 
 SRC_URI = "git://github.com/linux-can/socketcand;branch=master;protocol=https"
 SRCREV = "998b0394d028e791aa97d549bfc686b4fbadf5ee"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
index 9b95c14de0..b60f9c643c 100644
--- a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
+++ b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
@@ -23,7 +23,7 @@ DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp \
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \
-           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=git/falcosecurity-libs \
+           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \
            file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \
            file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \
            file://0001-libsinsp-fix-build-with-gcc-15.patch;patchdir=./falcosecurity-libs \
@@ -33,7 +33,6 @@ SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
 
 SRCREV_FORMAT = "sysdig_falco"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "\
                 -DBUILD_DRIVER=OFF \
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
index 71b62cc513..a4bf3eaaca 100644
--- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
+++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
@@ -18,7 +18,6 @@ DEPENDS += "libdaemon"
 
 RDEPENDS:${PN} = "iproute2-tipc"
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
     ( cd ${S}; ${S}/bootstrap )
diff --git a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
index 4e66d8d05a..5fb28b0085 100644
--- a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
+++ b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
@@ -12,6 +12,5 @@ SRC_URI = "\
 
 SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
index 5eb8e4d9aa..1a453ebe10 100644
--- a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
+++ b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
@@ -9,7 +9,6 @@ SRCREV = "44a173195986d0d853316cb02a58785ded66c12b"
 PV = "0.5.0+git"
 SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig perlnative update-rc.d systemd
 
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
index 09797124c5..0e189b558f 100644
--- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cd
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/user-mode-linux/files/tools/1/"
 
-S = "${WORKDIR}/tools"
+S = "${UNPACKDIR}/tools"
 
 inherit update-alternatives
 
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 3aa766d0bd..616f4ca09a 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
 
 SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch "
 
-S = "${WORKDIR}/git"
 
 # Depends on mraa which only supports x86 and ARM for now
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
index 1686e533af..35b3d3c4a7 100644
--- a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
+++ b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
@@ -19,7 +19,6 @@ SRC_URI = " \
 "
 SRCREV = "fcd8bc3ee40f5d7841b7d5a8f3cd12252fec14e4"
 
-S = "${WORKDIR}/git"
 
 RPROVIDES:${PN} = "virtual-redis"
 
diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
index 92a9bbb499..01215a4b25 100644
--- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
+++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \
 SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd77309b"
 
 SRCNAME = "volume_key"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools python3native python3targetconfig gettext pkgconfig
 
diff --git a/meta-oe/recipes-extended/wipe/wipe_0.24.bb b/meta-oe/recipes-extended/wipe/wipe_0.24.bb
index ad32cb0e72..ba3ed29d59 100644
--- a/meta-oe/recipes-extended/wipe/wipe_0.24.bb
+++ b/meta-oe/recipes-extended/wipe/wipe_0.24.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/berke/wipe.git;branch=master;protocol=https \
 "
 SRCREV = "796b62293e007546e051619bd03f5ba338ef28e5"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "linux"
 
diff --git a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
index d4a8b49e1d..b901e8815a 100644
--- a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
+++ b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
@@ -10,7 +10,6 @@ SRCREV = "493e9704dbc50f141d5fbd41c823311e79d7e8d3"
 SRC_URI = "git://github.com/thkukuk/wtmpdb.git;branch=main;protocol=https \
            file://0001-include-libgen.h-for-basename.patch"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd features_check
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
index 1ef707ca60..2cd154cab6 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
@@ -28,7 +28,6 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https
            file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
            "
 SRCREV = "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
index b75802f09f..f450c2cf01 100644
--- a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
+++ b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRCREV = "dc2c284664757fce6ef8f96f8b3ab667a53ef489"
 SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb
index e4522f89a1..2c894c0230 100644
--- a/meta-oe/recipes-extended/zram/zram_0.2.bb
+++ b/meta-oe/recipes-extended/zram/zram_0.2.bb
@@ -17,8 +17,7 @@ SRC_URI = " \
            file://dev-zram0.swap \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install () {
     # Install systemd related configuration file
diff --git a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
index be658561e2..5227b834f9 100644
--- a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
+++ b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 AUTOTOOLS_SCRIPT_PATH = "${S}/src"
 
 BBCLASSEXTEND = "native nativesdk"