Skip to contentSkip to conversation

bitbake.conf: set BB_GIT_DEFAULT_DESTSUFFIX to match default S value

RFC PATCH In review Alexander Kanavin 6 participants 23 messages Jun 10, 2025 – Jun 13, 2025 1 message not in the archive Zstd

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/9 bitbake.conf: set BB_GIT_DEFAULT_DESTSUFFIX to match default S value

From: Alexander Kanavin <[email protected]>

This allows removing all the S = ${WORKDIR}/git assignments.

A few recipes are setting S to a sub-directory of the git tree and need to be adjusted accordingly.

bzip2 recipe is fetching a tarball and separately cloning tests; adjust the recipe to put the latter into 'bzip2-tests', instead of 'git'.

devupstream.bbclass no longer needs to rewrite S, and is adjusted accordingly.

Adjust scripts/lib/recipetool/append.py to not hardcode 'git' as unpack destination.

Adjust kernel-yocto.bbclass to use the git unpack variable instead of hardcoding 'git' (there's also removal of repetition of string constants and a correction of workdir/unpackdir mismatch in one of the if-else branches).

Ensure build-appliance-image recipe does not use 'git' as checkout directory for poky repo, but rather explicitly name it 'poky'.

Ensure reproducible.py code that looks for git repositories does not hardcode 'git' but uses the destination set by BB_GIT_DEFAULT_DESTSUFFIX.

Ensure recipetool does not write out unneeded S settings into newly created recipes that fetch from git.

Adjust selftest to not hardcode 'git' as unpack directory.

---
 .../mtd/mtd-utils-selftest_git.bb             |  1 -
 .../python/python3-guessing-game_git.bb       |  1 -
 .../python3-guessing-game_git.bb.upgraded     |  1 -
 .../rust/rust-c-lib-example-bin_git.bb        |  1 -
 .../rust/rust-c-lib-example_git.bb            |  1 -
 .../sysdig/sysdig-selftest_0.28.0.bb          |  3 +--
 .../devtool/devtool-upgrade-test2_git.bb      |  1 -
 .../devtool-upgrade-test2_git.bb.upgraded     |  1 -
 .../git-submodule-test/git-submodule-test.bb  |  1 -
 .../recipes-test/gitrepotest/gitrepotest.bb   |  1 -
 .../gitunpackoffline/gitunpackoffline.inc     |  1 -
 meta/classes-recipe/devupstream.bbclass       |  6 -----
 meta/classes-recipe/kernel-yocto.bbclass      | 16 ++++++------
 meta/conf/bitbake.conf                        |  1 +
 meta/lib/oe/reproducible.py                   |  5 ++--
 meta/lib/oeqa/selftest/cases/devtool.py       | 10 +++----
 meta/lib/oeqa/selftest/cases/recipetool.py    |  2 +-
 meta/recipes-bsp/efibootmgr/efibootmgr_18.bb  |  1 -
 meta/recipes-bsp/efivar/efivar_39.bb          |  1 -
 meta/recipes-bsp/gnu-efi/gnu-efi_4.0.1.bb     |  1 -
 meta/recipes-bsp/opensbi/opensbi_1.6.bb       |  1 -
 meta/recipes-bsp/u-boot/libubootenv_0.3.6.bb  |  1 -
 meta/recipes-bsp/u-boot/u-boot-common.inc     |  1 -
 .../avahi/avahi-libnss-mdns_0.15.1.bb         |  1 -
 .../connman/connman-gnome_0.7.bb              |  1 -
 .../dhcpcd/dhcpcd_10.2.4.bb                   |  1 -
 .../libuv/libuv_1.51.0.bb                     |  1 -
 ...mobile-broadband-provider-info_20240407.bb |  2 --
 meta/recipes-connectivity/neard/neard_0.19.bb |  1 -
 .../resolvconf/resolvconf_1.93.bb             |  1 -
 .../slirp/libslirp_4.9.1.bb                   |  1 -
 meta/recipes-core/dbus-wait/dbus-wait_git.bb  |  1 -
 meta/recipes-core/fts/fts_1.2.7.bb            |  1 -
 .../glibc/cross-localedef-native_2.41.bb      |  3 +--
 meta/recipes-core/glibc/glibc_2.41.bb         |  1 -
 meta/recipes-core/ifupdown/ifupdown_0.8.44.bb |  1 -
 .../images/build-appliance-image_15.0.0.bb    |  8 +++---
 .../initscripts/init-system-helpers_1.68.bb   |  1 -
 meta/recipes-core/libxcrypt/libxcrypt.inc     |  1 -
 meta/recipes-core/musl/gcompat_git.bb         |  1 -
 meta/recipes-core/musl/libc-test_git.bb       |  1 -
 meta/recipes-core/musl/libucontext_1.3.2.bb   |  1 -
 meta/recipes-core/musl/musl-locales_git.bb    |  1 -
 meta/recipes-core/musl/musl-obstack.bb        |  1 -
 meta/recipes-core/musl/musl-utils.bb          |  1 -
 meta/recipes-core/musl/musl_git.bb            |  1 -
 meta/recipes-core/ncurses/ncurses_6.5.bb      |  1 -
 meta/recipes-core/newlib/newlib.inc           |  1 -
 meta/recipes-core/ovmf/ovmf_git.bb            |  1 -
 meta/recipes-core/picolibc/picolibc.inc       |  1 -
 meta/recipes-core/psplash/psplash_git.bb      |  1 -
 meta/recipes-core/seatd/seatd_0.9.1.bb        |  1 -
 .../sysfsutils/sysfsutils_2.1.1.bb            |  1 -
 meta/recipes-core/systemd/systemd.inc         |  1 -
 meta/recipes-core/ttyrun/ttyrun_2.37.0.bb     |  1 -
 .../update-rc.d/update-rc.d_0.8.bb            |  1 -
 .../bindgen-cli/bindgen-cli_0.71.1.bb         |  1 -
 .../binutils/binutils-2.44.inc                |  1 -
 .../bootchart2/bootchart2_0.14.9.bb           |  1 -
 .../btrfs-tools/btrfs-tools_6.14.bb           |  1 -
 .../createrepo-c/createrepo-c_1.2.1.bb        |  1 -
 meta/recipes-devtools/distcc/distcc_3.4.bb    |  1 -
 meta/recipes-devtools/dnf/dnf_4.22.0.bb       |  1 -
 meta/recipes-devtools/dpkg/dpkg_1.22.11.bb    |  1 -
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |  1 -
 .../erofs-utils/erofs-utils_1.8.5.bb          |  1 -
 .../fastfloat/fastfloat_8.0.2.bb              |  1 -
 meta/recipes-devtools/file/file_5.46.bb       |  1 -
 meta/recipes-devtools/fmt/fmt_11.2.0.bb       |  1 -
 .../gnu-config/gnu-config_git.bb              |  1 -
 .../libcomps/libcomps_0.1.21.bb               |  1 -
 meta/recipes-devtools/libdnf/libdnf_0.74.0.bb |  1 -
 .../libmodulemd/libmodulemd_2.15.1.bb         |  1 -
 .../librepo/librepo_1.19.0.bb                 |  1 -
 meta/recipes-devtools/mmc/mmc-utils_git.bb    |  1 -
 meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb  |  1 -
 meta/recipes-devtools/ninja/ninja_1.12.1.bb   |  1 -
 .../opkg-utils/opkg-utils_0.7.0.bb            |  1 -
 .../patchelf/patchelf_0.18.0.bb               |  1 -
 .../pkgconfig/pkgconfig_git.bb                |  1 -
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  5 ++--
 .../python/python3-calver_2025.04.17.bb       |  1 -
 .../python/python3-dtc_1.7.2.bb               |  1 -
 .../python/python3-pefile_2024.8.26.bb        |  1 -
 .../python3-unittest-automake-output_0.2.bb   |  1 -
 meta/recipes-devtools/repo/repo_2.55.bb       |  1 -
 .../rpm-sequoia-crypto-policy_git.bb          |  1 -
 .../rpm-sequoia/rpm-sequoia_1.7.0.bb          |  1 -
 meta/recipes-devtools/rpm/rpm_4.20.1.bb       |  1 -
 .../squashfs-tools/squashfs-tools_git.bb      |  1 -
 .../systemd-bootchart_235.bb                  |  1 -
 .../tcf-agent/tcf-agent_1.8.0.bb              |  2 +-
 meta/recipes-devtools/unfs3/unfs3_0.11.0.bb   |  1 -
 meta/recipes-devtools/xmlto/xmlto_0.0.29.bb   |  1 -
 .../acpica/acpica_20240827.bb                 |  1 -
 .../asciidoc/asciidoc_10.2.1.bb               |  1 -
 .../baremetal-helloworld_git.bb               |  1 -
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb    | 26 +++++++++----------
 .../cracklib/cracklib_2.10.3.bb               |  2 +-
 .../iputils/iputils_20250605.bb               |  1 -
 .../recipes-extended/libaio/libaio_0.3.113.bb |  1 -
 meta/recipes-extended/libnsl/libnsl2_2.0.1.bb |  1 -
 .../recipes-extended/libnss-nis/libnss-nis.bb |  1 -
 .../libsolv/libsolv_0.7.32.bb                 |  1 -
 meta/recipes-extended/lsof/lsof_4.99.4.bb     |  1 -
 meta/recipes-extended/ltp/ltp_20250130.bb     |  1 -
 meta/recipes-extended/mdadm/mdadm_4.4.bb      |  1 -
 .../net-tools/net-tools_2.10.bb               |  1 -
 meta/recipes-extended/procps/procps_4.0.5.bb  |  1 -
 meta/recipes-extended/psmisc/psmisc_23.7.bb   |  1 -
 .../rpcsvc-proto/rpcsvc-proto.bb              |  1 -
 meta/recipes-extended/scdoc/scdoc_1.11.3.bb   |  1 -
 .../stress-ng/stress-ng_0.18.12.bb            |  1 -
 .../sysklogd/sysklogd_2.7.2.bb                |  1 -
 .../sysstat/sysstat_12.7.7.bb                 |  1 -
 .../xinetd/xinetd_2.3.15.4.bb                 |  1 -
 meta/recipes-extended/zstd/zstd_1.5.7.bb      |  1 -
 .../gi-docgen/gi-docgen_2025.3.bb             |  1 -
 meta/recipes-gnome/libhandy/libhandy_1.8.3.bb |  1 -
 .../libportal/libportal_0.9.1.bb              |  1 -
 meta/recipes-gnome/libxmlb/libxmlb_0.3.22.bb  |  1 -
 .../glslang/glslang_1.4.313.0.bb              |  1 -
 .../igt-gpu-tools/igt-gpu-tools_1.30.bb       |  1 -
 meta/recipes-graphics/kmscube/kmscube_git.bb  |  1 -
 .../libepoxy/libepoxy_1.5.10.bb               |  1 -
 .../libfakekey/libfakekey_git.bb              |  1 -
 .../libmatchbox/libmatchbox_1.14.bb           |  1 -
 .../libva/libva-utils_2.22.0.bb               |  1 -
 .../matchbox-wm/matchbox-wm_1.2.3.bb          |  1 -
 meta/recipes-graphics/piglit/piglit_git.bb    |  1 -
 .../shaderc/shaderc_2025.2.bb                 |  1 -
 .../spir/spirv-headers_1.4.313.0.bb           |  1 -
 .../spir/spirv-llvm-translator_20.1.2.bb      |  1 -
 .../spir/spirv-tools_1.4.313.0.bb             |  1 -
 .../virglrenderer/virglrenderer_1.1.0.bb      |  1 -
 .../vulkan/vulkan-headers_1.4.313.0.bb        |  1 -
 .../vulkan/vulkan-loader_1.4.313.0.bb         |  1 -
 .../vulkan/vulkan-samples_git.bb              |  1 -
 .../vulkan/vulkan-tools_1.4.313.0.bb          |  1 -
 .../vulkan-utility-libraries_1.4.313.0.bb     |  1 -
 .../vulkan-validation-layers_1.4.313.0.bb     |  1 -
 .../vulkan/vulkan-volk_1.4.313.0.bb           |  1 -
 meta/recipes-graphics/waffle/waffle_1.8.1.bb  |  1 -
 .../wayland/libinput_1.28.1.bb                |  1 -
 .../xcursor-transparent-theme_git.bb          |  1 -
 .../xinput-calibrator_0.8.0.bb                |  1 -
 .../xorg-driver/xf86-video-intel_git.bb       |  1 -
 .../xorg-lib/libxcvt_0.1.3.bb                 |  1 -
 .../xorg-lib/libxkbcommon_1.10.0.bb           |  1 -
 .../recipes-kernel/blktrace/blktrace_1.3.0.bb |  2 --
 meta/recipes-kernel/cryptodev/cryptodev.inc   |  1 -
 meta/recipes-kernel/dtc/dtc_1.7.2.bb          |  1 -
 .../kern-tools/kern-tools-native_git.bb       |  1 -
 .../libtraceevent/libtraceevent_1.8.4.bb      |  1 -
 .../recipes-kernel/lttng/babeltrace2_2.1.1.bb |  1 -
 .../recipes-kernel/lttng/babeltrace_1.5.11.bb |  1 -
 .../makedumpfile/makedumpfile_1.7.7.bb        |  1 -
 meta/recipes-kernel/powertop/powertop_2.15.bb |  1 -
 .../systemtap/systemtap_git.inc               |  1 -
 .../gstreamer/gst-examples_1.26.2.bb          |  2 +-
 meta/recipes-multimedia/x264/x264_git.bb      |  1 -
 meta/recipes-rt/rt-tests/rt-tests.inc         |  1 -
 meta/recipes-sato/l3afpad/l3afpad_git.bb      |  1 -
 .../matchbox-config-gtk_0.2.bb                |  1 -
 .../matchbox-desktop/matchbox-desktop_2.3.bb  |  1 -
 .../matchbox-keyboard_0.1.1.bb                |  1 -
 .../matchbox-panel-2/matchbox-panel-2_2.12.bb |  1 -
 .../matchbox-terminal_0.2.bb                  |  1 -
 .../matchbox-theme-sato_0.2.bb                |  1 -
 meta/recipes-sato/puzzles/puzzles_git.bb      |  1 -
 .../sato-icon-theme/sato-icon-theme_git.bb    |  1 -
 .../sato-screenshot/sato-screenshot_0.3.bb    |  1 -
 .../settings-daemon/settings-daemon_0.0.2.bb  |  1 -
 .../argp-standalone/argp-standalone_1.4.1.bb  |  1 -
 .../bmaptool/bmaptool_3.9.0.bb                |  1 -
 .../boost/boost-build-native_1.87.0.bb        |  1 -
 .../debianutils/debianutils_5.22.bb           |  1 -
 .../dos2unix/dos2unix_7.5.2.bb                |  2 +-
 .../gnome-desktop-testing_2021.1.bb           |  1 -
 meta/recipes-support/hwdata/hwdata_0.395.bb   |  1 -
 .../iso-codes/iso-codes_4.18.0.bb             |  1 -
 meta/recipes-support/libcap-ng/libcap-ng.inc  |  1 -
 .../libdisplay-info/libdisplay-info_0.2.0.bb  |  1 -
 meta/recipes-support/libgit2/libgit2_1.9.0.bb |  1 -
 .../libjitterentropy_3.6.3.bb                 |  1 -
 .../libproxy/libproxy_0.5.9.bb                |  1 -
 .../libseccomp/libseccomp_2.6.0.bb            |  1 -
 meta/recipes-support/lz4/lz4_1.10.0.bb        |  1 -
 .../recipes-support/numactl/numactl_2.0.19.bb |  1 -
 .../recipes-support/p11-kit/p11-kit_0.25.5.bb |  1 -
 .../ptest-runner/ptest-runner_2.4.5.1.bb      |  1 -
 .../rng-tools/rng-tools_6.17.bb               |  1 -
 meta/recipes-support/sass/libsass_3.6.6.bb    |  1 -
 meta/recipes-support/sass/sassc_3.6.2.bb      |  1 -
 .../shared-mime-info/shared-mime-info_2.4.bb  |  1 -
 meta/recipes-support/utfcpp/utfcpp_4.0.6.bb   |  1 -
 meta/recipes-support/vim/vim.inc              |  1 -
 meta/recipes-support/xxhash/xxhash_0.8.3.bb   |  1 -
 scripts/lib/recipetool/append.py              |  4 +--
 scripts/lib/recipetool/create.py              |  3 +--
 200 files changed, 46 insertions(+), 239 deletions(-)
meta-selftest/recipes-devtools/mtd/mtd-utils-selftest_git.bb +0 -1
index ca2141c9722..e87e8f15b3e 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
meta-selftest/recipes-devtools/python/python3-guessing-game_git.bb +0 -1
index 50246a8a118..b600c24daf4 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/guessing-game.git;protocol=https;branch=ma
 PV = "0.1.0"
 SRCREV = "469c9e2230ca4fa9e391c94be6e697733e769500"
 
-S = "${WORKDIR}/git"
 
 inherit python_maturin cargo-update-recipe-crates
 
meta-selftest/recipes-devtools/python/python3-guessing-game_git.bb.upgraded +0 -1
index f60a62718db..69339956cc9 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/guessing-game.git;protocol=https;branch=ma
 PV = "0.2.0"
 SRCREV = "40cf004c2772ffa20ea803fa3be1528a75be3e98"
 
-S = "${WORKDIR}/git"
 
 inherit python_maturin cargo-update-recipe-crates
 
meta-selftest/recipes-devtools/rust/rust-c-lib-example-bin_git.bb +0 -1
index 47d878597ad..890dbbbe8d1 100644
@@ -8,7 +8,6 @@ SRC_URI = " \
 "
 
 SRCREV = "fc53c457f69aa5221ec1f8619a007e8150db5e60"
-S = "${WORKDIR}/git"
 
 DEPENDS = "rust-c-lib-example"
 
meta-selftest/recipes-devtools/rust/rust-c-lib-example_git.bb +0 -1
index 6e7c250b92a..0217d1718fe 100644
@@ -8,7 +8,6 @@ SRC_URI = " \
 "
 
 SRCREV = "fc53c457f69aa5221ec1f8619a007e8150db5e60"
-S = "${WORKDIR}/git"
 
 inherit cargo_c
 
meta-selftest/recipes-extended/sysdig/sysdig-selftest_0.28.0.bb +1 -2
index 819f65409d6..fc5e0ee3eca 100644
@@ -23,7 +23,7 @@ JIT:powerpc64 = ""
 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://0055-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \
            file://0099-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \
            "
@@ -32,7 +32,6 @@ SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
 
 SRCREV_FORMAT = "sysdig_falco"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "\
                 -DBUILD_DRIVER=OFF \
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb +0 -1
index 2558a22ce57..24ca32f86f8 100644
@@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
-S = "${WORKDIR}/git"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded +0 -1
index eaa8bd898da..63bfed8a7af 100644
@@ -14,7 +14,6 @@ SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
-S = "${WORKDIR}/git"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb +0 -1
index 90d9b66b2c8..055657b239a 100644
@@ -10,7 +10,6 @@ UPSTREAM_VERSION_UNKNOWN = "1"
 SRC_URI = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master"
 SRCREV = "a2885dd7d25380d23627e7544b7bbb55014b16ee"
 
-S = "${WORKDIR}/git"
 
 do_test_git_as_user() {
     cd ${S}
meta-selftest/recipes-test/gitrepotest/gitrepotest.bb +0 -1
index c4806793eed..756c01cb099 100644
@@ -13,4 +13,3 @@ SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protoco
 
 SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7"
 
-S = "${WORKDIR}/git"
meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc +0 -1
index 602e895199b..59b383800cd 100644
@@ -13,4 +13,3 @@ SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}"
 SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7"
 SRCREV:gitunpack-enable-recipe = ""
 
-S = "${WORKDIR}/git"
meta/classes-recipe/devupstream.bbclass +0 -6
index d941763fb75..60026a527fc 100644
@@ -13,9 +13,6 @@
 # SRC_URI:class-devupstream = "git://git.example.com/example;branch=master"
 # SRCREV:class-devupstream = "abcdef"
 #
-# If the first entry in SRC_URI is a git: URL then S is rewritten to
-# WORKDIR/git.
-#
 # There are a few caveats that remain to be solved:
 # - You can't build native or nativesdk recipes using for example
 #   devupstream:native, you can only build target recipes.
@@ -39,9 +36,6 @@ python devupstream_virtclass_handler () {
     src_uri = d.getVar("SRC_URI:class-devupstream") or d.getVar("SRC_URI")
     uri = bb.fetch2.URI(src_uri.split()[0])
 
-    if uri.scheme == "git" and not d.getVar("S:class-devupstream"):
-        d.setVar("S", "${WORKDIR}/git")
-
     # Modify the PV if the recipe hasn't already overridden it
     pv = d.getVar("PV")
     proto_marker = "+" + uri.scheme
meta/classes-recipe/kernel-yocto.bbclass +8 -8
index ba93145fd3d..e53bf151941 100644
@@ -388,19 +388,19 @@ do_kernel_checkout() {
 	set +e
 
 	source_dir=`echo ${S} | sed 's%/$%%'`
-	source_workdir="${UNPACKDIR}/git"
-	if [ -d "${UNPACKDIR}/git/" ]; then
+	source_unpackdir="${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
+	if [ -d "${source_unpackdir}" ]; then
 		# case: git repository
-		# if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
-		if [ "${source_dir}" != "${source_workdir}" ]; then
-			if [ -d "${source_workdir}/.git" ]; then
+		# if S is UNPACKDIR/BB_GIT_DEFAULT_DESTSUFFIX, then we shouldn't be moving or deleting the tree.
+		if [ "${source_dir}" != "${source_unpackdir}" ]; then
+			if [ -d "${source_unpackdir}/.git" ]; then
 				# regular git repository with .git
 				rm -rf ${S}
-				mv ${UNPACKDIR}/git ${S}
+				mv ${source_unpackdir} ${S}
 			else
 				# create source for bare cloned git repository
-				git clone ${WORKDIR}/git ${S}
-				rm -rf ${UNPACKDIR}/git
+				git clone ${source_unpackdir} ${S}
+				rm -rf ${source_unpackdir}
 			fi
 		fi
 		cd ${S}
meta/conf/bitbake.conf +1 -0
index c515a07b6f4..4fa72b3d3ac 100644
@@ -408,6 +408,7 @@ STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
 BASE_WORKDIR ?= "${TMPDIR}/work"
 WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
 UNPACKDIR ??= "${WORKDIR}/sources-unpack"
+BB_GIT_DEFAULT_DESTSUFFIX = "${BP}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
 S = "${WORKDIR}/${BP}"
meta/lib/oe/reproducible.py +3 -2
index cdb38d5aa45..0270024a83f 100644
@@ -75,10 +75,11 @@ def get_source_date_epoch_from_known_files(d, sourcedir):
     return source_date_epoch
 
 def find_git_folder(d, sourcedir):
-    # First guess: UNPACKDIR/git
+    # First guess: UNPACKDIR/BB_GIT_DEFAULT_DESTSUFFIX
     # This is the default git fetcher unpack path
     unpackdir = d.getVar('UNPACKDIR')
-    gitpath = os.path.join(unpackdir, "git/.git")
+    default_destsuffix = d.getVar('BB_GIT_DEFAULT_DESTSUFFIX')
+    gitpath = os.path.join(unpackdir, default_destsuffix, ".git")
     if os.path.isdir(gitpath):
         return gitpath
 
meta/lib/oeqa/selftest/cases/devtool.py +5 -5
index 0155ee62ee0..f30dba5a469 100644
@@ -469,7 +469,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars = {}
         checkvars['LICENSE'] = 'GPL-2.0-only'
         checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '0.1+git'
         checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master'
         checkvars['SRCREV'] = srcrev
@@ -609,7 +609,7 @@ class DevtoolAddTests(DevtoolBase):
         recipefile = get_bb_var('FILE', testrecipe)
         self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '1.0+git'
         checkvars['SRC_URI'] = url_branch
         checkvars['SRCREV'] = '${AUTOREV}'
@@ -628,7 +628,7 @@ class DevtoolAddTests(DevtoolBase):
         recipefile = get_bb_var('FILE', testrecipe)
         self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '1.5+git'
         checkvars['SRC_URI'] = url_branch
         checkvars['SRCREV'] = checkrev
@@ -1627,9 +1627,9 @@ class DevtoolUpdateTests(DevtoolBase):
         # Check preconditions
         testrecipe = 'dos2unix'
         self.append_config('ERROR_QA:remove:pn-dos2unix = "patch-status"\n')
-        bb_vars = get_bb_vars(['SRC_URI', 'S', 'WORKDIR', 'FILE'], testrecipe)
+        bb_vars = get_bb_vars(['SRC_URI', 'S', 'WORKDIR', 'FILE', 'BB_GIT_DEFAULT_DESTSUFFIX'], testrecipe)
         self.assertIn('git://', bb_vars['SRC_URI'], 'This test expects the %s recipe to be a git recipe' % testrecipe)
-        workdir_git = '%s/git/' % bb_vars['WORKDIR']
+        workdir_git = '%s/%s/' % (bb_vars['WORKDIR'], bb_vars['BB_GIT_DEFAULT_DESTSUFFIX'])
         if not bb_vars['S'].startswith(workdir_git):
             self.fail('This test expects the %s recipe to be building from a subdirectory of the git repo' % testrecipe)
         subdir = bb_vars['S'].split(workdir_git, 1)[1]
meta/lib/oeqa/selftest/cases/recipetool.py +1 -1
index 36557f270fb..8cd639bd45b 100644
@@ -385,7 +385,7 @@ class RecipetoolCreateTests(RecipetoolBase):
         checkvars = {}
         checkvars['LICENSE'] = 'LGPL-2.1-only'
         checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34'
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '1.11+git'
         checkvars['SRC_URI'] = srcuri + ';branch=master'
         checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango'])
meta/recipes-bsp/efibootmgr/efibootmgr_18.bb +0 -1
index fbd2f5dbc83..444cd53fdd1 100644
@@ -13,7 +13,6 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https;branch=main"
 SRCREV = "c3f9f0534e32158f62c43564036878b93b9e0fd6"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
meta/recipes-bsp/efivar/efivar_39.bb +0 -1
index b052e3838fe..7c8e9ac43df 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=main;protocol=https \
            "
 SRCREV = "c47820c37ac26286559ec004de07d48d05f3308c"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
meta/recipes-bsp/gnu-efi/gnu-efi_4.0.1.bb +0 -1
index c93e06b96cf..d0be55559b9 100644
@@ -20,7 +20,6 @@ SRC_URI = "git://github.com/ncroxon/gnu-efi;protocol=https;branch=master \
            "
 SRCREV = "00cdfa66e923ab2f6683bb52cab0d0d1a9083b16"
 
-S = "${WORKDIR}/git"
 
 # llvm-objcopy fails
 # arm-poky-linux-gnueabi-llvm-objcopy: error: 't8.so': section '.dynstr' cannot be removed because it is referenced by the section '.dynamic'
meta/recipes-bsp/opensbi/opensbi_1.6.bb +0 -1
index c9dfcfbe4f1..308ac43ac85 100644
@@ -12,7 +12,6 @@ SRCREV = "bd613dd92113f683052acfb23d9dc8ba60029e0a"
 SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \
            file://0001-Makefile-Add-flag-for-reprodubility-compiler-flags.patch \
 "
-S = "${WORKDIR}/git"
 
 TARGET_DBGSRC_DIR = "/share/opensbi/*/generic/firmware/"
 
meta/recipes-bsp/u-boot/libubootenv_0.3.6.bb +0 -1
index 8c7a59ba963..ef74967b813 100644
@@ -13,7 +13,6 @@ SECTION = "libs"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https;branch=master"
 SRCREV = "5507339628b5caf244e1ff9d58cb3fa534b16beb"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
meta/recipes-bsp/u-boot/u-boot-common.inc +0 -1
index fd1eab5cdde..617f5a60bb8 100644
@@ -16,7 +16,6 @@ SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 inherit pkgconfig
meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb +0 -1
index 9b8275b1138..b37cd51ad19 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/lathiat/nss-mdns;branch=master;protocol=https \
 
 SRCREV = "4b3cfe818bf72d99a02b8ca8b8813cb2d6b40633"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +0 -1
index 46b3f854c52..ab691b6580e 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git;branch=master;protoco
            file://0001-Port-to-Gtk3.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gtk-icon-cache pkgconfig features_check
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb +0 -1
index dee921d21c4..bfb24aa58ce 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
            "
 
 SRCREV = "93df2b254caf9639f9ffb66e0fe2b584eeba6220"
-S = "${WORKDIR}/git"
 
 # Doesn't use automake so we can't do out-of-tree builds
 inherit pkgconfig autotools-brokensep systemd useradd
meta/recipes-connectivity/libuv/libuv_1.51.0.bb +0 -1
index 569bff14397..ea3a858da46 100644
@@ -10,7 +10,6 @@ SRCREV = "5152db2cbfeb5582e9c27c5ea1dba2cd9e10759b"
 SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https;tag=v${PV}"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb +0 -2
index e07b93d6955..2e8702a0452 100644
@@ -10,8 +10,6 @@ PE = "1"
 SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main"
 SRCREV = "55ba955d53305df96123534488fd160ea882b4dd"
 
-S = "${WORKDIR}/git"
-
 inherit meson
 
 DEPENDS += "libxslt-native"
meta/recipes-connectivity/neard/neard_0.19.bb +0 -1
index 9e0ac6aa697..ab52ab8b6ca 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;bra
 
 SRCREV = "a1dc8a75cba999728e154a0f811ab9dd50c809f7"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig systemd update-rc.d
 
meta/recipes-connectivity/resolvconf/resolvconf_1.93.bb +0 -1
index 93e5a944d14..b64c694332c 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=un
 
 SRCREV = "ab766fa31f7939f6d879123236b4275320b7ff64"
 
-S = "${WORKDIR}/git"
 
 # the package is taken from snapshots.debian.org; that source is static and goes stale
 # so we check the latest upstream from a directory that does get updated
meta/recipes-connectivity/slirp/libslirp_4.9.1.bb +0 -1
index 568bac389f5..2c6b5f06dc4 100644
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
 SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
 SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0"
 
meta/recipes-core/dbus-wait/dbus-wait_git.bb +0 -1
index 39363b9b3aa..b25ee6b6a35 100644
@@ -13,6 +13,5 @@ PV = "0.1+git"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
meta/recipes-core/fts/fts_1.2.7.bb +0 -1
index 10103830af8..399907ab9a8 100644
@@ -12,7 +12,6 @@ SRCREV = "0bde52df588e8969879a2cae51c3a4774ec62472"
 
 SRC_URI = "git://github.com/pullmoll/musl-fts.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 #
meta/recipes-core/glibc/cross-localedef-native_2.41.bb +1 -2
index 5aeb84ac800..924020343dd 100644
@@ -20,7 +20,7 @@ inherit native
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
 
 SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef;protocol=https \
+           git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/localedef;protocol=https \
            \
            file://0001-localedef-Add-hardlink-resolver-from-util-linux.patch \
            file://0002-localedef-fix-ups-hardlink-to-make-it-compile.patch \
@@ -37,7 +37,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
 #
 SRCREV_FORMAT = "glibc_localedef"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--with-glibc=${S}"
 
meta/recipes-core/glibc/glibc_2.41.bb +0 -1
index 82dcf08fcd0..eb6a6740398 100644
@@ -56,7 +56,6 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0001-stdlib-Add-single-threaded-fast-path-to-rand.patch \
            file://0001-Propagate-ffile-prefix-map-from-CFLAGS-to-ASFLAGS.patch \
 "
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
 PACKAGES_DYNAMIC = ""
meta/recipes-core/ifupdown/ifupdown_0.8.44.bb +0 -1
index 3e7bece41b6..500414eb47e 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=mast
            "
 SRCREV = "7d44f9ce6717a4a496fd46f28c52e12dbf5bafdd"
 
-S = "${WORKDIR}/git"
 
 
 inherit ptest update-alternatives
meta/recipes-core/images/build-appliance-image_15.0.0.bb +4 -4
index 03f02d14ae8..8b43f5ef4a3 100644
@@ -27,7 +27,7 @@ inherit core-image setuptools3 features_check
 REQUIRED_DISTRO_FEATURES += "xattr"
 
 SRCREV ?= "52b5f6a95de7228a12a9156a4aaa932daf54456f"
-SRC_URI = "git://git.yoctoproject.org/poky;branch=master \
+SRC_URI = "git://git.yoctoproject.org/poky;branch=master;destsuffix=poky \
            file://Yocto_Build_Appliance.vmx \
            file://Yocto_Build_Appliance.vmxf \
            file://README_VirtualBox_Guest_Additions.txt \
@@ -44,10 +44,10 @@ IMAGE_CMD:ext4:append () {
 fakeroot do_populate_poky_src () {
 	# Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
 	# will become invalid in the target.
-	rm -rf ${UNPACKDIR}/git/.git
-	rm -f ${UNPACKDIR}/git/.gitignore
+	rm -rf ${UNPACKDIR}/poky/.git
+	rm -f ${UNPACKDIR}/poky/.gitignore
 
-	cp -R ${UNPACKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
+	cp -R ${UNPACKDIR}/poky ${IMAGE_ROOTFS}/home/builder/poky
 
 	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
 	mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
meta/recipes-core/initscripts/init-system-helpers_1.68.bb +0 -1
index 036c86a536e..03a226de56d 100644
@@ -20,7 +20,6 @@ SRCREV = "78486a4a2a305170b66ce4d907bedadbaed10daf"
 SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))(?!_exp)"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
meta/recipes-core/libxcrypt/libxcrypt.inc +0 -1
index 55619daef7d..10705586ec4 100644
@@ -16,7 +16,6 @@ SRCBRANCH ?= "master"
 
 PROVIDES = "virtual/crypt"
 
-S = "${WORKDIR}/git"
 
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error"
meta/recipes-core/musl/gcompat_git.bb +0 -1
index 40fe8c6a5f5..460f759899e 100644
@@ -16,7 +16,6 @@ SRC_URI:append:powerpc = "\
 PV = "1.1.0"
 SRCREV = "b7bfe0b08c52fdc72e0c1d9d4dcb2129f1642bd6"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig linuxloader siteinfo
 
meta/recipes-core/musl/libc-test_git.bb +0 -1
index f55a125a89a..bd639e059b3 100644
@@ -18,7 +18,6 @@ SRC_URI = " \
 
 PV = "0+git"
 
-S = "${WORKDIR}/git"
 
 # libc-test 'make' or 'make run' command is designed to build and run tests. It
 # reports both build and test failures. The commands should be run on target.
meta/recipes-core/musl/libucontext_1.3.2.bb +0 -1
index 65ee77d06e7..10ebb6bd316 100644
@@ -12,7 +12,6 @@ SRCREV = "a0323579ac50b9a9d4033754d089f1fed0f59a00"
 SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \
            "
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = ".*-musl.*"
 
meta/recipes-core/musl/musl-locales_git.bb +0 -1
index 2815e2ddf08..d9e68e98830 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://git.adelielinux.org/adelie/musl-locales;protocol=https;branch=m
 PV = "1.0+git"
 SRCREV = "5663f5bfd30bf9e1e0ba3fc5fe2da6725969f30e"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libintl gettext-native"
 
meta/recipes-core/musl/musl-obstack.bb +0 -1
index 4c71a141b24..23361400c7c 100644
@@ -16,7 +16,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = ".*-musl.*"
 
meta/recipes-core/musl/musl-utils.bb +0 -1
index 8280333daf4..05adeb16192 100644
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-iconv"
 
meta/recipes-core/musl/musl_git.bb +0 -1
index afc459bf1c9..1e1a9cc2624 100644
@@ -16,7 +16,6 @@ SRC_URI = "git://git.musl-libc.org/musl;branch=master \
            file://0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch \
           "
 
-S = "${WORKDIR}/git"
 
 PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"
 
meta/recipes-core/ncurses/ncurses_6.5.bb +0 -1
index 2e3ee337ea4..bba3495266c 100644
@@ -7,7 +7,6 @@ SRC_URI += "file://0001-tic-hang.patch \
            "
 # commit id corresponds to the revision in package version
 SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a"
-S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+_\d+)$"
 
meta/recipes-core/newlib/newlib.inc +0 -1
index 5b5025148e5..604bef3e24b 100644
@@ -22,7 +22,6 @@ SRCREV = "5e5e51f1dc56a99eb4648c28e00d73b6ea44a8b0"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/cross-cc"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 ## disable stdlib
meta/recipes-core/ovmf/ovmf_git.bb +0 -1
index aa7de3af2b0..0f0f1e09149 100644
@@ -51,7 +51,6 @@ inherit deploy
 
 PARALLEL_MAKE = ""
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "nasm-native acpica-native ovmf-native util-linux-native"
 
meta/recipes-core/picolibc/picolibc.inc +0 -1
index 640be819a3d..68c32894a7a 100644
@@ -17,5 +17,4 @@ PV = "${BASEVER}+git"
 SRC_URI = "git://github.com/picolibc/picolibc.git;protocol=https;branch=main"
 SRCREV = "764ef4e401a8f4c6a86ab723533841f072885a5b"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
meta/recipes-core/psplash/psplash_git.bb +0 -1
index f3647d389d7..ba2e097ec19 100644
@@ -62,7 +62,6 @@ python __anonymous() {
             d.appendVar("RDEPENDS:%s" % pn, " %s" % ep)
 }
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-rc.d update-alternatives systemd
 
meta/recipes-core/seatd/seatd_0.9.1.bb +0 -1
index 87e1c3b67d6..35abcb53a83 100644
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
 SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \
            file://init"
 SRCREV = "566ffeb032af42865dc1210e48cec08368059bb9"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd update-rc.d useradd
 
meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb +0 -1
index 86cc06a2cdd..976823e6763 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=maste
 
 SRCREV = "da2f1f8500c0af6663a56ce2bff07f67e60a92e0"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
meta/recipes-core/systemd/systemd.inc +0 -1
index 243053a8c7c..41b885d905b 100644
@@ -19,6 +19,5 @@ SRCREV = "1c93ed4c72a4513d9cefcd1f89d11a9dc828d06c"
 SRCBRANCH = "v257-stable"
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "systemd"
meta/recipes-core/ttyrun/ttyrun_2.37.0.bb +0 -1
index e8fb4831e27..8c335cafcbe 100644
@@ -11,7 +11,6 @@ SRCREV = "793c037ded98cd001075cdb55a9c58e122380256"
 
 CVE_PRODUCT = "s390-tools"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "\
     V=1 \
meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +0 -1
index 27723c88ef2..b5349152046 100644
@@ -12,7 +12,6 @@ PV .= "+git"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
meta/recipes-devtools/bindgen-cli/bindgen-cli_0.71.1.bb +0 -1
index 5578fb3d18b..79f24887271 100644
@@ -8,7 +8,6 @@ inherit rust cargo cargo-update-recipe-crates
 
 SRC_URI += "git://github.com/rust-lang/rust-bindgen.git;protocol=https;branch=main"
 SRCREV = "af7fd38d5e80514406fb6a8bba2d407d252c30b9"
-S = "${WORKDIR}/git"
 
 require ${BPN}-crates.inc
 
meta/recipes-devtools/binutils/binutils-2.44.inc +0 -1
index c3a597cd7b9..a3ab0d2d85e 100644
@@ -42,4 +42,3 @@ SRC_URI = "\
      file://0017-CVE-2025-1181-2.patch \
      file://0018-CVE-2025-5245.patch \
 "
-S  = "${WORKDIR}/git"
meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +0 -1
index 06625d099e6..16bf345d1df 100644
@@ -98,7 +98,6 @@ SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \
            file://0002-Makefile-Add-n-to-gzip.patch \
           "
 
-S = "${WORKDIR}/git"
 SRCREV = "868a2afab9da34f32c007d773b77253c93104636"
 
 
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb +0 -1
index d3d320e107c..04be9439d88 100644
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https;t
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
 SRCREV = "5ad147c9ec00e657393c85b195c9bcc0f4c35a54"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
     programs \
meta/recipes-devtools/createrepo-c/createrepo-c_1.2.1.bb +0 -1
index d12e3184a04..1d2ad9ebfba 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p
 
 SRCREV = "8c6e6f88df86d1e34ca26d3835d77a2816326414"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
 DEPENDS:append:class-native = " file-replacement-native"
meta/recipes-devtools/distcc/distcc_3.4.bb +0 -1
index ab138b3ab6f..392f4ae2725 100644
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/distcc/distcc.git;branch=master;protocol=https \
            file://distcc.service \
            "
 SRCREV = "50d821efe99cae82c05be0a4ab3b4035ef0d3883"
-S = "${WORKDIR}/git"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig update-rc.d useradd systemd
meta/recipes-devtools/dnf/dnf_4.22.0.bb +0 -1
index e5ac3c9824c..7bb0f02d3f9 100644
@@ -23,7 +23,6 @@ SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch
 SRCREV = "da9a7066be8e1628d9453428d33685225cd9c90d"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit cmake gettext bash-completion setuptools3-base systemd
 
meta/recipes-devtools/dpkg/dpkg_1.22.11.bb +0 -1
index 47a8d5d5eaf..adceebf8e6a 100644
@@ -19,4 +19,3 @@ SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-
 
 SRCREV = "ee7e9118d0a9581cb00c5ce02dccd561b3096387"
 
-S = "${WORKDIR}/git"
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +0 -1
index 0cb3f0e6a6f..cce6e5f1acb 100644
@@ -20,7 +20,6 @@ SECTION = "base"
 DEPENDS = "util-linux attr autoconf-archive-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest
 
meta/recipes-devtools/erofs-utils/erofs-utils_1.8.5.bb +0 -1
index 54ead294fb1..830cf435ce8 100644
@@ -10,7 +10,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;b
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "util-linux-libuuid"
 
meta/recipes-devtools/fastfloat/fastfloat_8.0.2.bb +0 -1
index b3f45ccef45..ca69a4238f6 100644
@@ -10,6 +10,5 @@ LIC_FILES_CHKSUM = " \
 SRC_URI = "git://github.com/fastfloat/fast_float.git;protocol=https;branch=main"
 
 SRCREV = "50a80a73ab2ab256ba1c3bf86923ddd8b4202bc7"
-S = "${WORKDIR}/git"
 
 inherit cmake
meta/recipes-devtools/file/file_5.46.bb +0 -1
index e97fac99f21..c035e0b11d8 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \
            "
 
 SRCREV = "c5aa4f7f8d5063fb3c37ad57bf54bb67ec641a09"
-S = "${WORKDIR}/git"
 
 inherit autotools update-alternatives
 
meta/recipes-devtools/fmt/fmt_11.2.0.bb +0 -1
index b2b8c575c8a..ce63f940255 100644
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV}\
            file://0001-Workaround-an-ABI-issue-in-spdlog.patch"
 SRCREV = "40626af88bd7df9a5fb80be7b25ac85b122d6c21"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-devtools/gnu-config/gnu-config_git.bb +0 -1
index 60601d23e22..515777caf4c 100644
@@ -14,7 +14,6 @@ PV = "20240823+git"
 
 SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \
            file://gnu-configize.in"
-S = "${WORKDIR}/git"
 UPSTREAM_CHECK_COMMITS = "1"
 
 CLEANBROKEN = "1"
meta/recipes-devtools/libcomps/libcomps_0.1.21.bb +0 -1
index 91170dfbed9..ee2fb10a08a 100644
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;p
 
 SRCREV = "2e973ce22698dd64f472180e3a689755268fb06b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake setuptools3-base
 
meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +0 -1
index 5a2d4d93642..06be5776f24 100644
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
 SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native util-linux"
 
meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb +0 -1
index c31fc44ce4f..d6613131bd0 100644
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=
 
 SRCREV = "e7f179eeeb6eee1403f090fc43a3c80bb08b5bfd"
 
-S = "${WORKDIR}/git"
 
 inherit meson gobject-introspection pkgconfig manpages
 
meta/recipes-devtools/librepo/librepo_1.19.0.bb +0 -1
index 634967fcbcc..d985601a28b 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;pr
 
 SRCREV = "7955987e33ba98dddb3fc2c63bb6dc892e3505fa"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2"
 
meta/recipes-devtools/mmc/mmc-utils_git.bb +0 -1
index 1f287a8df9e..fed0ef89161 100644
@@ -15,7 +15,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 DEPENDS = "python3-sphinx-native"
 EXTRA_OEMAKE = "C="
 
-S = "${WORKDIR}/git"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb +0 -1
index 2f7043b9773..52dcbcce4ab 100644
@@ -19,7 +19,6 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
            file://0001-Improve-check-for-GCC-compiler-version.patch"
 
-S = "${WORKDIR}/git"
 
 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
meta/recipes-devtools/ninja/ninja_1.12.1.bb +0 -1
index 9f5c014b9b5..2667c932b0c 100644
@@ -11,7 +11,6 @@ SRCREV = "2daa09ba270b0a43e1929d29b073348aa985dfaa"
 SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 
meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb +0 -1
index 44958b442ed..9c5cfb837ed 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \
            "
 SRCREV = "68a969f0e867ace0d94faf8ebe7c7bb67f59d386"
 
-S = "${WORKDIR}/git"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
meta/recipes-devtools/patchelf/patchelf_0.18.0.bb +0 -1
index dece34240c5..cefc586f2f7 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
 "
 SRCREV = "99c24238981b7b1084313aca8f5c493bb46f302c"
 
-S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +0 -1
index af512a42b43..1ce4888e578 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master;
            file://0001-Do-not-use-bool-as-a-field-name.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
meta/recipes-devtools/pseudo/pseudo_git.bb +2 -3
index 4693afcaf62..385b6f34d90 100644
@@ -5,15 +5,14 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
            file://fallback-group \
            "
 SRC_URI:append:class-native = " \
-    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
+    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/prebuilt;name=prebuilt \
     file://older-glibc-symbols.patch"
 SRC_URI:append:class-nativesdk = " \
-    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
+    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/prebuilt;name=prebuilt \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
 SRCREV = "2c43381180f9cfef4c0a8bb0c1658a86c3fcc876"
-S = "${WORKDIR}/git"
 PV = "1.9.0+git"
 
 # largefile and 64bit time_t support adds these macros via compiler flags globally
meta/recipes-devtools/python/python3-calver_2025.04.17.bb +0 -1
index 290be21ce25..fb2fa93173e 100644
@@ -8,7 +8,6 @@ SRCREV = "3b74bdce35f2814eb2b65db39a133d5c849ddea7"
 
 inherit python_setuptools_build_meta ptest-python-pytest
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN}-ptest += " \
     python3-pretend \
meta/recipes-devtools/python/python3-dtc_1.7.2.bb +0 -1
index 99ff0cca874..99eb209a9cb 100644
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c9
 
 SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c"
 
-S = "${WORKDIR}/git"
 
 PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl"
 
meta/recipes-devtools/python/python3-pefile_2024.8.26.bb +0 -1
index 6e72c937413..11765b3cb31 100644
@@ -8,7 +8,6 @@ inherit setuptools3 ptest-python-pytest
 SRCREV = "4b3b1e2e568a88d4f1897d694d684f23d9e270c4"
 SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \
            file://run-ptest"
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb +0 -1
index a8b834a1265..5121a57868d 100644
@@ -8,7 +8,6 @@ SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=
 
 SRCREV = "aebdfb188e368c690ea55cf6c9c9ffa1a52def65"
 
-S = "${WORKDIR}/git"
 
 inherit python_flit_core
 
meta/recipes-devtools/repo/repo_2.55.bb +0 -1
index 5fea49abb39..e77f952f727 100644
@@ -15,7 +15,6 @@ SRCREV = "08815ad3eb245872700201e03c47cb504d1dc3f9"
 
 MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
 	sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo
meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy_git.bb +0 -1
index 4ccfc95c33c..13ef83fdc7b 100644
@@ -16,7 +16,6 @@ SRC_URI = " \
 SRCREV = "032b418a6db842f0eab330eb5909e4604e888728"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${UNPACKDIR}/git"
 
 do_compile () {
 	# Remove most policy variants, leave DEFAULT.pol
meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb +0 -1
index 6ef626e4667..297370f7b51 100644
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/rpm-software-management/rpm-sequoia.git;protocol=htt
 
 SRCREV = "0667e04ae7fb8cf0490919978d69883d16400e41"
 
-S = "${UNPACKDIR}/git"
 
 require ${BPN}-crates.inc
 
meta/recipes-devtools/rpm/rpm_4.20.1.bb +0 -1
index 7bb6993811c..a1190e8dd1e 100644
@@ -44,7 +44,6 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protoc
 PE = "1"
 SRCREV = "c8dc5ea575a2e9c1488036d12f4b75f6a5a49120"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd"
 DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native"
meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +0 -1
index 982a43f8899..d438057cc1d 100644
@@ -12,7 +12,6 @@ SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184"
 SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}"
 
meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb +0 -1
index 859c7eb906f..308ecc4be68 100644
@@ -24,7 +24,6 @@ SRC_URI:append:libc-musl = " \
 
 SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool"
 
meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb +1 -1
index b02fcb9cad1..5d759837950 100644
@@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.eclipse.org/eclipse/tcf/tcf.agent.git;protocol=https;bra
 DEPENDS = "util-linux openssl"
 RDEPENDS:${PN} = "bash"
 
-S = "${WORKDIR}/git/agent"
+S = "${UNPACKDIR}/${BP}/agent"
 
 inherit update-rc.d systemd
 
meta/recipes-devtools/unfs3/unfs3_0.11.0.bb +0 -1
index da5ca45277d..b8c235fb7cd 100644
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c621cd2786a3a1344a60a0d608c910"
 
 DEPENDS = "bison-native flex-native libtirpc"
 
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master;tag=${BP}"
 SRCREV = "ec1660ba33c80d5c67131e163e68834c1a10e243"
 UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>\d+(\.\d+)+)"
meta/recipes-devtools/xmlto/xmlto_0.0.29.bb +0 -1
index 1415e5d781c..613d7973ec1 100644
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 SRCREV = "74862a684907ada3d4ed2ce0f8111adf626e1456"
 SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 
 inherit autotools
 
meta/recipes-extended/acpica/acpica_20240827.bb +0 -1
index 7e8c68db90c..4b61e92141d 100644
@@ -19,7 +19,6 @@ DEPENDS = "m4-native flex-native bison-native"
 SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master"
 SRCREV = "e80cbd7b52de20aa8c75bfba9845e9cb61f2e681"
 
-S = "${WORKDIR}/git"
 
 inherit update-alternatives
 
meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb +0 -1
index 0360a342b41..57b56802ed1 100644
@@ -14,7 +14,6 @@ SRCREV = "21e33efe96ba9a51d99d1150691dae750afd6ed1"
 
 DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-S = "${WORKDIR}/git"
 
 # Tell xmllint where to find the DocBook XML catalogue, because right now it
 # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch
meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb +0 -1
index 0e873604a44..2fdace01b85 100644
@@ -10,7 +10,6 @@ PV = "0.1+git"
 SRC_URI = "git://github.com/ahcbb6/baremetal-helloqemu.git;protocol=https;branch=master"
 UPSTREAM_VERSION_UNKNOWN = "1"
 
-S = "${WORKDIR}/git"
 
 # The following variables should be set to accomodate each application
 BAREMETAL_BINNAME ?= "hello_baremetal_${MACHINE}"
meta/recipes-extended/bzip2/bzip2_1.0.8.bb +13 -13
index 0d7ff9edcdc..5b10821ccb0 100644
@@ -14,15 +14,15 @@ LICENSE:libbz2 = "bzip2-1.0.6"
 LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib"
 
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \
-                    file://${UNPACKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://${UNPACKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \
-                    file://${UNPACKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \
-                    file://${UNPACKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
-                    file://${UNPACKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://${UNPACKDIR}/bzip2-tests/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://${UNPACKDIR}/bzip2-tests/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \
+                    file://${UNPACKDIR}/bzip2-tests/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \
+                    file://${UNPACKDIR}/bzip2-tests/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+                    file://${UNPACKDIR}/bzip2-tests/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
 SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \
-           git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https \
+           git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https;destsuffix=bzip2-tests/ \
            file://configure.ac;subdir=${BP} \
            file://Makefile.am;subdir=${BP} \
            file://run-ptest \
@@ -52,13 +52,13 @@ do_configure:prepend () {
 
 do_install_ptest () {
 	install -d ${D}${PTEST_PATH}/bzip2-tests
-	cp -r ${UNPACKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress
-	cp -r ${UNPACKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip
-	cp -r ${UNPACKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go
-	cp -r ${UNPACKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2
-	cp -r ${UNPACKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate
-	cp ${UNPACKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/
-	cp ${UNPACKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/
+	cp -r ${UNPACKDIR}/bzip2-tests/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress
+	cp -r ${UNPACKDIR}/bzip2-tests/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip
+	cp -r ${UNPACKDIR}/bzip2-tests/go ${D}${PTEST_PATH}/bzip2-tests/go
+	cp -r ${UNPACKDIR}/bzip2-tests/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2
+	cp -r ${UNPACKDIR}/bzip2-tests/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate
+	cp ${UNPACKDIR}/bzip2-tests/README ${D}${PTEST_PATH}/bzip2-tests/
+	cp ${UNPACKDIR}/bzip2-tests/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/
 	sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
 }
 
meta/recipes-extended/cracklib/cracklib_2.10.3.bb +1 -1
index c3396521ffe..7feba2c9509 100644
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \
            "
 
 SRCREV = "e73d5db1789d198b5f9ec44b68b9c775c3e6c042"
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 inherit autotools gettext
 
meta/recipes-extended/iputils/iputils_20250605.bb +0 -1
index bb495a7d130..39d2fd8bb65 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
           "
 SRCREV = "6e1cb146547eb6fbb127ffc8397a9241be0d33c2"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
 
meta/recipes-extended/libaio/libaio_0.3.113.bb +0 -1
index 87ab22ed176..2392fd5db23 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://pagure.io/libaio.git;protocol=https;branch=master \
            file://system-linkage.patch \
            "
 SRCREV = "1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
 
meta/recipes-extended/libnsl/libnsl2_2.0.1.bb +0 -1
index 1b9be620c07..b40ff34dd8d 100644
@@ -15,7 +15,6 @@ CVE_PRODUCT = "libnsl_project:libnsl"
 SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https"
 SRCREV = "d4b22e54b5e6637a69b26eab5faad2a326c9b182"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext
 
meta/recipes-extended/libnss-nis/libnss-nis.bb +0 -1
index f0e687c3305..c04c9b34f1d 100644
@@ -20,7 +20,6 @@ SRCREV = "cd0d391af9535b56e612ed227c1b89be269f3d59"
 SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master;protocol=https \
           "
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
meta/recipes-extended/libsolv/libsolv_0.7.32.bb +0 -1
index 71786e40dce..8b927c02712 100644
@@ -16,7 +16,6 @@ SRCREV = "95f64952e3270deb6be30ae4b786cae5c114c807"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-extended/lsof/lsof_4.99.4.bb +0 -1
index f1ec650029a..f245666d80a 100644
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
            file://remove-host-information.patch"
 SRCREV = "bbf320ce586a848f880bca7b758d50ae4c712624"
 
-S = "${WORKDIR}/git"
 
 inherit update-alternatives autotools pkgconfig manpages
 PACKAGECONFIG[manpages] = ""
meta/recipes-extended/ltp/ltp_20250130.bb +0 -1
index f9521acbc6a..e82d3ed066d 100644
@@ -33,7 +33,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht
            file://0001-cve-2015-3290-Disable-AVX-for-x86_64.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
meta/recipes-extended/mdadm/mdadm_4.4.bb +0 -1
index db45df43d3d..d8ded85d4c2 100644
@@ -20,7 +20,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra
            "
 
 SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a"
-S = "${WORKDIR}/git"
 
 inherit ptest systemd
 
meta/recipes-extended/net-tools/net-tools_2.10.bb +0 -1
index 7facc0cc8da..853e25e8434 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \
     file://Add_missing_headers.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit gettext
 
meta/recipes-extended/procps/procps_4.0.5.bb +0 -1
index 3be40c38a4e..7c40b3b974e 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \
            "
 SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e"
 
-S = "${WORKDIR}/git"
 
 # Upstream has a custom autogen.sh which invokes po/update-potfiles as they
 # don't ship a po/POTFILES.in (which is silly).  Without that file gettext
meta/recipes-extended/psmisc/psmisc_23.7.bb +0 -1
index 4128ca05335..653095c81cd 100644
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
            "
 SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
-S = "${WORKDIR}/git"
 
 inherit autotools gettext
 
meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +0 -1
index 20933153a32..dc928c736e9 100644
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \
            file://0001-Use-cross-compiled-rpcgen.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext
 
meta/recipes-extended/scdoc/scdoc_1.11.3.bb +0 -1
index 7bbedcb66da..3641b03b90b 100644
@@ -10,7 +10,6 @@ SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
            file://0001-Makefile-drop-static.patch "
 SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59"
 
-S = "${WORKDIR}/git"
 
 do_install() {
 	oe_runmake 'DESTDIR=${D}' install
meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb +0 -1
index b1cfdc371fb..85a0d6a7099 100644
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV} \
            "
 SRCREV = "d4eef982dc98fe915aa82303c0a24070d0a51b00"
-S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native libbsd"
 
meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb +0 -1
index ba69a7a8b8e..f8a1bac1868 100644
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https;
 
 SRCREV = "5fb314cb9060afa3bd4eed2f0be3200f02f729e9"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger"
 
meta/recipes-extended/sysstat/sysstat_12.7.7.bb +0 -1
index 8ea47d77974..0fa4a3c9503 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \
 LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
 
 SRCREV = "dac10e13c70d1102aa3beea10135a3ed60520c36"
-S = "${WORKDIR}/git"
 
 DEPENDS += "base-passwd"
 
meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +0 -1
index 111c50bdfec..93c211e3ba3 100644
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \
 
 SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4"
 
-S = "${WORKDIR}/git"
 
 # https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision
 CVE_STATUS[CVE-2013-4342] = "fixed-version: Fixed directly in git tree revision"
meta/recipes-extended/zstd/zstd_1.5.7.bb +0 -1
index d173558a0fb..81d05f980fc 100644
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 CVE_PRODUCT = "zstandard"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4"
meta/recipes-gnome/gi-docgen/gi-docgen_2025.3.bb +0 -1
index a16574955f1..58d5cb07b5f 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://gitlab.gnome.org/GNOME/gi-docgen.git;protocol=https;branch=main
 
 SRCREV = "9ab2ab8fa3f4a04f5d2cc24b0c8e91e73bc57b51"
 
-S = "${WORKDIR}/git"
 
 inherit python_setuptools_build_meta
 
meta/recipes-gnome/libhandy/libhandy_1.8.3.bb +0 -1
index 7f5f02a7ba9..cf2c64f8d0a 100644
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-8"
 SRCREV = "9b0071408ce86a3ef843806fddd723a85f6f2416"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))"
 GIR_MESON_ENABLE_FLAG = 'enabled'
meta/recipes-gnome/libportal/libportal_0.9.1.bb +0 -1
index 970db65bc57..9713f70dbb1 100644
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
 
 SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main"
 SRCREV = "8f5dc8d192f6e31dafe69e35219e3b707bde71ce"
-S = "${WORKDIR}/git"
 
 inherit meson gi-docgen gobject-introspection vala features_check pkgconfig
 GIDOCGEN_MESON_OPTION = 'docs'
meta/recipes-gnome/libxmlb/libxmlb_0.3.22.bb +0 -1
index 1d6ad58b682..761426148a5 100644
@@ -9,7 +9,6 @@ SRC_URI = " \
 	file://run-ptest \
 "
 SRCREV = "addcce32a3bd6a09303f052bd59fb758621d30fb"
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 xz zstd"
 
meta/recipes-graphics/glslang/glslang_1.4.313.0.bb +0 -1
index 988b2ef2a31..cb754c6ac81 100644
@@ -19,7 +19,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 
 inherit cmake python3native
 
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb +0 -1
index dad752cb199..397352b7615 100644
@@ -15,7 +15,6 @@ SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;bra
            file://0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch \
            "
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native"
 RDEPENDS:${PN} += "bash perl"
meta/recipes-graphics/kmscube/kmscube_git.bb +0 -1
index 7035dd446b9..3b976364296 100644
@@ -16,7 +16,6 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=http
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 BASEPV = "0.0.1"
 PV = "${BASEPV}+git"
meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb +0 -1
index 384afa69079..2427ce3f96f 100644
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
 
 SRC_URI = "git://github.com/anholt/libepoxy;branch=master;protocol=https"
 SRCREV = "c84bc9459357a40e46e2fec0408d04fbdde2c973"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check github-releases
 
meta/recipes-graphics/libfakekey/libfakekey_git.bb +0 -1
index 5f902d3a67e..5ddbbb7eae0 100644
@@ -15,7 +15,6 @@ PV = "0.3+git"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext features_check
 
meta/recipes-graphics/libmatchbox/libmatchbox_1.14.bb +0 -1
index 87ec4c812fa..c9dbc0202bf 100644
@@ -16,7 +16,6 @@ DEPENDS = "virtual/libx11 libxext"
 SRCREV = "04b214a0d5cf8285e196d90bf2332626b12c74ef"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV}"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 # depends on virtual/libx11
meta/recipes-graphics/libva/libva-utils_2.22.0.bb +0 -1
index 078cd7ea0a7..de36f01afd5 100644
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
 SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.22-branch;protocol=https"
 SRCREV = "1a13ae13382b7b548f3a7e8035e1d7df66662c0a"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$"
 
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb +0 -1
index c8b6f07ed0d..29d6644f510 100644
@@ -14,7 +14,6 @@ SRCREV = "ce8c1053270d960a7235ab5c3435f707541810a4"
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master;protocol=https \
            file://kbdconfig"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 # depends on virtual/libx11
meta/recipes-graphics/piglit/piglit_git.bb +0 -1
index dc210ff56d8..d5ca3775594 100644
@@ -20,7 +20,6 @@ SRCREV = "05f02cb2ff1787892cba38c3b609f892419bae87"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr"
 
-S = "${WORKDIR}/git"
 
 X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
 X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
meta/recipes-graphics/shaderc/shaderc_2025.2.bb +0 -1
index 8c451e6e468..9e56b978308 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v$
            file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
-S = "${WORKDIR}/git"
 
 inherit cmake python3native pkgconfig
 
meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb +0 -1
index 981c2599aec..a551814689c 100644
@@ -13,7 +13,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-graphics/spir/spirv-llvm-translator_20.1.2.bb +0 -1
index bc2bebcda88..f5cd50ef93d 100644
@@ -14,7 +14,6 @@ SRCREV_spirv = "6dd8f2a1681a27f16c53d932d2765920f312aeb2"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "clang spirv-tools spirv-headers"
 
meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb +0 -1
index 57dce4f3fd2..4594a1a9426 100644
@@ -17,7 +17,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb +0 -1
index 07abde1c4f7..89770f7d513 100644
@@ -15,7 +15,6 @@ SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;prot
            file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
meta/recipes-graphics/vulkan/vulkan-headers_1.4.313.0.bb +0 -1
index 12a6923ac61..c83a7ae2e26 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol
 
 SRCREV = "409c16be502e39fe70dd6fe2d9ad4842ef2c9a53"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-graphics/vulkan/vulkan-loader_1.4.313.0.bb +0 -1
index 73f80d64ff0..565652be27b 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "fb78607414e154c7a5c01b23177ba719c8a44909"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +0 -1
index 844e0e6b688..b7c9ddd2feb 100644
@@ -13,7 +13,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 SRCREV = "d27205d14d01ea7d33efc8ba2862478612370182"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = 'vulkan'
 
meta/recipes-graphics/vulkan/vulkan-tools_1.4.313.0.bb +0 -1
index 85578df467e..39c6c710179 100644
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "ad2f0170f9466fadd96e3fdd65fad02cd3a3739b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.313.0.bb +0 -1
index 785c6f305b7..38ae1739699 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "4e246c56ec5afb5ad66b9b04374d39ac04675c8e"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.313.0.bb +0 -1
index 65cafa359e2..1572b4ce9be 100644
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1a17d548e004bfbbfaa0c40988b6b31"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "50b87dd4be883b63c10e3c4f7b9c5aac0c82efd3"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
meta/recipes-graphics/vulkan/vulkan-volk_1.4.313.0.bb +0 -1
index 5e661080a07..ec6683dbb60 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb3d6e8051a71edca1e54bc38d35e5af"
 SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https"
 SRCREV = "43c29e655cb8117fd9cfb65ad9cefe2d40965102"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
meta/recipes-graphics/waffle/waffle_1.8.1.bb +0 -1
index 684124bc4d2..606881e0c91 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
 SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.8 \
            "
 SRCREV = "49abc7cb5f73cc6852136c91da49ea3a338960e4"
-S = "${WORKDIR}/git"
 
 inherit meson features_check lib_package bash-completion pkgconfig
 
meta/recipes-graphics/wayland/libinput_1.28.1.bb +0 -1
index c10422bf9be..521a7f9a099 100644
@@ -16,7 +16,6 @@ SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;bra
            file://run-ptest \
            "
 SRCREV = "4f7b4ef0e4eb5d569df36be387579858eba349bb"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb +0 -1
index 40b77422bf6..744899952a7 100644
@@ -13,7 +13,6 @@ PV = "0.1.1+git"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools allarch
 
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb +0 -1
index c37b36897b6..337777648ac 100644
@@ -14,7 +14,6 @@ SRC_URI = "git://gitlab.freedesktop.org/xorg/app/xinput-calibrator;protocol=http
            file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \
            "
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "--with-gui=x11"
 
meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +0 -1
index 0a42bd99755..fd8324409ea 100644
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
 SRCREV = "31486f40f8e8f8923ca0799aea84b58799754564"
 PV = "2.99.917+git"
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git;protocol=https;branch=master"
 
meta/recipes-graphics/xorg-lib/libxcvt_0.1.3.bb +0 -1
index 08194e48159..2431fae6ce5 100644
@@ -9,7 +9,6 @@ SECTION = "x11/libs"
 SRC_URI = "git://gitlab.freedesktop.org/xorg/lib/libxcvt.git;protocol=https;branch=master"
 SRCREV = "dd8631c61465cc0de5e476c7a98e56528d62b163"
 
-S = "${WORKDIR}/git"
 
 inherit meson
 
meta/recipes-graphics/xorg-lib/libxkbcommon_1.10.0.bb +0 -1
index e10bbf7af03..79c95cb8eda 100644
@@ -10,7 +10,6 @@ DEPENDS = "flex-native bison-native"
 SRC_URI = "git://github.com/xkbcommon/libxkbcommon;protocol=https;branch=master;tag=xkbcommon-${PV}"
 
 SRCREV = "7888474d0296dcad50c9ba4adfdfdf2be02d35e1"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig bash-completion
 
meta/recipes-kernel/blktrace/blktrace_1.3.0.bb +0 -2
index 061a7b97846..e678927d224 100644
@@ -17,8 +17,6 @@ SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=https;branch=master \
 
 SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = "\
     'CC=${CC}' \
     'CFLAGS=${CFLAGS}' \
meta/recipes-kernel/cryptodev/cryptodev.inc +0 -1
index 8d0aad4a01c..7611335c5d1 100644
@@ -13,6 +13,5 @@ SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protoc
 SRCREV = "135cbff90af2ba97d88f1472be595ce78721972c"
 PV = "1.14"
 
-S = "${WORKDIR}/git"
 
 CLEANBROKEN = "1"
meta/recipes-kernel/dtc/dtc_1.7.2.bb +0 -1
index 3df95ec1ee3..7884c870860 100644
@@ -15,7 +15,6 @@ SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +0 -1
index 20b1bcaf37b..84b8b10a266 100644
@@ -17,7 +17,6 @@ PV = "0.3+git"
 inherit native
 
 SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 do_configure() {
 	:
meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb +0 -1
index 7a33da37c2a..b7a781e2e96 100644
@@ -12,7 +12,6 @@ SRCREV = "bd47bd544c9ebc9f44bd88c2b2f2049230741058"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
           "
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb +0 -1
index fdcb6377615..b227fe488a7 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=http
 SRCREV = "7f2f8cd6dac497cbb466efb31219b531c62013f5"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest python3targetconfig
 
meta/recipes-kernel/lttng/babeltrace_1.5.11.bb +0 -1
index 2585747fb6b..6e1c2406481 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5;protocol=http
 SRCREV = "91c00f70884887ff5c4849a8e3d47e311a22ba9d"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>1(\.\d+)+)$"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest
 
meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb +0 -1
index 23fcef9569b..4076e971632 100644
@@ -28,7 +28,6 @@ SRC_URI = "\
     file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
 "
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-kernel/powertop/powertop_2.15.bb +0 -1
index ec81d546a86..3f9be0993a2 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master \
            "
 SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651"
 
-S = "${WORKDIR}/git"
 
 LDFLAGS += "-pthread"
 
meta/recipes-kernel/systemtap/systemtap_git.inc +0 -1
index a6688f26042..211cbde8831 100644
@@ -12,7 +12,6 @@ SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de"
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'
 
-S = "${WORKDIR}/git"
 
 # systemtap can't be built without optimization, if someone tries to compile an
 # entire image as -O0, break with fatal.
meta/recipes-multimedia/gstreamer/gst-examples_1.26.2.bb +1 -1
index bc043f81c79..67c78d89aab 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;b
 
 SRCREV = "100c21e1faf68efe7f3830b6e9f856760697ab48"
 
-S = "${WORKDIR}/git/subprojects/gst-examples"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 
 inherit meson pkgconfig features_check
 
meta/recipes-multimedia/x264/x264_git.bb +0 -1
index fae88d24d13..4f4ff173042 100644
@@ -16,7 +16,6 @@ SRCREV = "31e19f92f00c7003fa115047ce50978bc98c3a0d"
 
 PV = "r3039+git"
 
-S = "${WORKDIR}/git"
 
 inherit lib_package pkgconfig
 
meta/recipes-rt/rt-tests/rt-tests.inc +0 -1
index f28258ef58e..a2e8558c4c6 100644
@@ -4,4 +4,3 @@ PE = "1"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
meta/recipes-sato/l3afpad/l3afpad_git.bb +0 -1
index 3d8c427b69d..07a4f7a6763 100644
@@ -19,7 +19,6 @@ PV = "0.8.18.1.11+git"
 SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https"
 SRCREV = "3cdccdc9505643e50f8208171d9eee5de11a42ff"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check mime-xdg
 
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +0 -1
index caa34966ccc..8d5913f16be 100644
@@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 PV = "0.2+git"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb +0 -1
index ab178f97e6f..c6354f05e31 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master;protocol=https \
 
 EXTRA_OECONF = "--enable-startup-notification --with-dbus"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +0 -1
index a1f7862efa4..a941cd36929 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1;protoc
            file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \
            file://80matchboxkeyboard.sh"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext gtk-immodules-cache features_check
 
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb +0 -1
index 83425f60fe1..0946c42a09d 100644
@@ -28,7 +28,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \
 EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
 EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${libdir}/matchbox-panel/*.so \
                 ${datadir}/matchbox-panel/brightness/*.png \
meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +0 -1
index c9b01b3cfd9..27bc596dfb0 100644
@@ -14,7 +14,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 PV = "0.2+git"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check update-alternatives
 
meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +0 -1
index c60a11c3c0f..ece4f25ecaf 100644
@@ -5,4 +5,3 @@ SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78"
 SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
meta/recipes-sato/puzzles/puzzles_git.bb +0 -1
index 15f6979beca..2fa78012776 100644
@@ -14,7 +14,6 @@ SRCREV = "7da46412223273b3adf6d513466342b9d3a5c869"
 PE = "2"
 PV = "0.0+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake features_check pkgconfig
 
meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb +0 -1
index 1ebbf010f37..ec74e33fcdf 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/sato-icon-theme.git;protocol=https;branch=
 SRCREV = "d23f04ecb0328f655bf195df8eb04c1b734d53a9"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig allarch gtk-icon-cache perlnative
 
meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +0 -1
index de4ab824848..e58bb98458a 100644
@@ -14,7 +14,6 @@ SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756"
 SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +0 -1
index aee89b2f57c..b9dd0a1aa15 100644
@@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=ht
            "
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gconf features_check
 
meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb +0 -1
index 00b60365027..74f53de6d79 100644
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/ericonr/argp-standalone;branch=master;protocol=https
            file://out_of_tree_build.patch \
           "
 SRCREV = "e5fe9ad9e83e6765cf8fa787f903d4c6792338b5"
-S = "${WORKDIR}/git"
 
 inherit autotools
 
meta/recipes-support/bmaptool/bmaptool_3.9.0.bb +0 -1
index 28750786afb..d82ce5ded45 100644
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/yoctoproject/${BPN};branch=main;protocol=https"
 SRCREV = "618a7316102f6f81faa60537503012a419eafa06"
-S = "${WORKDIR}/git"
 
 # TODO: remove when we upgrade to a release past 3.9.0
 PV .= "+git"
meta/recipes-support/boost/boost-build-native_1.87.0.bb +0 -1
index 764f4107805..e4ef9fe9dfa 100644
@@ -14,7 +14,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
 
 inherit native
 
-S = "${WORKDIR}/git"
 
 do_compile() {
     ./bootstrap.sh
meta/recipes-support/debianutils/debianutils_5.22.bb +0 -1
index f5deead51a9..8f9dd93d79e 100644
@@ -15,7 +15,6 @@ SRCREV = "528fac5c7448989f33c54599ae6e4c2b84d41e21"
 
 inherit autotools update-alternatives
 
-S = "${WORKDIR}/git"
 
 # Disable po4a (translated manpages) sub-directory, as that requires po4a to build
 do_configure:prepend() {
meta/recipes-support/dos2unix/dos2unix_7.5.2.bb +1 -1
index 06338dd62f9..c3803f457be 100644
@@ -13,7 +13,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))"
 
 SRCREV = "c16a0b31a64c7eb6b2d76960e5144732b57f2993"
 
-S = "${WORKDIR}/git/dos2unix"
+S = "${UNPACKDIR}/${BP}/dos2unix"
 
 inherit gettext perlnative
 
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +0 -1
index 1173dd4af35..9a605481804 100644
@@ -16,7 +16,6 @@ SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
 
 DEPENDS = "glib-2.0"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
meta/recipes-support/hwdata/hwdata_0.395.bb +0 -1
index 73b846b181d..b339621df93 100644
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https;tag=v${PV}"
 SRCREV = "95c1de6c4a0d40415867b29c0791480fb8ad3cdb"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
meta/recipes-support/iso-codes/iso-codes_4.18.0.bb +0 -1
index c737cfd59f3..ccf9cd55323 100644
@@ -15,7 +15,6 @@ SRCREV = "5be4d112d420706eacd913a3ebd85549fe9eeae4"
 # are inhibited by allarch
 DEPENDS = "gettext-native"
 
-S = "${WORKDIR}/git"
 
 inherit allarch autotools
 
meta/recipes-support/libcap-ng/libcap-ng.inc +0 -1
index 4c8ffd41c2c..ed8712bf2b1 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/stevegrubb/libcap-ng.git;protocol=https;branch=maste
            file://0001-Fix-python-path-when-invoking-py-compile-54.patch \
            "
 SRCREV = "f5d39702622208b3ada064d7b2eaeaf1454c9bd3"
-S = "${WORKDIR}/git"
 
 inherit lib_package autotools
 
meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb +0 -1
index f5156cc9f73..66b30cd6dde 100644
@@ -11,6 +11,5 @@ DEPENDS = "hwdata-native"
 SRC_URI = "git://gitlab.freedesktop.org/emersion/libdisplay-info.git;branch=main;protocol=https"
 SRCREV = "66b802d05b374cd8f388dc6ad1e7ae4f08cb3300"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig lib_package
meta/recipes-support/libgit2/libgit2_1.9.0.bb +0 -1
index 47a63ca2862..0a5f6427ba3 100644
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \
            "
 SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-support/libjitterentropy/libjitterentropy_3.6.3.bb +0 -1
index e2df8442022..7890dfa5c70 100644
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e01027c4ad1fe5a4768f8488c945d491 \
                     "
 SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https;tag=v${PV}"
 SRCREV = "c90ff465dcdb6a6949542c72a26a8ab496daa8cb"
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 
meta/recipes-support/libproxy/libproxy_0.5.9.bb +0 -1
index e6192a6960e..ed8a4df2a8d 100644
@@ -15,7 +15,6 @@ DEPENDS = "glib-2.0"
 
 SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main"
 SRCREV = "77e2a2b88a319974cf099c8eaaaa03030bc4c0d4"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gobject-introspection vala gi-docgen
 GIDOCGEN_MESON_OPTION = 'docs'
meta/recipes-support/libseccomp/libseccomp_2.6.0.bb +0 -1
index 949799fc82a..2f05893f08f 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.6;protocol=h
            file://run-ptest \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig ptest features_check
 
meta/recipes-support/lz4/lz4_1.10.0.bb +0 -1
index f77a2e7bb95..5dbefe7c084 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https \
            file://run-ptest"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
-S = "${WORKDIR}/git"
 
 inherit ptest
 
meta/recipes-support/numactl/numactl_2.0.19.bb +0 -1
index 62f3020fef8..e674460dc48 100644
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \
            file://0001-define-run-test-target.patch \
            "
 
-S = "${WORKDIR}/git"
 
 LDFLAGS:append:riscv64 = " -latomic"
 LDFLAGS:append:riscv32 = " -latomic"
meta/recipes-support/p11-kit/p11-kit_0.25.5.bb +0 -1
index 8c2f56be44d..d60e4abdaf1 100644
@@ -13,7 +13,6 @@ DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''
 SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \
            "
 SRCREV = "0dd113361057e477f40ff4d8788f3e7e400af5f9"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native"
meta/recipes-support/ptest-runner/ptest-runner_2.4.5.1.bb +0 -1
index 9f6bb399b40..adf9f6eff66 100644
@@ -12,7 +12,6 @@ SRCREV = "c99e8c2737ff802f110612cc2d90c60233c33255"
 SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \
 "
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} = "${bindir}/ptest-runner ${bindir}/ptest-runner-collect-system-data"
 
meta/recipes-support/rng-tools/rng-tools_6.17.bb +0 -1
index fc141a984ce..019f7d3f717 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \
            "
 SRCREV = "bd00c08b0c3c6a880b0988befe97fd35b315468c"
 
-S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d systemd pkgconfig
 
meta/recipes-support/sass/libsass_3.6.6.bb +0 -1
index 3878072cf19..6a2e30e8677 100644
@@ -10,6 +10,5 @@ SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=master \
 
 SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460"
 
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
meta/recipes-support/sass/sassc_3.6.2.bb +0 -1
index 4d4dbc03fe2..1de02f44b61 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master \
            file://0001-Remove-sassc_version.h-from-source-directory.patch"
 
 SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
-S = "${WORKDIR}/git"
 
 CVE_STATUS[CVE-2022-43357] = "cpe-incorrect: this is CVE for libsass, not sassc wrapper"
 
meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb +0 -1
index b8a377e2b23..64d83085f41 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;
            file://0002-Handle-build-with-older-versions-of-GCC.patch"
 SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gettext python3native mime
 
meta/recipes-support/utfcpp/utfcpp_4.0.6.bb +0 -1
index 21f1879c4fb..8eb4ed89245 100644
@@ -9,7 +9,6 @@ SRC_URI = "gitsm://github.com/nemtrif/utfcpp;protocol=https;branch=master"
 
 SRCREV = "b26a5f718f4f370af1852a0d5c6ae8fa031ba7d0"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
meta/recipes-support/vim/vim.inc +0 -1
index b39cfadaad1..b0cd0a3094c 100644
@@ -26,7 +26,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
 # Ignore that the upstream version .z in x.y.z is always newer
 UPSTREAM_VERSION_UNKNOWN = "1"
 
-S = "${WORKDIR}/git"
 
 VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
 
meta/recipes-support/xxhash/xxhash_0.8.3.bb +0 -1
index 227649854e3..0ac2b449048 100644
@@ -12,7 +12,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 SRCREV = "e626a72bc2321cd320e953a0ccf1584cad60f363"
 
-S = "${WORKDIR}/git"
 
 CFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
 
scripts/lib/recipetool/append.py +2 -2
index 10945d60084..c18926e56c6 100644
@@ -336,9 +336,9 @@ def appendsrc(args, files, rd, extralines=None):
         src_destdir = os.path.dirname(srcfile)
         if not args.use_workdir:
             if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'):
-                srcdir = os.path.join(workdir, 'git')
+                srcdir = os.path.join(workdir, rd.getVar('BB_GIT_DEFAULT_DESTSUFFIX'))
                 if not bb.data.inherits_class('kernel-yocto', rd):
-                    logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
+                    logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}')
             src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir)
         src_destdir = os.path.normpath(src_destdir)
 
scripts/lib/recipetool/create.py +1 -2
index 94d52d60772..0fd4953f752 100644
@@ -637,7 +637,6 @@ def create_recipe(args):
                     if len(splitline) > 1:
                         if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]):
                             srcuri = reformat_git_uri(splitline[1]) + ';branch=master'
-                            srcsubdir = 'git'
                             break
 
     if args.src_subdir:
@@ -839,7 +838,7 @@ def create_recipe(args):
                 line = line.replace(realpv, '${PV}')
             if pn:
                 line = line.replace(pn, '${BPN}')
-            if line == 'S = "${WORKDIR}/${BPN}-${PV}"':
+            if line == 'S = "${WORKDIR}/${BPN}-${PV}"' or 'tmp-recipetool-' in line:
                 skipblank = True
                 continue
         elif line.startswith('SRC_URI = '):
Signature · 1 line
2.39.5
#1 lore raw

RFC PATCH 2/9 bitbake.conf: set UNPACKDIR to just 'sources' and not 'sources-unpack'

From: Alexander Kanavin <[email protected]>

This is shorter and doesn't include the unnecessary task name, just the result of it: source trees and files.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 4fa72b3d3ac..780de10ba35 100644
@@ -407,7 +407,7 @@ STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
 STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
 BASE_WORKDIR ?= "${TMPDIR}/work"
 WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
-UNPACKDIR ??= "${WORKDIR}/sources-unpack"
+UNPACKDIR ??= "${WORKDIR}/sources"
 BB_GIT_DEFAULT_DESTSUFFIX = "${BP}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
Signature · 1 line
2.39.5
#2 lore raw

Re: [OE-core] [RFC PATCH 2/9] bitbake.conf: set UNPACKDIR to just 'sources' and not 'sources-unpack'

Quoted 20 lines · Alexander Kanavin via lists.openembedded.org

From: Alexander Kanavin <[email protected]>

This is shorter and doesn't include the unnecessary task name, just the result of it: source trees and files.

---
 meta/conf/bitbake.conf | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +0 -0
index 4fa72b3d3ac..780de10ba35 100644
@@ -407,7 +407,7 @@ STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"

 STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" BASE_WORKDIR ?= "${TMPDIR}/work"
 WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"

meta/conf/bitbake.conf +1 -1
-UNPACKDIR ??= "${WORKDIR}/sources-unpack"
+UNPACKDIR ??= "${WORKDIR}/sources"
Quoted 3 lines

 BB_GIT_DEFAULT_DESTSUFFIX = "${BP}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"

FWIW this was previously rejected due to confusion with the default for DL_DIR often being "sources".

Cheers,

Richard

#3 lore raw

Re: [OE-core] [RFC PATCH 2/9] bitbake.conf: set UNPACKDIR to just 'sources' and not 'sources-unpack'

Quoted 2 lines · Richard Purdie

FWIW this was previously rejected due to confusion with the default for DL_DIR often being "sources".

I'd like to look at that discussion, particularly to see what evidence was presented for 'often'.

I'd still argue DL_DIR should have 'downloads' in it somewhere, as suggested in oe-core default (and variable name). There's already a number of recipes that set S to WORKDIR/sources and UNPACKDIR to S (and that pattern made it into the docs too), so from that perspective standardizing on 'sources' across oe-core is going to be less confusion.

Alex

#4 lore raw

RFC PATCH 3/9 bitbake.conf: set S to be in UNPACKDIR rather than WORKDIR

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

This transitions most of the recipes to have their sources in UNPACKDIR, which over time will allow more simple and logical source code handling in various pieces of the Yocto project.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 780de10ba35..0fe5c14f836 100644
@@ -411,7 +411,7 @@ UNPACKDIR ??= "${WORKDIR}/sources"
 BB_GIT_DEFAULT_DESTSUFFIX = "${BP}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/sysroots"
Signature · 1 line
2.39.5
#5 lore raw

RFC PATCH 4/9 gcc/clang: set S to be in UNPACKDIR

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

This and some further commits allows removing the 'backwards compatibility magic' in do_unpack that moves unpacked sources to where S is set to.

---
 meta/recipes-devtools/clang/common.inc          | 3 ++-
 meta/recipes-devtools/gcc/gcc-15.1.inc          | 3 ++-
 meta/recipes-devtools/gcc/gcc-common.inc        | 3 ++-
 meta/recipes-devtools/gcc/gcc-shared-source.inc | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)
meta/recipes-devtools/clang/common.inc +2 -1
index 5244298dfb1..0684e648ccc 100644
@@ -63,7 +63,8 @@ SRC_URI = "\
 # Fallback to no-PIE if not set
 GCCPIE ??= ""
 
-S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/${SOURCEDIR}"
+UNPACKDIR = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/sources"
+S = "${UNPACKDIR}/${SOURCEDIR}"
 B ?= "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
 
 # We need to ensure that for the shared work directory, the do_patch signatures match
meta/recipes-devtools/gcc/gcc-15.1.inc +2 -1
index 18f8cae5ca2..af29db8e5b8 100644
@@ -75,7 +75,8 @@ SRC_URI = "${BASEURI} \
            file://0026-fix-incorrect-preprocessor-line-numbers.patch \
 "
 
-S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
+UNPACKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/sources"
+S = "${UNPACKDIR}/${SOURCEDIR}"
 B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
 
 # Language Overrides
meta/recipes-devtools/gcc/gcc-common.inc +2 -1
index de559eb9c3f..8d95698743b 100644
@@ -104,7 +104,8 @@ MIRRORS =+ "\
 gcclibdir = "${libdir}/gcc"
 BINV = "${PV}"
 #S = "${WORKDIR}/gcc-${PV}"
-S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
+UNPACKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/sources"
+S = "${UNPACKDIR}/gcc-${PV}"
 
 B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
 
meta/recipes-devtools/gcc/gcc-shared-source.inc +2 -2
index 03f520b0933..c01410b47ad 100644
@@ -16,6 +16,6 @@ do_deploy_source_date_epoch () {
 	sde_file=${SDE_FILE}
 	sde_file=${sde_file#${WORKDIR}/}
 	mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE})
-	cp -p $(dirname ${S})/$sde_file ${SDE_DEPLOYDIR}
-	cp -p $(dirname ${S})/$sde_file ${SDE_FILE}
+	cp -p $(dirname ${UNPACKDIR})/$sde_file ${SDE_DEPLOYDIR}
+	cp -p $(dirname ${UNPACKDIR})/$sde_file ${SDE_FILE}
 }
Signature · 1 line
2.39.5
#6 lore raw

RFC PATCH 5/9 meta: set S to be in UNPACKDIR in recipes that explicitly set S

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb       | 2 +-
 meta-selftest/recipes-test/devtool/devtool-test-ignored.bb      | 2 +-
 meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb   | 2 +-
 .../recipes-test/devtool/devtool-test-long-filename.bb          | 2 +-
 meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb     | 2 +-
 meta-selftest/recipes-test/devtool/devtool-test-subdir.bb       | 2 +-
 .../recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb         | 2 +-
 .../devtool/devtool-upgrade-test1_1.5.3.bb.upgraded             | 2 +-
 .../recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb         | 2 +-
 .../devtool/devtool-upgrade-test3_1.5.3.bb.upgraded             | 2 +-
 .../recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb         | 2 +-
 .../devtool/devtool-upgrade-test4_1.5.3.bb.upgraded             | 2 +-
 meta-selftest/recipes-test/selftest-ed/selftest-ed_1.20.2.bb    | 2 +-
 meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb    | 2 +-
 meta/classes-recipe/barebox.bbclass                             | 2 +-
 meta/classes-recipe/pypi.bbclass                                | 2 +-
 meta/recipes-bsp/barebox/barebox-tools.bb                       | 2 +-
 meta/recipes-bsp/grub/grub-efi_2.12.bb                          | 2 +-
 meta/recipes-connectivity/bluez5/bluez5.inc                     | 2 +-
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb | 2 +-
 meta/recipes-core/base-passwd/base-passwd_3.6.7.bb              | 2 +-
 meta/recipes-core/gettext/gettext-minimal-native_0.23.1.bb      | 2 +-
 meta/recipes-core/glib-2.0/glib.inc                             | 2 +-
 meta/recipes-core/glibc/ldconfig-native_2.12.1.bb               | 2 +-
 meta/recipes-core/netbase/netbase_6.5.bb                        | 2 +-
 meta/recipes-core/sysvinit/sysvinit_3.14.bb                     | 2 +-
 meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb         | 2 +-
 meta/recipes-devtools/chrpath/chrpath_0.18.bb                   | 2 +-
 .../docbook-xml/docbook-xsl-stylesheets_1.79.1.bb               | 2 +-
 meta/recipes-devtools/expect/expect_5.45.4.bb                   | 2 +-
 meta/recipes-devtools/git/git_2.49.0.bb                         | 2 +-
 meta/recipes-devtools/go/go-binary-native_1.24.3.bb             | 2 +-
 meta/recipes-devtools/go/go-common.inc                          | 2 +-
 meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb        | 2 +-
 meta/recipes-devtools/patch/patch.inc                           | 2 +-
 meta/recipes-devtools/perl-cross/perlcross_1.6.2.bb             | 2 +-
 meta/recipes-devtools/perl/libmodule-build-perl_0.4234.bb       | 2 +-
 meta/recipes-devtools/perl/libtest-fatal-perl_0.017.bb          | 2 +-
 meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb       | 2 +-
 meta/recipes-devtools/perl/libtest-warnings-perl_0.038.bb       | 2 +-
 meta/recipes-devtools/perl/libtry-tiny-perl_0.32.bb             | 2 +-
 meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb           | 2 +-
 meta/recipes-devtools/perl/libxml-simple-perl_2.25.bb           | 2 +-
 meta/recipes-devtools/python/python3-babel_2.17.0.bb            | 2 +-
 meta/recipes-devtools/python/python3-dbus_1.4.0.bb              | 2 +-
 meta/recipes-devtools/python/python3-maturin_1.8.6.bb           | 2 +-
 meta/recipes-devtools/python/python3-numpy_2.2.6.bb             | 2 +-
 meta/recipes-devtools/python/python3-pycairo_1.28.0.bb          | 2 +-
 meta/recipes-devtools/python/python3-pygobject_3.52.3.bb        | 2 +-
 meta/recipes-devtools/python/python3-scons_4.9.1.bb             | 2 +-
 meta/recipes-devtools/python/python3_3.13.4.bb                  | 2 +-
 meta/recipes-devtools/rust/rust-source.inc                      | 2 +-
 meta/recipes-devtools/tcltk/tcl_9.0.1.bb                        | 2 +-
 meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb                     | 2 +-
 meta/recipes-extended/pam/libpam_1.7.0.bb                       | 2 +-
 meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb         | 2 +-
 meta/recipes-extended/perl/libtimedate-perl_2.30.bb             | 2 +-
 meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb | 2 +-
 meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb         | 2 +-
 meta/recipes-extended/perl/libxml-sax-perl_1.02.bb              | 2 +-
 meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb          | 2 +-
 meta/recipes-extended/timezone/timezone.inc                     | 2 +-
 meta/recipes-extended/unzip/unzip_6.0.bb                        | 2 +-
 meta/recipes-extended/zip/zip_3.0.bb                            | 2 +-
 meta/recipes-gnome/gnome/gconf_3.2.6.bb                         | 2 +-
 meta/recipes-gnome/gtk+/gtk+3_3.24.43.bb                        | 2 +-
 meta/recipes-gnome/gtk+/gtk4_4.18.5.bb                          | 2 +-
 meta/recipes-graphics/libsdl2/libsdl2_2.32.6.bb                 | 2 +-
 meta/recipes-graphics/libva/libva.inc                           | 2 +-
 meta/recipes-graphics/mesa/libglu_9.0.3.bb                      | 2 +-
 meta/recipes-graphics/mesa/mesa-gl.bb                           | 2 +-
 meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb       | 2 +-
 meta/recipes-graphics/xorg-font/xorg-font-common.inc            | 2 +-
 meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb           | 2 +-
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc              | 2 +-
 meta/recipes-graphics/xorg-util/xorg-util-common.inc            | 2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc             | 2 +-
 meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc   | 2 +-
 meta/recipes-kernel/perf/perf.bb                                | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.2.bb  | 2 +-
 .../gstreamer/gstreamer1.0-plugins-bad_1.26.2.bb                | 2 +-
 .../gstreamer/gstreamer1.0-plugins-base_1.26.2.bb               | 2 +-
 .../gstreamer/gstreamer1.0-plugins-good_1.26.2.bb               | 2 +-
 .../gstreamer/gstreamer1.0-plugins-ugly_1.26.2.bb               | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.2.bb | 2 +-
 .../gstreamer/gstreamer1.0-rtsp-server_1.26.2.bb                | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.2.bb  | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.2.bb        | 2 +-
 meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb   | 2 +-
 meta/recipes-multimedia/libsndfile/libsndfile1_1.2.2.bb         | 2 +-
 meta/recipes-support/appstream/appstream_1.0.5.bb               | 2 +-
 meta/recipes-support/boost/boost-1.88.0.inc                     | 2 +-
 .../recipes-support/ca-certificates/ca-certificates_20250419.bb | 2 +-
 meta/recipes-support/consolekit/consolekit_0.4.6.bb             | 2 +-
 meta/recipes-support/enchant/enchant2_2.8.6.bb                  | 2 +-
 meta/recipes-support/icu/icu_77-1.bb                            | 2 +-
 meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb       | 2 +-
 meta/recipes-support/libcheck/libcheck_0.15.2.bb                | 2 +-
 meta/recipes-support/libevent/libevent_2.1.12.bb                | 2 +-
 meta/recipes-support/libfm/libfm-extra_1.3.2.bb                 | 2 +-
 meta/recipes-support/libmpc/libmpc_1.3.1.bb                     | 2 +-
 meta/recipes-support/libpcre/libpcre2_10.45.bb                  | 2 +-
 meta/recipes-support/libpcre/libpcre_8.45.bb                    | 2 +-
 meta/recipes-support/libsoup/libsoup_3.6.5.bb                   | 2 +-
 meta/recipes-support/liburcu/liburcu_0.15.3.bb                  | 2 +-
 meta/recipes-support/libusb/libusb1_1.0.29.bb                   | 2 +-
 meta/recipes-support/libxslt/libxslt_1.1.43.bb                  | 2 +-
 meta/recipes-support/libyaml/libyaml_0.2.5.bb                   | 2 +-
 meta/recipes-support/sqlite/sqlite3.inc                         | 2 +-
 109 files changed, 109 insertions(+), 109 deletions(-)
meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb +1 -1
index 9a136f29788..f6555a31dd2 100644
@@ -12,7 +12,7 @@ SRCREV = "d3d096eda182644868f8e7458dcfa538ff637db3"
 SRCREV_FORMAT .= "_hello-lib"
 SRCREV_hello-lib = "59c84574e844617043cf337bc8fa537cf87ad8ae"
 
-S = "${WORKDIR}/rust"
+S = "${UNPACKDIR}/rust"
 
 inherit cargo cargo-update-recipe-crates ptest-cargo
 
meta-selftest/recipes-test/devtool/devtool-test-ignored.bb +1 -1
index 6a3d58c8841..c7740eb118d 100644
@@ -4,6 +4,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "file://${BPN}.tar.gz \
            file://${BPN}.patch"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb +1 -1
index d0fd6979783..03e082e83fb 100644
@@ -12,7 +12,7 @@ SRC_URI:append:class-native = " file://file3"
 SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"
 SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e"
 
-S = "${WORKDIR}/syslinux-${PV}"
+S = "${UNPACKDIR}/syslinux-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 BBCLASSEXTEND = "native"
meta-selftest/recipes-test/devtool/devtool-test-long-filename.bb +1 -1
index 3ec22cae7fa..3653403a2e6 100644
@@ -4,6 +4,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "file://${BPN}.tar.gz \
            file://0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb +1 -1
index e25b3d97473..f6960320dbe 100644
@@ -8,7 +8,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-0.4.tar.gz
            "
 UPSTREAM_VERSION_UNKNOWN = "1"
 
-S = "${WORKDIR}/xrestop-0.4"
+S = "${UNPACKDIR}/xrestop-0.4"
 
 SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b"
 SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257"
meta-selftest/recipes-test/devtool/devtool-test-subdir.bb +1 -1
index 3f6956524ba..966142431b2 100644
@@ -4,6 +4,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "file://devtool-test-subdir.tar.gz \
            file://testfile;subdir=${BPN}"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb +1 -1
index fee5bee7398..254ea457085 100644
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756
 
 PR = "r5"
 
-S = "${WORKDIR}/pv-${PV}"
+S = "${UNPACKDIR}/pv-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded +1 -1
index d75df0c8c7e..f80744e14be 100644
@@ -11,7 +11,7 @@ RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
 SRC_URI[sha256sum] = "9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
 
-S = "${WORKDIR}/pv-${PV}"
+S = "${UNPACKDIR}/pv-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb +1 -1
index 69c0d351ec8..0501e2025f4 100644
@@ -8,7 +8,7 @@ RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
 SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
 
-S = "${WORKDIR}/pv-${PV}"
+S = "${UNPACKDIR}/pv-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded +1 -1
index 3ce7e85e101..2ba7c8213e4 100644
@@ -7,7 +7,7 @@ SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz"
 UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
-S = "${WORKDIR}/pv-${PV}"
+S = "${UNPACKDIR}/pv-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb +1 -1
index 9abf80e6ed5..71c03653f73 100644
@@ -14,7 +14,7 @@ SRC_URI[sha512sum] = "32efe7071a363f547afc74e96774f711795edda1d2702823a347d0f995
 
 PR = "r5"
 
-S = "${WORKDIR}/pv-${PV}"
+S = "${UNPACKDIR}/pv-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded +1 -1
index cd2a0842f4d..0bc9f71da6a 100644
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07
 SRC_URI[sha384sum] = "218c8d2d097aeba5310be759bc20573f18ffa0b11701eac6dd2e7e14ddf13c6e0e094ca7ca026eaa05ef92a056402e36"
 SRC_URI[sha512sum] = "1cf9d7376fceefcd594d0a8b591afc8e11ce89f7210d10ad74438974ecebe9cc5d9ec4db9cc79e0566bfd2b0278c0cc263c07547803e7536432cd1ffd32d8a45"
 
-S = "${WORKDIR}/pv-${PV}"
+S = "${UNPACKDIR}/pv-${PV}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/selftest-ed/selftest-ed_1.20.2.bb +1 -1
index d4232b72ee4..e183d2d4e55 100644
@@ -21,7 +21,7 @@ UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
 
 SRC_URI[sha256sum] = "65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523"
 
-S = "${WORKDIR}/ed-${PV}"
+S = "${UNPACKDIR}/ed-${PV}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb +1 -1
index acd1ce5907e..6b8ce6e23b6 100644
@@ -22,7 +22,7 @@ UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
 
 SRC_URI[sha256sum] = "d6d0c7192b02b0519c902a93719053e865ade5a784a3b327d93d888457b23c4b"
 
-S = "${WORKDIR}/ed-${PV}"
+S = "${UNPACKDIR}/ed-${PV}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
meta/classes-recipe/barebox.bbclass +1 -1
index a562dce1690..ece8fb64856 100644
@@ -14,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "bison-native flex-native lz4-native"
 
-S = "${WORKDIR}/barebox-${PV}"
+S = "${UNPACKDIR}/barebox-${PV}"
 B = "${WORKDIR}/build"
 
 require conf/image-uefi.conf
meta/classes-recipe/pypi.bbclass +1 -1
index b0bc167cdfa..eb30004a0fc 100644
@@ -41,7 +41,7 @@ PYPI_SRC_URI ?= "${@pypi_src_uri(d)}"
 HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/"
 SECTION = "devel/python"
 SRC_URI:prepend = "${PYPI_SRC_URI} "
-S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"
+S = "${UNPACKDIR}/${PYPI_PACKAGE}-${PV}"
 
 # Replace any '_' characters in the pypi URI with '-'s to follow the PyPi website naming conventions
 UPSTREAM_CHECK_PYPI_PACKAGE ?= "${@pypi_normalize(d)}"
meta/recipes-bsp/barebox/barebox-tools.bb +1 -1
index 2a117bc9c08..e519796c1d2 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only"
 
 DEPENDS = "bison-native flex-native libusb1"
 
-S = "${WORKDIR}/barebox-${PV}"
+S = "${UNPACKDIR}/barebox-${PV}"
 B = "${WORKDIR}/build"
 
 inherit pkgconfig
meta/recipes-bsp/grub/grub-efi_2.12.bb +1 -1
index 5b435245ee6..6354b43989c 100644
@@ -11,7 +11,7 @@ SRC_URI += " \
            file://cfg \
           "
 
-S = "${WORKDIR}/grub-${PV}"
+S = "${UNPACKDIR}/grub-${PV}"
 
 # Determine the target arch for the grub modules
 python __anonymous () {
meta/recipes-connectivity/bluez5/bluez5.inc +1 -1
index 7bae968094f..287ebf658ef 100644
@@ -69,7 +69,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
            file://0001-bluez5-disable-aics-tests.patch \
            "
-S = "${WORKDIR}/bluez-${PV}"
+S = "${UNPACKDIR}/bluez-${PV}"
 
 CVE_PRODUCT = "bluez"
 
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb +1 -1
index ac99d0db498..6dc76494f7c 100644
@@ -19,7 +19,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
            "
 SRC_URI[sha256sum] = "912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a"
 
-S = "${WORKDIR}/wpa_supplicant-${PV}"
+S = "${UNPACKDIR}/wpa_supplicant-${PV}"
 
 inherit pkgconfig systemd
 
meta/recipes-core/base-passwd/base-passwd_3.6.7.bb +1 -1
index 3d5247ee87b..177927d6748 100644
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "cf869870fed7862b57bfa9e99cd5cd6f365e2349705a1b65af7fc18262
 # so we check the latest upstream from a directory that does get updated
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/"
 
-S = "${WORKDIR}/work"
+S = "${UNPACKDIR}/work"
 
 PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
 PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux"
meta/recipes-core/gettext/gettext-minimal-native_0.23.1.bb +1 -1
index e443b6b34fa..941896ec48d 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=4bd090a20bfcd1a18f1f79837b5e
 
 inherit native
 
-S = "${WORKDIR}/gettext-${PV}"
+S = "${UNPACKDIR}/gettext-${PV}"
 
 python get_aclocal_files() {
     fpath = oe.path.join(d.getVar("S"), "/gettext-tools/m4/Makefile.am")
meta/recipes-core/glib-2.0/glib.inc +1 -1
index 38e75aab618..ba7763c8417 100644
@@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
 
 inherit meson gettext gi-docgen pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages gobject-introspection-data
 
-S = "${WORKDIR}/glib-${PV}"
+S = "${UNPACKDIR}/glib-${PV}"
 
 GIDOCGEN_MESON_OPTION = "documentation"
 
meta/recipes-core/glibc/ldconfig-native_2.12.1.bb +1 -1
index 9ca95d1e52f..cd091d0d87f 100644
@@ -24,7 +24,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${P}:"
 
 inherit native
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${UNPACKDIR}/${PN}-${PV}"
 
 do_compile () {
 	$CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
meta/recipes-core/netbase/netbase_6.5.bb +1 -1
index d273dbfe663..c6cf798421f 100644
@@ -22,4 +22,4 @@ do_install () {
 	install -m 0644 ${S}/etc/ethertypes ${D}${sysconfdir}/ethertypes
 }
 
-S = "${WORKDIR}/netbase"
+S = "${UNPACKDIR}/netbase"
meta/recipes-core/sysvinit/sysvinit_3.14.bb +1 -1
index 521eda0bfba..d4bb797624f 100644
@@ -20,7 +20,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \
            "
 SRC_URI[sha256sum] = "c90874b8c054a35991fb8c4d30c443ed1e9b1815ff6165c7b483f558be4e4b53"
 
-S = "${WORKDIR}/sysvinit-${PV}"
+S = "${UNPACKDIR}/sysvinit-${PV}"
 
 inherit update-alternatives features_check github-releases
 DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt"
meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb +1 -1
index ec04c1d3843..288975fb00f 100644
@@ -5,7 +5,7 @@ require util-linux.inc
 
 inherit autotools gettext pkgconfig
 
-S = "${WORKDIR}/util-linux-${PV}"
+S = "${UNPACKDIR}/util-linux-${PV}"
 
 EXTRA_AUTORECONF += "--exclude=gtkdocize"
 EXTRA_OECONF += "--disable-all-programs --enable-libuuid"
meta/recipes-devtools/chrpath/chrpath_0.18.bb +1 -1
index 653c1115d0f..3d89fd2c92b 100644
@@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
 SRC_URI[sha256sum] = "f09c49f0618660ca11fc6d9580ddde904c7224d4c6d0f6f2d1f9bcdc9102c9aa"
 
 inherit autotools
-S = "${WORKDIR}/chrpath"
+S = "${UNPACKDIR}/chrpath"
 
 # We don't have a staged chrpath-native for ensuring our binary is
 # relocatable, so use the one we've just built
meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb +1 -1
index ea81bf95075..7e4730b5e9d 100644
@@ -13,7 +13,7 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/
 # Reject versions ending in .0 as those are release candidates
 UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/"
 
-S = "${WORKDIR}/docbook-xsl-${PV}"
+S = "${UNPACKDIR}/docbook-xsl-${PV}"
 
 inherit allarch xmlcatalog
 
meta/recipes-devtools/expect/expect_5.45.4.bb +1 -1
index e3ecf4b25e8..48b5b0d934b 100644
@@ -37,7 +37,7 @@ SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/expect/files/Expect/"
 UPSTREAM_CHECK_REGEX = "/Expect/(?P<pver>(\d+[\.\-_]*)+)/"
 
-S = "${WORKDIR}/${BPN}${PV}"
+S = "${UNPACKDIR}/${BPN}${PV}"
 
 EXTRA_AUTORECONF += "--exclude=aclocal"
 
meta/recipes-devtools/git/git_2.49.0.bb +1 -1
index 3538170d08b..e1b501d62b1 100644
@@ -16,7 +16,7 @@ SRC_URI:append:class-nativesdk = " \
            file://environment.d-git.sh \
            "
 
-S = "${WORKDIR}/git-${PV}"
+S = "${UNPACKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "\
 	file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1 \
meta/recipes-devtools/go/go-binary-native_1.24.3.bb +1 -1
index af56dc9111b..b1a83e4213b 100644
@@ -18,7 +18,7 @@ UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
 
 CVE_PRODUCT = "golang:go"
 
-S = "${WORKDIR}/go"
+S = "${UNPACKDIR}/go"
 
 inherit goarch native
 
meta/recipes-devtools/go/go-common.inc +1 -1
index ca8469dbd91..20386f09991 100644
@@ -15,7 +15,7 @@ LICENSE = "BSD-3-Clause"
 inherit goarch
 
 SRC_URI = "https://golang.org/dl/go${PV}.src.tar.gz;name=main"
-S = "${WORKDIR}/go"
+S = "${UNPACKDIR}/go"
 B = "${S}"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar"
 
meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb +1 -1
index 2e39a1e1d76..de556a5d81c 100644
@@ -7,7 +7,7 @@ SRC_URI += "file://0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.pat
 
 inherit nativesdk
 
-S = "${WORKDIR}/libtool-${PV}"
+S = "${UNPACKDIR}/libtool-${PV}"
 FILES:${PN} += "${datadir}/libtool/*"
 
 do_install () {
meta/recipes-devtools/patch/patch.inc +1 -1
index a12d426b2cd..44d3046fd87 100644
@@ -6,7 +6,7 @@ SECTION = "utils"
 HOMEPAGE = "http://savannah.gnu.org/projects/patch/"
 
 SRC_URI = "${GNU_MIRROR}/patch/patch-${PV}.tar.gz"
-S = "${WORKDIR}/patch-${PV}"
+S = "${UNPACKDIR}/patch-${PV}"
 
 inherit autotools update-alternatives
 
meta/recipes-devtools/perl-cross/perlcross_1.6.2.bb +1 -1
index 42ba15a572e..debf2717ce9 100644
@@ -20,7 +20,7 @@ GITHUB_BASE_URI = "https://github.com/arsv/perl-cross/releases/"
 
 SRC_URI[perl-cross.sha256sum] = "131f7496152ee32067dbac2bc9b44b2f582fc778140e545701b3b2faee782f1d"
 
-S = "${WORKDIR}/perl-cross-${PV}"
+S = "${UNPACKDIR}/perl-cross-${PV}"
 
 do_configure () {
 }
meta/recipes-devtools/perl/libmodule-build-perl_0.4234.bb +1 -1
index b57618724d1..b27a8c15e6c 100644
@@ -18,7 +18,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \
            "
 SRC_URI[sha256sum] = "66aeac6127418be5e471ead3744648c766bd01482825c5b66652675f2bc86a8f"
 
-S = "${WORKDIR}/Module-Build-${PV}"
+S = "${UNPACKDIR}/Module-Build-${PV}"
 
 inherit cpan_build ptest-perl
 
meta/recipes-devtools/perl/libtest-fatal-perl_0.017.bb +1 -1
index 1c3a7e5136e..eae128b0ccc 100644
@@ -13,7 +13,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/R/RJ/RJBS/Test-Fatal-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "37dfffdafb84b762efe96b02fb2aa41f37026c73e6b83590db76229697f3c4a6"
 
-S = "${WORKDIR}/Test-Fatal-${PV}"
+S = "${UNPACKDIR}/Test-Fatal-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb +1 -1
index 79a06170e02..0045e575af8 100644
@@ -19,7 +19,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/H/HA/${CPAN_AUTHOR}/${CPAN_NAME}
 
 SRC_URI[sha256sum] = "923ffdc78fcba96609753e4bae26b0ba0186893de4a63cd5236e012c7c90e208"
 
-S = "${WORKDIR}/${CPAN_NAME}-${PV}"
+S = "${UNPACKDIR}/${CPAN_NAME}-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-devtools/perl/libtest-warnings-perl_0.038.bb +1 -1
index 656b38f2d84..2eccf409991 100644
@@ -17,7 +17,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETHER/Test-Warnings-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "3da27e003a3c3cafed3c09b42be05cf9bdbff0bee5c8590a731b02853880a273"
 
-S = "${WORKDIR}/Test-Warnings-${PV}"
+S = "${UNPACKDIR}/Test-Warnings-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-devtools/perl/libtry-tiny-perl_0.32.bb +1 -1
index d0714695b8a..e924b3bd640 100644
@@ -13,7 +13,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETHER/Try-Tiny-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "ef2d6cab0bad18e3ab1c4e6125cc5f695c7e459899f512451c8fa3ef83fa7fc0"
 
-S = "${WORKDIR}/Try-Tiny-${PV}"
+S = "${UNPACKDIR}/Try-Tiny-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb +1 -1
index 1f312b00e1c..b6d28c4bb3a 100644
@@ -12,7 +12,7 @@ SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz \
 
 SRC_URI[sha256sum] = "ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8"
 
-S = "${WORKDIR}/XML-Parser-${PV}"
+S = "${UNPACKDIR}/XML-Parser-${PV}"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC='${CC}' LD='${CCLD}' FULL_AR='${AR}'"
 
meta/recipes-devtools/perl/libxml-simple-perl_2.25.bb +1 -1
index dff0f84aabc..a4f08433e74 100644
@@ -14,7 +14,7 @@ SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Simple-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "531fddaebea2416743eb5c4fdfab028f502123d9a220405a4100e68fc480dbf8"
 
-S = "${WORKDIR}/XML-Simple-${PV}"
+S = "${UNPACKDIR}/XML-Simple-${PV}"
 
 EXTRA_PERLFLAGS = "-I ${PERLHOSTLIB}"
 
meta/recipes-devtools/python/python3-babel_2.17.0.bb +1 -1
index f7ffbccdac2..adffaa044ca 100644
@@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf
 
 inherit pypi setuptools3
 
-S = "${WORKDIR}/babel-${PV}"
+S = "${UNPACKDIR}/babel-${PV}"
 
 CLEANBROKEN = "1"
 
meta/recipes-devtools/python/python3-dbus_1.4.0.bb +1 -1
index 057c97f6564..2854eda30a0 100644
@@ -9,7 +9,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.ta
 
 SRC_URI[sha256sum] = "c36b28f10ffcc8f1f798aca973bcc132f91f33eb9b6b8904381b4077766043d5"
 
-S = "${WORKDIR}/dbus-python-${PV}"
+S = "${UNPACKDIR}/dbus-python-${PV}"
 
 inherit setuptools3-base meson pkgconfig
 
meta/recipes-devtools/python/python3-maturin_1.8.6.bb +1 -1
index ab509331c36..f80bf6051f5 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \
 SRC_URI += "file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.167"
 SRC_URI[sha256sum] = "0e0dc2e0bfaa2e1bd238e0236cf8a2b7e2250ccaa29c1aa8d0e61fa664b0289d"
 
-S = "${WORKDIR}/maturin-${PV}"
+S = "${UNPACKDIR}/maturin-${PV}"
 
 CFLAGS += "-ffile-prefix-map=${CARGO_HOME}=${TARGET_DBGSRC_DIR}/cargo_home"
 
meta/recipes-devtools/python/python3-numpy_2.2.6.bb +1 -1
index 10468d68503..25bab41f62f 100644
@@ -19,7 +19,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
 
 inherit pkgconfig ptest python_mesonpy github-releases cython
 
-S = "${WORKDIR}/numpy-${PV}"
+S = "${UNPACKDIR}/numpy-${PV}"
 
 PACKAGECONFIG[svml] = "-Ddisable-svml=false,-Ddisable-svml=true"
 
meta/recipes-devtools/python/python3-pycairo_1.28.0.bb +1 -1
index c610f3eae92..498c4db5869 100644
@@ -15,7 +15,7 @@ GITHUB_BASE_URI = "https://github.com/pygobject/pycairo/releases/"
 
 SRC_URI[sha256sum] = "26ec5c6126781eb167089a123919f87baa2740da2cca9098be8b3a6b91cc5fbc"
 
-S = "${WORKDIR}/pycairo-${PV}"
+S = "${UNPACKDIR}/pycairo-${PV}"
 
 inherit meson pkgconfig python3targetconfig github-releases
 
meta/recipes-devtools/python/python3-pygobject_3.52.3.bb +1 -1
index d0384fcce1f..42b071ca086 100644
@@ -21,7 +21,7 @@ SRCNAME = "pygobject"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.gz"
 SRC_URI[sha256sum] = "00e427d291e957462a8fad659a9f9c8be776ff82a8b76bdf402f1eaeec086d82"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}"
 
meta/recipes-devtools/python/python3-scons_4.9.1.bb +1 -1
index c8496679707..1eac1ce5a9a 100644
@@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "bacac880ba2e86d6a156c116e2f8f2bfa82b257046f3ac2666c85c53c6
 
 inherit pypi python_setuptools_build_meta
 
-S = "${WORKDIR}/scons-${PV}"
+S = "${UNPACKDIR}/scons-${PV}"
 
 RDEPENDS:${PN}:class-target = "\
   python3-core \
meta/recipes-devtools/python/python3_3.13.4.bb +1 -1
index 5b49fee3bff..a5277b3c5ab 100644
@@ -53,7 +53,7 @@ CVE_STATUS[CVE-2023-36632] = "disputed: Not an issue, in fact expected behaviour
 
 PYTHON_MAJMIN = "3.13"
 
-S = "${WORKDIR}/Python-${PV}"
+S = "${UNPACKDIR}/Python-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-devtools/rust/rust-source.inc +1 -1
index 6cb08b7c382..ba205ab681f 100644
@@ -13,7 +13,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 "
 SRC_URI[rust.sha256sum] = "b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266"
 
-RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
+RUSTSRC = "${UNPACKDIR}/rustc-${RUST_VERSION}-src"
 
 UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html"
 UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
meta/recipes-devtools/tcltk/tcl_9.0.1.bb +1 -1
index 485b293768d..70aa9b606c6 100644
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "488fcb6c875a1762e9e8478319b20fbad9a31de475f056aeed94cc54b4
 UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html"
 UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src"
 
-S = "${WORKDIR}/${BPN}${PV}"
+S = "${UNPACKDIR}/${BPN}${PV}"
 
 VER = "${PV}"
 
meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb +1 -1
index 076bbc906c4..225f04be489 100644
@@ -32,7 +32,7 @@ SRC_URI:class-native = "${BASE_SRC_URI}"
 UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html"
 UPSTREAM_CHECK_REGEX = "tcl(?P<pver>8(\.\d+)+)-src"
 
-S = "${WORKDIR}/tcl${PV}"
+S = "${UNPACKDIR}/tcl${PV}"
 
 VER = "${PV}"
 
meta/recipes-extended/pam/libpam_1.7.0.bb +1 -1
index 4abc52bd93b..dea9ff592b6 100644
@@ -31,7 +31,7 @@ DEPENDS = "bison-native flex-native libxml2-native virtual/crypt"
 
 EXTRA_OEMESON = "-Ddocs=disabled -Dsecuredir=${base_libdir}/security"
 
-S = "${WORKDIR}/Linux-PAM-${PV}"
+S = "${UNPACKDIR}/Linux-PAM-${PV}"
 
 inherit meson gettext pkgconfig systemd ptest github-releases
 
meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb +1 -1
index 6e9f8817732..7e167d6e675 100644
@@ -9,7 +9,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Convert-ASN1-${PV}
 
 SRC_URI[sha256sum] = "a628d7c9d390568fb76359975fa03f626ce57f10dc17980e8e3587d7713e4ee7"
 
-S = "${WORKDIR}/Convert-ASN1-${PV}"
+S = "${UNPACKDIR}/Convert-ASN1-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-extended/perl/libtimedate-perl_2.30.bb +1 -1
index 3b681225c2c..7f9f40d9961 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=21;md5=576b7cb41e5e821501a01ed66f0f9
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz"
 
-S = "${WORKDIR}/TimeDate-${PV}"
+S = "${UNPACKDIR}/TimeDate-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb +1 -1
index ae0e5ad08a9..9653cb427b2 100644
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2
 
 UPSTREAM_CHECK_REGEX = "XML\-NamespaceSupport\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb +1 -1
index 8e8be934416..8d97e95e830 100644
@@ -16,7 +16,7 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-Base-${PV}
 
 SRC_URI[sha256sum] = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0"
 
-S = "${WORKDIR}/XML-SAX-Base-${PV}"
+S = "${UNPACKDIR}/XML-SAX-Base-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-extended/perl/libxml-sax-perl_1.02.bb +1 -1
index 218af5c4375..67bdac981dd 100644
@@ -19,7 +19,7 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.
 
 SRC_URI[sha256sum] = "4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a"
 
-S = "${WORKDIR}/XML-SAX-${PV}"
+S = "${UNPACKDIR}/XML-SAX-${PV}"
 
 inherit cpan ptest-perl
 
meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +1 -1
index de5fb3c5433..da3ff908915 100644
@@ -52,7 +52,7 @@ SRC_URI = "http://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
 
 SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d"
 
-S = "${WORKDIR}/tcp_wrappers_${PV}"
+S = "${UNPACKDIR}/tcp_wrappers_${PV}"
 
 CFLAGS += "-std=gnu17"
 
meta/recipes-extended/timezone/timezone.inc +1 -1
index 8f7868f0981..9a5105ffd74 100644
@@ -12,7 +12,7 @@ SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \
            "
 
-S = "${WORKDIR}/tz"
+S = "${UNPACKDIR}/tz"
 
 UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
meta/recipes-extended/unzip/unzip_6.0.bb +1 -1
index b2fed672396..d6289deff75 100644
@@ -43,7 +43,7 @@ CVE_STATUS[CVE-2008-0888] = "fixed-version: Patch from https://bugzilla.redhat.c
 # exclude version 5.5.2 which triggers a false positive
 UPSTREAM_CHECK_REGEX = "unzip(?P<pver>(?!552).+)\.tgz"
 
-S = "${WORKDIR}/unzip60"
+S = "${UNPACKDIR}/unzip60"
 
 # Makefile uses CF_NOOPT instead of CFLAGS.  We lifted the values from
 # Makefile and add CFLAGS.  Optimization will be overriden by unzip
meta/recipes-extended/zip/zip_3.0.bb +1 -1
index 27691bd89a4..0824b30da28 100644
@@ -7,7 +7,7 @@ LICENSE = "Info-ZIP"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
 
 
-S = "${WORKDIR}/zip30"
+S = "${UNPACKDIR}/zip30"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \
            file://fix-security-format.patch \
meta/recipes-gnome/gnome/gconf_3.2.6.bb +1 -1
index 1e29bd9bb07..54666801c56 100644
@@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;na
 SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
 SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"
 
-S = "${WORKDIR}/GConf-${PV}"
+S = "${UNPACKDIR}/GConf-${PV}"
 
 EXTRA_OECONF = "--enable-shared --disable-static \
                 --disable-orbit --with-openldap=no --disable-gtk"
meta/recipes-gnome/gtk+/gtk+3_3.24.43.bb +1 -1
index 15870dcc08b..5892bb31397 100644
@@ -23,7 +23,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            "
 SRC_URI[sha256sum] = "7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7"
 
-S = "${WORKDIR}/gtk+-${PV}"
+S = "${UNPACKDIR}/gtk+-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-gnome/gtk+/gtk4_4.18.5.bb +1 -1
index 85773b11743..6c5ffa5fae1 100644
@@ -40,7 +40,7 @@ UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz"
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz"
 SRC_URI[sha256sum] = "bb5267a062f5936947d34c9999390a674b0b2b0d8aa3472fe0d05e2064955abc"
 
-S = "${WORKDIR}/gtk-${PV}"
+S = "${UNPACKDIR}/gtk-${PV}"
 
 CVE_PRODUCT = "gnome:gtk"
 
meta/recipes-graphics/libsdl2/libsdl2_2.32.6.bb +1 -1
index 75710b962a3..fff757624ab 100644
@@ -23,7 +23,7 @@ PROVIDES = "virtual/libsdl2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz"
 
-S = "${WORKDIR}/SDL2-${PV}"
+S = "${UNPACKDIR}/SDL2-${PV}"
 
 SRC_URI[sha256sum] = "6a7a40d6c2e00016791815e1a9f4042809210bdf10cc78d2c75b45c4f52f93ad"
 
meta/recipes-graphics/libva/libva.inc +1 -1
index 784ab8b79f0..5dda701ed09 100644
@@ -20,7 +20,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/libva-${PV}.tar.bz2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 SRC_URI[sha256sum] = "e3da2250654c8d52b3f59f8cb3f3d8e7fb1a2ee64378dbc400fbc5663de7edb8"
 
-S = "${WORKDIR}/libva-${PV}"
+S = "${UNPACKDIR}/libva-${PV}"
 
 GITHUB_BASE_URI = "https://github.com/intel/libva/releases"
 
meta/recipes-graphics/mesa/libglu_9.0.3.bb +1 -1
index 9e23ff830fc..0e38671e417 100644
@@ -16,7 +16,7 @@ SRC_URI = "https://archive.mesa3d.org/glu/glu-${PV}.tar.xz \
 
 SRC_URI[sha256sum] = "bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f"
 
-S = "${WORKDIR}/glu-${PV}"
+S = "${UNPACKDIR}/glu-${PV}"
 
 DEPENDS = "virtual/libgl"
 
meta/recipes-graphics/mesa/mesa-gl.bb +1 -1
index 2bdabddc287..e2f03c81c45 100644
@@ -4,7 +4,7 @@ SUMMARY += " (OpenGL only, no EGL/GLES)"
 
 PROVIDES = "virtual/libgl virtual/mesa"
 
-S = "${WORKDIR}/mesa-${PV}"
+S = "${UNPACKDIR}/mesa-${PV}"
 
 TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
 
meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb +1 -1
index 584a19a42a4..7d70c37c466 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://github.com/liberationfonts/liberation-fonts/files/7261482/lib
 SRC_URI[sha256sum] = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0"
 GITHUB_BASE_URI = "https://github.com/liberationfonts/liberation-fonts/releases"
 
-S = "${WORKDIR}/liberation-fonts-ttf-${PV}"
+S = "${UNPACKDIR}/liberation-fonts-ttf-${PV}"
 
 inherit allarch fontcache github-releases
 
meta/recipes-graphics/xorg-font/xorg-font-common.inc +1 -1
index edf7cf76421..a11b8e8ab25 100644
@@ -11,7 +11,7 @@ XORG_PN = "${BPN}"
 
 SRC_URI_EXT = "bz2"
 SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.${SRC_URI_EXT}"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${UNPACKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig features_check
 
meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +1 -1
index e51e3fbc3ad..28010f5f227 100644
@@ -19,7 +19,7 @@ inherit allarch features_check
 # The font-alias requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
 
-S = "${WORKDIR}/misc"
+S = "${UNPACKDIR}/misc"
 
 PACKAGES = "${PN}"
 FILES:${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
index 15c7ecf7826..ba7fcb73044 100644
@@ -10,7 +10,7 @@ XORG_EXT ?= "tar.xz"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.${XORG_EXT}"
 
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${UNPACKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools features_check pkgconfig
 
meta/recipes-graphics/xorg-util/xorg-util-common.inc +1 -1
index a4c85a4ebcd..198921116d7 100644
@@ -8,6 +8,6 @@ XORG_PN = "${BPN}"
 
 SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz"
 
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${UNPACKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1
index 7645f11c146..0dece7bba3e 100644
@@ -30,7 +30,7 @@ impossible or difficult to exploit. There is currently no upstream patch \
 available for this flaw."
 CVE_STATUS[CVE-2022-3553] = "cpe-incorrect: This is specific to XQuartz, which is the macOS X server port"
 
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${UNPACKDIR}/${XORG_PN}-${PV}"
 
 inherit meson pkgconfig
 
meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +1 -1
index 3a8d32e7857..1f5c47f4533 100644
@@ -60,7 +60,7 @@ KORG_ARCHIVE_COMPRESSION ?= "xz"
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.${KORG_ARCHIVE_COMPRESSION}"
 UPSTREAM_CHECK_URI = "https://www.kernel.org/"
 
-S = "${WORKDIR}/linux-${PV}"
+S = "${UNPACKDIR}/linux-${PV}"
 
 EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
 
meta/recipes-kernel/perf/perf.bb +1 -1
index 6cc5499d8dd..b30ae30e9d1 100644
@@ -66,7 +66,7 @@ include ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perf-perl.inc', '', d)}
 
 inherit kernelsrc
 
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 
 # The LDFLAGS is required or some old kernels fails due missing
 # symbols and this is preferred than requiring patches to every old
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.2.bb +1 -1
index 88cc0b530d2..e3410f09075 100644
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
 SRC_URI[sha256sum] = "2eceba9cae4c495bb4ea134c27f010356036f1fa1972db5f54833f5f6c9f8db0"
 
-S = "${WORKDIR}/gst-libav-${PV}"
+S = "${UNPACKDIR}/gst-libav-${PV}"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.2.bb +1 -1
index e0329cd0047..b311286cc27 100644
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
            "
 SRC_URI[sha256sum] = "cb116bfc3722c2de53838899006cafdb3c7c0bc69cd769b33c992a8421a9d844"
 
-S = "${WORKDIR}/gst-plugins-bad-${PV}"
+S = "${UNPACKDIR}/gst-plugins-bad-${PV}"
 
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.2.bb +1 -1
index dc703569404..c264a14ee6b 100644
@@ -13,7 +13,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
            "
 SRC_URI[sha256sum] = "f4b9fc0be852fe5f65401d18ae6218e4aea3ff7a3c9f8d265939b9c4704915f7"
 
-S = "${WORKDIR}/gst-plugins-base-${PV}"
+S = "${UNPACKDIR}/gst-plugins-base-${PV}"
 
 DEPENDS += "iso-codes util-linux zlib"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.2.bb +1 -1
index 467ccd9893d..7a81a29d958 100644
@@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go
 
 SRC_URI[sha256sum] = "d864b9aec28c3a80895468c909dd303e5f22f92d6e2b1137f80e2a1454584339"
 
-S = "${WORKDIR}/gst-plugins-good-${PV}"
+S = "${UNPACKDIR}/gst-plugins-good-${PV}"
 
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.2.bb +1 -1
index 106fea361cb..fcd97e42450 100644
@@ -17,7 +17,7 @@ SRC_URI = " \
 
 SRC_URI[sha256sum] = "ec2d7556c6b8c2694f9b918ab9c4c6c998fb908c6b6a6ad57441702dad14ce73"
 
-S = "${WORKDIR}/gst-plugins-ugly-${PV}"
+S = "${UNPACKDIR}/gst-plugins-ugly-${PV}"
 
 DEPENDS += "gstreamer1.0-plugins-base"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.2.bb +1 -1
index 50ff21c1ef1..3c60e09d853 100644
@@ -15,7 +15,7 @@ RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 
 PNREAL = "gst-python"
 
-S = "${WORKDIR}/${PNREAL}-${PV}"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 
 EXTRA_OEMESON += "\
     -Dtests=disabled \
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.2.bb +1 -1
index 85b56155505..51085bb3fa8 100644
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.x
 
 SRC_URI[sha256sum] = "f942b2a499ed6d161222868db0e80de45297b4777ff189c6fb890bde698c2dc3"
 
-S = "${WORKDIR}/${PNREAL}-${PV}"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.2.bb +1 -1
index 7079641bc43..9b8aaf09df6 100644
@@ -13,7 +13,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.x
 
 SRC_URI[sha256sum] = "0e24194236ed3b7f06f90e90efdf17f3f5ee39132e20081189a6c7690601051a"
 
-S = "${WORKDIR}/${REALPN}-${PV}"
+S = "${UNPACKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 
 inherit meson pkgconfig features_check upstream-version-is-even
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.2.bb +1 -1
index d288236abc9..a921e39144c 100644
@@ -13,7 +13,7 @@ inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection p
 LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
-S = "${WORKDIR}/gstreamer-${PV}"
+S = "${UNPACKDIR}/gstreamer-${PV}"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
            file://run-ptest \
meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb +1 -1
index 29d48fd333c..819096878b8 100644
@@ -16,7 +16,7 @@ CVE_PRODUCT = "libsamplerate"
 
 GITHUB_BASE_URI = "https://github.com/libsndfile/libsamplerate/releases"
 
-S = "${WORKDIR}/libsamplerate-${PV}"
+S = "${UNPACKDIR}/libsamplerate-${PV}"
 
 inherit autotools pkgconfig github-releases
 
meta/recipes-multimedia/libsndfile/libsndfile1_1.2.2.bb +1 -1
index 63c1570621b..0ec40dda7aa 100644
@@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
 
 CVE_PRODUCT = "libsndfile"
 
-S = "${WORKDIR}/libsndfile-${PV}"
+S = "${UNPACKDIR}/libsndfile-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}"
 PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
meta/recipes-support/appstream/appstream_1.0.5.bb +1 -1
index 3e4f8708d8d..bb293f76e2d 100644
@@ -32,7 +32,7 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "ce0ed29e89abd5f0cf790ea87d792f1967c3413060beb30e63a979578d975121"
 
-S = "${WORKDIR}/AppStream-${PV}"
+S = "${UNPACKDIR}/AppStream-${PV}"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 
meta/recipes-support/boost/boost-1.88.0.inc +1 -1
index 917f1a9600f..96bd986f6a9 100644
@@ -17,4 +17,4 @@ SRC_URI[sha256sum] = "46d9d2c06637b219270877c9e16155cbd015b6dc84349af064c088e9b5
 UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
 UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
 
-S = "${WORKDIR}/${BOOST_P}"
+S = "${UNPACKDIR}/${BOOST_P}"
meta/recipes-support/ca-certificates/ca-certificates_20250419.bb +1 -1
index 01f594095e9..a11433c9daf 100644
@@ -20,7 +20,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/${BPN}_${PV}.tar.xz \
            file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \
            file://0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch \
            "
-S = "${WORKDIR}/ca-certificates"
+S = "${UNPACKDIR}/ca-certificates"
 inherit allarch
 
 EXTRA_OEMAKE = "\
meta/recipes-support/consolekit/consolekit_0.4.6.bb +1 -1
index fc1b9856312..acef3483bb3 100644
@@ -22,7 +22,7 @@ SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.
 
 SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c"
 
-S = "${WORKDIR}/ConsoleKit-${PV}"
+S = "${UNPACKDIR}/ConsoleKit-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd polkit', d)}"
 
meta/recipes-support/enchant/enchant2_2.8.6.bb +1 -1
index 66de313d9d8..2696fc0f81a 100644
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "c4cd0889d8aff8248fc3913de5a83907013962f0e1895030a3836468cd
 
 GITHUB_BASE_URI = "https://github.com/rrthomas/enchant/releases"
 
-S = "${WORKDIR}/enchant-${PV}"
+S = "${UNPACKDIR}/enchant-${PV}"
 
 PACKAGECONFIG ??= "aspell"
 PACKAGECONFIG[aspell]  = "--with-aspell,--without-aspell,aspell,aspell"
meta/recipes-support/icu/icu_77-1.bb +1 -1
index 90af2cdc27c..e655b18ad24 100644
@@ -10,7 +10,7 @@ DEPENDS = "icu-native autoconf-archive-native"
 
 CVE_PRODUCT = "international_components_for_unicode"
 
-S = "${WORKDIR}/icu/source"
+S = "${UNPACKDIR}/icu/source"
 STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
 
 ICU_MAJOR_VER = "${@d.getVar('PV').split('-')[0]}"
meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb +1 -1
index 569da165105..00994dfae05 100644
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2
 
 CVE_PRODUCT = "libatomic_ops"
 
-S = "${WORKDIR}/libatomic_ops-${PV}"
+S = "${UNPACKDIR}/libatomic_ops-${PV}"
 
 ALLOW_EMPTY:${PN} = "1"
 
meta/recipes-support/libcheck/libcheck_0.15.2.bb +1 -1
index 5ab67b87286..16e0c441ab0 100644
@@ -16,7 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \
 SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a"
 GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/"
 
-S = "${WORKDIR}/check-${PV}"
+S = "${UNPACKDIR}/check-${PV}"
 
 inherit autotools pkgconfig texinfo github-releases
 
meta/recipes-support/libevent/libevent_2.1.12.bb +1 -1
index 25388fb4d7f..2fadf109432 100644
@@ -23,7 +23,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/release-${PV}-stable/${BP}-stable.tar.gz
 SRC_URI[sha256sum] = "92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb"
 UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>.+)-stable"
 
-S = "${WORKDIR}/${BPN}-${PV}-stable"
+S = "${UNPACKDIR}/${BPN}-${PV}-stable"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
meta/recipes-support/libfm/libfm-extra_1.3.2.bb +1 -1
index b7a9b25f862..5bf2f0f5025 100644
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/libfm-${PV}.tar.xz \
 
 SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5"
 
-S = "${WORKDIR}/libfm-${PV}"
+S = "${UNPACKDIR}/libfm-${PV}"
 
 EXTRA_OECONF = "--with-extra-only --with-gtk=no"
 
meta/recipes-support/libmpc/libmpc_1.3.1.bb +1 -1
index ed57396c0a0..b3853fc9644 100644
@@ -7,6 +7,6 @@ SRC_URI = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8"
 
-S = "${WORKDIR}/mpc-${PV}"
+S = "${UNPACKDIR}/mpc-${PV}"
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-support/libpcre/libpcre2_10.45.bb +1 -1
index e82de0fa5bd..4fbb8921c5a 100644
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "21547f3516120c75597e5b30a992e27a592a31950b5140e7b8bfde3f19
 
 CVE_PRODUCT = "pcre2"
 
-S = "${WORKDIR}/pcre2-${PV}"
+S = "${UNPACKDIR}/pcre2-${PV}"
 
 PROVIDES += "pcre2"
 DEPENDS += "bzip2 zlib"
meta/recipes-support/libpcre/libpcre_8.45.bb +1 -1
index 933bb00de65..67327065e49 100644
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e321
 
 CVE_PRODUCT = "pcre"
 
-S = "${WORKDIR}/pcre-${PV}"
+S = "${UNPACKDIR}/pcre-${PV}"
 
 PROVIDES += "pcre"
 DEPENDS += "bzip2 zlib"
meta/recipes-support/libsoup/libsoup_3.6.5.bb +1 -1
index fbe9a79b0f1..29e45dfb977 100644
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "6891765aac3e949017945c3eaebd8cc8216df772456dc9f460976fbdb7
 PROVIDES = "libsoup-3.0"
 CVE_PRODUCT = "libsoup"
 
-S = "${WORKDIR}/libsoup-${PV}"
+S = "${UNPACKDIR}/libsoup-${PV}"
 
 inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gi-docgen vala
 
meta/recipes-support/liburcu/liburcu_0.15.3.bb +1 -1
index fb4e457719f..ae5daed7018 100644
@@ -16,7 +16,7 @@ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2"
 
 SRC_URI[sha256sum] = "26687ec84e3e114759454c884a08abeaf79dec09b041895ddf4c45ec150acb6d"
 
-S = "${WORKDIR}/userspace-rcu-${PV}"
+S = "${UNPACKDIR}/userspace-rcu-${PV}"
 inherit autotools multilib_header
 
 CPPFLAGS:append:riscv64  = " -pthread -D_REENTRANT"
meta/recipes-support/libusb/libusb1_1.0.29.bb +1 -1
index bae5e2c09f7..2f43ee68b70 100644
@@ -21,7 +21,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
 
 SRC_URI[sha256sum] = "5977fc950f8d1395ccea9bd48c06b3f808fd3c2c961b44b0c2e6e29fc3a70a85"
 
-S = "${WORKDIR}/libusb-${PV}"
+S = "${UNPACKDIR}/libusb-${PV}"
 
 inherit autotools pkgconfig ptest github-releases
 
meta/recipes-support/libxslt/libxslt_1.1.43.bb +1 -1
index d251fa8122f..c0699cbce80 100644
@@ -21,7 +21,7 @@ UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
 
 CVE_STATUS[CVE-2022-29824] = "not-applicable-config: Static linking to libxml2 is not enabled."
 
-S = "${WORKDIR}/libxslt-${PV}"
+S = "${UNPACKDIR}/libxslt-${PV}"
 
 BINCONFIG = "${bindir}/xslt-config"
 
meta/recipes-support/libyaml/libyaml_0.2.5.bb +1 -1
index b1f516f7fee..9b77e7cfc89 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://License;md5=7bbd28caa69f81f5cd5f48647236663d"
 SRC_URI = "https://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz"
 SRC_URI[sha256sum] = "c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4"
 
-S = "${WORKDIR}/yaml-${PV}"
+S = "${UNPACKDIR}/yaml-${PV}"
 
 inherit autotools
 
meta/recipes-support/sqlite/sqlite3.inc +1 -1
index d093ec5859e..28a33282ae1 100644
@@ -13,7 +13,7 @@ def sqlite_download_version(d):
 
 SQLITE_PV = "${@sqlite_download_version(d)}"
 
-S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
+S = "${UNPACKDIR}/sqlite-autoconf-${SQLITE_PV}"
 
 UPSTREAM_CHECK_URI = "http://www.sqlite.org/"
 UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html"
Signature · 1 line
2.39.5
#7 lore raw

RFC PATCH 6/9 meta: set S from UNPACKDIR in recipes that use only local files

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

There is no need to have two assignments; also setting S from UNPACKDIR (and not vice versa) is more logical as unpack task comes first, and tasks that come after unpack use S to access unpack results.

Also adjust reference test data in selftest/recipeutils to reflect changes in test recipes.

---
 meta-poky/recipes-core/tiny-init/tiny-init.bb                 | 3 +--
 meta-selftest/recipes-test/cpp/cpp-example.inc                | 3 +--
 meta-selftest/recipes-test/devtool/devtool-test-localonly.bb  | 3 +--
 meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb | 3 +--
 meta-selftest/recipes-test/fortran/fortran-helloworld.bb      | 3 +--
 .../recipes-test/recipeutils/recipeutils-test_1.2.bb          | 3 +--
 meta-selftest/recipes-test/selftest-chown/selftest-chown.bb   | 3 +--
 .../recipes-test/selftest-hardlink/selftest-hardlink.bb       | 3 +--
 .../recipes-test/selftest-hello/selftest-hello_1.0.bb         | 3 +--
 meta-selftest/recipes-test/selftest-users/acreategroup.bb     | 3 +--
 meta-selftest/recipes-test/selftest-users/bcreategroup.bb     | 3 +--
 meta-selftest/recipes-test/selftest-users/ccreategroup.bb     | 3 +--
 meta-selftest/recipes-test/selftest-users/creategroup1.bb     | 3 +--
 meta-selftest/recipes-test/selftest-users/creategroup2.bb     | 3 +--
 meta-selftest/recipes-test/selftest-users/dcreategroup.bb     | 3 +--
 meta-selftest/recipes-test/selftest-users/useraddbadtask.bb   | 3 +--
 meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb           | 3 +--
 meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb       | 3 +--
 meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb      | 3 +--
 meta-skeleton/recipes-skeleton/service/service_0.1.bb         | 3 +--
 meta-skeleton/recipes-skeleton/useradd/useradd-example.bb     | 3 +--
 meta/classes-recipe/devicetree.bbclass                        | 3 +--
 meta/classes-recipe/kernel-fit-image.bbclass                  | 3 +--
 meta/lib/oeqa/selftest/cases/recipeutils.py                   | 4 ++--
 meta/recipes-bsp/alsa-state/alsa-state.bb                     | 3 +--
 meta/recipes-bsp/formfactor/formfactor_0.0.bb                 | 3 +--
 meta/recipes-bsp/grub/grub-bootconf_1.00.bb                   | 3 +--
 meta/recipes-bsp/keymaps/keymaps_1.0.bb                       | 3 +--
 meta/recipes-connectivity/connman/connman-conf.bb             | 3 +--
 meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb        | 3 +--
 .../ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb            | 3 +--
 meta/recipes-core/base-files/base-files_3.0.14.bb             | 3 +--
 meta/recipes-core/busybox/busybox-inittab_1.37.0.bb           | 3 +--
 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb          | 3 +--
 meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb         | 3 +--
 meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb    | 3 +--
 .../initrdscripts/initramfs-live-boot-tiny_1.0.bb             | 3 +--
 meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb    | 3 +--
 .../initrdscripts/initramfs-live-install-efi-testfs_1.0.bb    | 3 +--
 .../initrdscripts/initramfs-live-install-efi_1.0.bb           | 3 +--
 .../initrdscripts/initramfs-live-install-testfs_1.0.bb        | 3 +--
 meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | 3 +--
 .../initrdscripts/initramfs-module-install-efi_1.0.bb         | 3 +--
 .../initrdscripts/initramfs-module-install_1.0.bb             | 3 +--
 .../initrdscripts/initramfs-module-setup-live_1.0.bb          | 3 +--
 meta/recipes-core/initscripts/initscripts_1.0.bb              | 3 +--
 meta/recipes-core/musl/bsd-headers.bb                         | 3 +--
 meta/recipes-core/musl/libssp-nonshared.bb                    | 3 +--
 meta/recipes-core/musl/musl-legacy-error.bb                   | 3 +--
 meta/recipes-core/systemd/systemd-bootconf_1.00.bb            | 3 +--
 meta/recipes-core/systemd/systemd-compat-units.bb             | 3 +--
 meta/recipes-core/systemd/systemd-conf_1.0.bb                 | 3 +--
 meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb        | 3 +--
 meta/recipes-core/udev/udev-extraconf_1.1.bb                  | 3 +--
 meta/recipes-core/volatile-binds/volatile-binds.bb            | 3 +--
 meta/recipes-devtools/devel-config/distcc-config.bb           | 3 +--
 meta/recipes-devtools/devel-config/nfs-export-root.bb         | 3 +--
 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb     | 3 +--
 meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb          | 3 +--
 meta/recipes-devtools/makedevs/makedevs_1.0.1.bb              | 3 +--
 meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb            | 3 +--
 meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb       | 3 +--
 meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb          | 3 +--
 meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb           | 3 +--
 meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb      | 3 +--
 meta/recipes-devtools/rust/rust-cross-canadian.inc            | 3 +--
 meta/recipes-extended/shadow/shadow-securetty_4.6.bb          | 3 +--
 meta/recipes-extended/shadow/shadow-sysroot_4.6.bb            | 3 +--
 .../texinfo-dummy-native/texinfo-dummy-native.bb              | 3 +--
 meta/recipes-extended/watchdog/watchdog-config.bb             | 3 +--
 meta/recipes-graphics/builder/builder_0.1.bb                  | 3 +--
 .../recipes-graphics/matchbox-session/matchbox-session_0.1.bb | 3 +--
 meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb    | 3 +--
 meta/recipes-graphics/pong-clock/pong-clock_1.0.bb            | 3 +--
 meta/recipes-graphics/wayland/weston-init.bb                  | 3 +--
 meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb     | 3 +--
 .../xinput-calibrator/pointercal-xinput_0.0.bb                | 3 +--
 meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | 3 +--
 meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb   | 3 +--
 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb           | 3 +--
 meta/recipes-kernel/linux/linux-dummy.bb                      | 3 +--
 meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb  | 3 +--
 .../modutils-initscripts/modutils-initscripts.bb              | 3 +--
 meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb  | 3 +--
 .../pulseaudio-sato/pulseaudio-client-conf-sato_1.bb          | 3 +--
 meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb        | 3 +--
 meta/recipes-support/user-creation/xuser-account_0.1.bb       | 3 +--
 87 files changed, 88 insertions(+), 174 deletions(-)
meta-poky/recipes-core/tiny-init/tiny-init.bb +1 -2
index 586596259b8..3a774fecc41 100644
@@ -11,8 +11,7 @@ SRC_URI = "file://init \
 	   file://rc.local.sample \
 	  "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure() {
 	:
meta-selftest/recipes-test/cpp/cpp-example.inc +1 -2
index 41aaa7219a1..76ff64e87f5 100644
@@ -19,7 +19,6 @@ SRC_URI = "\
     file://run-ptest \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit ptest
meta-selftest/recipes-test/devtool/devtool-test-localonly.bb +1 -2
index 446c51f09b5..54463fed98c 100644
@@ -6,8 +6,7 @@ SRC_URI = "file://file1 \
 
 SRC_URI:append:class-native = " file://file3"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 EXCLUDE_FROM_WORLD = "1"
 BBCLASSEXTEND = "native"
meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb +1 -2
index 35672a5265f..0146be4c520 100644
@@ -3,7 +3,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "file://file1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/fortran/fortran-helloworld.bb +1 -2
index 11928dc95a9..240ed473cc1 100644
@@ -6,8 +6,7 @@ DEPENDS = "libgfortran"
 
 SRC_URI = "file://hello.f95"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # These set flags that Fortran doesn't support
 SECURITY_CFLAGS = ""
meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +1 -2
index 8b314d396ee..dfaf67c9388 100644
@@ -6,8 +6,7 @@ LICENSE = "HPND"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e"
 DEPENDS += "zlib"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta-selftest/recipes-test/selftest-chown/selftest-chown.bb +1 -2
index a0eeb4f2231..ca22e1e19c9 100644
@@ -5,8 +5,7 @@ LICENSE = "MIT"
 
 DEPENDS += "coreutils-native"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit useradd allarch
 
meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb +1 -2
index 64fea8ed951..8b2aa6c7376 100644
@@ -6,8 +6,7 @@ SRC_URI = "file://hello.c \
            file://gdb.sh \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
 	${CC} hello.c -o hello1 ${CFLAGS} ${LDFLAGS}
meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb +1 -2
index 2dc352d479e..0ffe7308ba8 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://helloworld.c"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
 	${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld
meta-selftest/recipes-test/selftest-users/acreategroup.bb +1 -2
index a970c41134f..07771ecf409 100644
@@ -3,8 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 LICENSE = "MIT"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/selftest-users/bcreategroup.bb +1 -2
index 08106dab7cc..0071fcc331c 100644
@@ -7,8 +7,7 @@ LICENSE = "MIT"
 
 USERADD_DEPENDS = "acreategroup ccreategroup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/selftest-users/ccreategroup.bb +1 -2
index c82ced84812..16859166302 100644
@@ -5,8 +5,7 @@ LICENSE = "MIT"
 
 USERADD_DEPENDS = "acreategroup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/selftest-users/creategroup1.bb +1 -2
index 4ab278f5895..28651d3ed70 100644
@@ -3,8 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 LICENSE = "MIT"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit useradd allarch
 
meta-selftest/recipes-test/selftest-users/creategroup2.bb +1 -2
index 179aba9bfcc..2840c921061 100644
@@ -5,8 +5,7 @@ LICENSE = "MIT"
 
 USERADD_DEPENDS = "creategroup1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit useradd allarch
 
meta-selftest/recipes-test/selftest-users/dcreategroup.bb +1 -2
index 0030e81ee0a..eba91fe63dc 100644
@@ -5,8 +5,7 @@ LICENSE = "MIT"
 
 USERADD_DEPENDS = "bcreategroup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 EXCLUDE_FROM_WORLD = "1"
 
meta-selftest/recipes-test/selftest-users/useraddbadtask.bb +1 -2
index 2863541010c..7ba7ec85feb 100644
@@ -5,8 +5,7 @@ LICENSE = "MIT"
 
 DEPENDS:append = "coreutils-native"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit useradd allarch
 
meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb +1 -2
index db674d0efc2..17ab7af0abd 100644
@@ -6,8 +6,7 @@ LICENSE = "MIT"
 SRC_URI = "file://testfile.txt"
 INHIBIT_DEFAULT_DEPS = "1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile(){
 	echo "testdata" > ${B}/"file with [brackets].txt"
meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb +1 -2
index 79f2e8a0923..e5f0ca10237 100644
@@ -10,8 +10,7 @@ SRC_URI = "file://Makefile \
            file://COPYING \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb +1 -2
index 8be79809195..cb07b139748 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://helloworld.c"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
 	${CC} ${LDFLAGS} helloworld.c -o helloworld
meta-skeleton/recipes-skeleton/service/service_0.1.bb +1 -2
index 54b834d45f9..f249579310d 100644
@@ -9,8 +9,7 @@ SRC_URI = "file://skeleton \
 	   file://COPYRIGHT \
 	   "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
 	${CC} ${CFLAGS} ${LDFLAGS} ${S}/skeleton_test.c -o ${B}/skeleton-test
meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +1 -2
index b0d96e7f711..5783d9e2452 100644
@@ -9,8 +9,7 @@ SRC_URI = "file://file1 \
            file://file3 \
            file://file4"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGES =+ "${PN}-user3"
 
meta/classes-recipe/devicetree.bbclass +1 -2
index 2a2ac93e9bd..ce9d008aac1 100644
@@ -40,8 +40,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 SYSROOT_DIRS += "/boot/devicetree"
 FILES:${PN} = "/boot/devicetree/*.dtb /boot/devicetree/*.dtbo"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 B = "${WORKDIR}/build"
 
 # Default kernel includes, these represent what are normally used for in-kernel
meta/classes-recipe/kernel-fit-image.bbclass +1 -2
index d2eebb88bc2..39845997ed4 100644
@@ -2,8 +2,7 @@
 inherit kernel-arch kernel-artifact-names uboot-config deploy
 require conf/image-fitimage.conf
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
meta/lib/oeqa/selftest/cases/recipeutils.py +2 -2
index 99497371724..e697fd29209 100644
@@ -72,7 +72,7 @@ class RecipeUtilsTests(OESelftestTestCase):
         expected_patch = """
 --- a/recipes-test/recipeutils/recipeutils-test_1.2.bb
 +++ b/recipes-test/recipeutils/recipeutils-test_1.2.bb
-@@ -11,6 +11,4 @@
+@@ -10,6 +10,4 @@
  
  BBCLASSEXTEND = "native nativesdk"
  
@@ -97,7 +97,7 @@ class RecipeUtilsTests(OESelftestTestCase):
         expected_patch = """
 --- a/recipes-test/recipeutils/recipeutils-test_1.2.bb
 +++ b/recipes-test/recipeutils/recipeutils-test_1.2.bb
-@@ -11,6 +11,3 @@
+@@ -10,6 +10,3 @@
  
  BBCLASSEXTEND = "native nativesdk"
  
meta/recipes-bsp/alsa-state/alsa-state.bb +1 -2
index 099fbd3b9d8..9452a1a4ce4 100644
@@ -21,8 +21,7 @@ SRC_URI = "\
   file://alsa-state-init \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # As the recipe doesn't inherit systemd.bbclass, we need to set this variable
 # manually to avoid unnecessary postinst/preinst generated.
meta/recipes-bsp/formfactor/formfactor_0.0.bb +1 -2
index 4714bb2e5e2..f8d5613ffac 100644
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://config file://machconfig"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 INHIBIT_DEFAULT_DEPS = "1"
meta/recipes-bsp/grub/grub-bootconf_1.00.bb +1 -2
index a004e3a3b2f..0b4005e5bf0 100644
@@ -11,8 +11,7 @@ inherit grub-efi-cfg
 
 require conf/image-uefi.conf
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 GRUB_CFG = "${S}/grub-bootconf"
 LABELS = "boot"
meta/recipes-bsp/keymaps/keymaps_1.0.bb +1 -2
index 0425197c981..ab2d68d6a19 100644
@@ -24,8 +24,7 @@ SRC_URI = "file://keymap.sh"
 INITSCRIPT_NAME = "keymap.sh"
 INITSCRIPT_PARAMS = "start 01 S ."
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install () {
     # Only install the script if 'sysvinit' is in DISTRO_FEATURES
meta/recipes-connectivity/connman/connman-conf.bb +1 -2
index 73c54cddae8..a787232476e 100644
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m
 SRC_URI = "file://main.conf \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +1 -2
index 0ee47d47c2b..5c9c8219d72 100644
@@ -11,8 +11,7 @@ SRC_URI = "file://host-peer \
 
 inherit allarch useradd
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -d ${D}${sysconfdir}/ppp/peers
meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb +1 -2
index db5a0eb8ce5..57b05349290 100644
@@ -6,8 +6,7 @@ SRC_URI = "file://dropbear_rsa_host_key \
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
meta/recipes-core/base-files/base-files_3.0.14.bb +1 -2
index 59b084d1414..3f01bb35d92 100644
@@ -25,8 +25,7 @@ SRC_URI = "file://rotation \
            file://licenses/GPL-2 \
            "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
meta/recipes-core/busybox/busybox-inittab_1.37.0.bb +1 -2
index 4ffc44c808a..3bdec248de4 100644
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m
 
 SRC_URI = "file://inittab"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +1 -2
index ddf9d1b3112..da594d00b76 100644
@@ -15,8 +15,7 @@ SRC_URI = "file://copyright \
            file://interfaces \
            file://nfsroot"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install () {
 	install -d ${D}${sysconfdir}/init.d \
meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +1 -2
index ec3544c67a9..e0a6319ccf1 100644
@@ -3,8 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-boot.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -m 0755 ${S}/init-boot.sh ${D}/init
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +1 -2
index bb4984366d1..a3e4e2a7e97 100644
@@ -20,8 +20,7 @@ SRC_URI = "file://init \
            file://overlayroot \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}/init.d
meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb +1 -2
index 40046f30a76..6b99ab1843a 100644
@@ -5,8 +5,7 @@ DEPENDS = "virtual/kernel"
 RDEPENDS:${PN} = "busybox-mdev"
 SRC_URI = "file://init-live.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -m 0755 ${S}/init-live.sh ${D}/init
meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +1 -2
index 7851cc9605a..8c8355a53e4 100644
@@ -5,8 +5,7 @@ DEPENDS = "virtual/kernel"
 RDEPENDS:${PN} = "udev udev-extraconf"
 SRC_URI = "file://init-live.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -m 0755 ${S}/init-live.sh ${D}/init
meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +1 -2
index 31291bcdf2c..e3087273201 100644
@@ -5,8 +5,7 @@ SRC_URI = "file://init-install-efi-testfs.sh"
 
 RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh
meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +1 -2
index ff3b5622db7..77462f44258 100644
@@ -6,8 +6,7 @@ SRC_URI = "file://init-install-efi.sh"
 RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}"
 RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh
meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +1 -2
index 19f05f9fecd..05f92203cd6 100644
@@ -5,8 +5,7 @@ SRC_URI = "file://init-install-testfs.sh"
 
 RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh
meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +1 -2
index 1d489e2b649..791bd57171f 100644
@@ -3,8 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-install.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}"
 RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +1 -2
index bb3f275f266..0115741f4c1 100644
@@ -7,8 +7,7 @@ RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
 
 SRC_URI = "file://init-install-efi.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}/init.d
meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +1 -2
index d6d83487312..96fd8310d27 100644
@@ -12,8 +12,7 @@ COMPATIBLE_HOST:armv7ve = 'null'
 
 SRC_URI = "file://init-install.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}/init.d
meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +1 -2
index 4d9ef79a634..c2ab107980e 100644
@@ -9,8 +9,7 @@ inherit allarch
 FILESEXTRAPATHS:prepend := "${THISDIR}/initramfs-framework:"
 SRC_URI = "file://setup-live"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}/init.d
meta/recipes-core/initscripts/initscripts_1.0.bb +1 -2
index 0bc078c5eb8..c984257c5c8 100644
@@ -35,8 +35,7 @@ SRC_URI = "file://functions \
            ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 SRC_URI:append:arm = " file://alignment.sh"
 SRC_URI:append:armeb = " file://alignment.sh"
meta/recipes-core/musl/bsd-headers.bb +1 -2
index 7d0bdee8704..ad9ba81e4f9 100644
@@ -15,8 +15,7 @@ do_compile[noexec] = "1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -Dm 0644 ${S}/sys-queue.h ${D}${includedir}/sys/queue.h
meta/recipes-core/musl/libssp-nonshared.bb +1 -2
index fde3bc97b47..4bcbaef7ea4 100644
@@ -17,8 +17,7 @@ DEPENDS = "virtual/cross-binutils \
 
 do_configure[noexec] = "1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
 	${CC} ${CPPFLAGS} ${CFLAGS} -fPIE -c stack_chk.c -o stack_chk.o
meta/recipes-core/musl/musl-legacy-error.bb +1 -2
index 11a838a6e8a..b40075c0b6b 100644
@@ -13,8 +13,7 @@ do_compile[noexec] = "1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -Dm 0644 ${S}/error.h -t ${D}${includedir}
meta/recipes-core/systemd/systemd-bootconf_1.00.bb +1 -2
index 0ec49365d02..5efac3e4106 100644
@@ -7,8 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit systemd-boot-cfg
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 LABELS = "boot"
 
meta/recipes-core/systemd/systemd-compat-units.bb +1 -2
index 33257395440..187f0d4626e 100644
@@ -5,8 +5,7 @@ LICENSE = "MIT"
 
 PACKAGE_WRITE_DEPS += "systemd-systemctl-native"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit features_check
 
meta/recipes-core/systemd/systemd-conf_1.0.bb +1 -2
index b8bea0c25be..60066cd60a6 100644
@@ -21,8 +21,7 @@ SRC_URI = "\
     file://wired.network \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -D -m0644 ${S}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +1 -2
index 6ff2ca1bf43..748e5e6d065 100644
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m
 SRC_URI = "file://inittab \
            file://start_getty"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
meta/recipes-core/udev/udev-extraconf_1.1.bb +1 -2
index 0d7e4f4f369..2ba6606c059 100644
@@ -13,8 +13,7 @@ SRC_URI = " \
        file://localextra.rules \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 MOUNT_BASE = "/run/media"
 MOUNT_GROUP ?= "disk"
meta/recipes-core/volatile-binds/volatile-binds.bb +1 -2
index 3597ec73561..857bcc93ff1 100644
@@ -9,8 +9,7 @@ SRC_URI = "\
     file://volatile-binds.service.in \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit allarch systemd features_check
 
meta/recipes-devtools/devel-config/distcc-config.bb +1 -2
index 2c30488b820..f5b2f0f246c 100644
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://distcc.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # Default to the host machine for a running qemu session
 DISTCC_HOSTS ?= "192.168.7.1"
meta/recipes-devtools/devel-config/nfs-export-root.bb +1 -2
index ad5486aa87f..a827bb58eea 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://exports"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -d ${D}${sysconfdir}
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +1 -2
index 58e9b6659e5..1148d536944 100644
@@ -26,8 +26,7 @@ SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd791
 
 UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)).zip"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure (){
     :
meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb +1 -2
index 8e42b12b77c..c1eca13107b 100644
@@ -8,8 +8,7 @@ BBCLASSEXTEND = "native"
 DEPENDS = "elfutils"
 DEPENDS:append:libc-musl = " argp-standalone"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
 	${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ${S}/dwarfsrcfiles.c -lelf -ldw
meta/recipes-devtools/makedevs/makedevs_1.0.1.bb +1 -2
index 7b11093364a..deed6845370 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://makedevs.c;beginline=2;endline=2;md5=c3817b10013a3007
 SECTION = "base"
 SRC_URI = "file://makedevs.c"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 FILES:${PN}:append:class-nativesdk = " ${datadir}"
 
meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb +1 -2
index 4db35c1092e..128baa9a081 100644
@@ -3,8 +3,7 @@ HOMEPAGE = "https://git.yoctoproject.org/opkg/"
 LICENSE = "MIT"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
 	mkdir -p ${S}/${sysconfdir}/opkg/
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +1 -2
index 90bba84b03c..8dfa2b74d96 100644
@@ -18,8 +18,7 @@ SRC_URI = "file://${COREBASE}/scripts/runqemu \
            file://${COREBASE}/scripts/runqemu-export-rootfs \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit nativesdk
 
meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +1 -2
index 28a3b95c4ea..30108e76df6 100644
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://${S}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab8
 
 SRC_URI = "file://qemu-oe-bridge-helper.c"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit native
 
meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +1 -2
index 6d0e7883ad9..3418979968e 100644
@@ -2,8 +2,7 @@ SUMMARY = "QEMU wrapper script"
 HOMEPAGE = "http://qemu.org"
 LICENSE = "MIT"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 DEPENDS += "qemu-native"
 
meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +1 -2
index f571e619218..5486f89ae75 100644
@@ -8,8 +8,7 @@ SRC_URI = "file://run-postinsts \
            file://run-postinsts.init \
            file://run-postinsts.service"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit allarch systemd update-rc.d
 
meta/recipes-devtools/rust/rust-cross-canadian.inc +1 -2
index 09e1b911a28..df8b78d326e 100644
@@ -13,8 +13,7 @@ DEPENDS += "virtual/nativesdk-cross-cc virtual/nativesdk-libc virtual/nativesdk-
 
 SRC_URI += "file://target-rust-ccld.c"
 LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # Need to use our SDK's sh here, see #14878
 create_sdk_wrapper () {
meta/recipes-extended/shadow/shadow-securetty_4.6.bb +1 -2
index 913c159c818..dbcfad5f1bf 100644
@@ -8,8 +8,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "file://securetty"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # Since SERIAL_CONSOLES is likely to be set from the machine configuration
 PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +1 -2
index 13cfab6aabb..aa132970b8c 100644
@@ -13,8 +13,7 @@ DEPENDS = "base-passwd"
 # can add custom users/groups for recipes that use inherit useradd.
 SRC_URI = "file://login.defs_shadow-sysroot"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -d ${D}${sysconfdir}
meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +1 -2
index 51d9c927661..9773d134cfb 100644
@@ -8,8 +8,7 @@ PV = "1.0"
 
 SRC_URI = "file://template.py file://COPYING"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit native
 
meta/recipes-extended/watchdog/watchdog-config.bb +1 -2
index 17151ced5ec..58c565bd302 100644
@@ -13,8 +13,7 @@ SRC_URI = " \
     file://watchdog.conf \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # The default value is 60 seconds when null.
 WATCHDOG_TIMEOUT ??= ""
meta/recipes-graphics/builder/builder_0.1.bb +1 -2
index 39abaf31ce5..b8a77983640 100644
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://builder_session.sh;endline=5;md5=84796c3c41785d86100f
 SRC_URI = "file://builder_session.sh \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 RDEPENDS:${PN} = "mini-x-session"
 
meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb +1 -2
index 8a4cfef6315..3f446445e79 100644
@@ -11,8 +11,7 @@ RCONFLICTS:${PN} = "matchbox-common"
 
 SRC_URI = "file://matchbox-session"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 
 inherit update-alternatives
meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +1 -2
index 48d50c8f66d..a6626b5d18a 100644
@@ -12,8 +12,7 @@ RCONFLICTS:${PN} = "matchbox-common"
 
 SRC_URI = "file://mini-x-session"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 RDEPENDS:${PN} = "sudo"
 
meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +1 -2
index ee5173dc83d..a30cdd1dcb1 100644
@@ -10,8 +10,7 @@ SRC_URI = "file://pong-clock-no-flicker.c"
 
 LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
 	${CC} ${CFLAGS} ${LDFLAGS} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp`
meta/recipes-graphics/wayland/weston-init.bb +1 -2
index 5723655a9bb..fc817d113fe 100644
@@ -13,8 +13,7 @@ SRC_URI = "file://init \
            file://weston-autologin \
            file://weston-start"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)}"
 PACKAGECONFIG:append:qemuriscv64 = " use-pixman"
meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +1 -2
index cd4acf81551..169269eefb3 100644
@@ -12,8 +12,7 @@ SRC_URI = "file://xserver-nodm \
            file://capability.conf \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 # Since we refer to ROOTLESS_X which is normally enabled per-machine
 PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +1 -2
index f4516e69750..39bb5803f1b 100644
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://pointercal.xinput"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     # Only install file if it has a contents
meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +1 -2
index d57b3427f8d..8f3b9217a03 100644
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SRC_URI = "file://xorg.conf"
 SRC_URI:append:qemuall = " file://noblank.conf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 CONFFILES:${PN} = "${sysconfdir}/X11/xorg.conf"
 
meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb +1 -2
index a766b00bef0..b19f53e20d8 100644
@@ -7,8 +7,7 @@ SRC_URI = "file://dt-doc-validate \
            file://dt-mk-schema \
            file://dt-validate"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}${bindir}/
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +1 -2
index 29f34d7f36b..5e70e01102f 100644
@@ -1,8 +1,7 @@
 SUMMARY = "Wrapper script for the Linux kernel module dependency indexer"
 LICENSE = "MIT"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 # The kernel and the staging dir for it is machine specific
meta/recipes-kernel/linux/linux-dummy.bb +1 -2
index 3e9a563cad8..f52e3a7b564 100644
@@ -31,8 +31,7 @@ COMPATIBLE_HOST = ".*-linux"
 
 SRC_URI = "file://COPYING.GPL"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure() {
 	:
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +1 -2
index 1a20472994b..8fcb5e6eb3f 100644
@@ -8,8 +8,7 @@ inherit pkgconfig
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot"
 do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +1 -2
index 49268445a88..fb7b09393a3 100644
@@ -4,8 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://modutils.sh;beginline=3;endline=3;md5=b2dccaa94b3629a08bfb4f983cad6f89"
 SRC_URI = "file://modutils.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 INITSCRIPT_NAME = "modutils.sh"
 INITSCRIPT_PARAMS = "start 06 S ."
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +1 -2
index bb7ddbc7f42..75065163bae 100644
@@ -20,8 +20,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "file://session \
            file://index.theme"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} += "${datadir}/themes/Sato/index.theme"
 
meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +1 -2
index 20368703c4d..65748ee771f 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://50-sato.conf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 inherit allarch
 
meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +1 -2
index 8c6c0edf107..73334fb7289 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SRC_URI = "file://shutdown.desktop"
 
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
 	install -d ${D}${datadir}/applications
meta/recipes-support/user-creation/xuser-account_0.1.bb +1 -2
index 80a429c6d33..04f506e7a39 100644
@@ -6,8 +6,7 @@ SRC_URI = "file://system-xuser.conf"
 
 inherit allarch useradd
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure() {
     :
Signature · 1 line
2.39.5
#8 lore raw

Patchtest results for [RFC PATCH 6/9] meta: set S from UNPACKDIR in recipes that use only local files

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/RFC-6-9-meta-set-S-from-UNPACKDIR-in-recipes-that-use-only-local-files.patch

FAIL: test target mailing list: Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists (test_mbox.TestMbox.test_target_mailing_list)

PASS: pretest pylint (test_python_pylint.PyLint.pretest_pylint)
PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test pylint (test_python_pylint.PyLint.test_pylint)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)

SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#9 lore raw

Re: Patchtest results for [RFC PATCH 6/9] meta: set S from UNPACKDIR in recipes that use only local files

Quoted 1 line · On Tue, 10 Jun 2025 at 11:49, <[email protected]> wrote:

FAIL: test target mailing list: Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists (test_mbox.TestMbox.test_target_mailing_list)

One of the affected files is in meta-poky; I'll split that into a separate commit in the next revision.

Alex

#10 lore raw

RFC PATCH 7/9 recipetool/devtool: calculate source paths relative to UNPACKDIR

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Now that recipes default to S in UNPACKDIR, recipetool and devtool should do the same.

There was some discussion about changing devtool to simply setting UNPACKDIR via bbappend to a workspace and running unpack task directly; currently it has a bunch of convoluted path calculations, substitutions, moving source trees around and and special casing (devtool-source.bbclass in particular is an unpleasant hack).

This should definitely be done; but right now we can simply tweak existing code which at least doesn't make it worse.

---
 meta/classes/devtool-source.bbclass        |  4 ++--
 meta/lib/oeqa/selftest/cases/devtool.py    | 18 +++++++++---------
 meta/lib/oeqa/selftest/cases/recipetool.py | 12 ++++++------
 scripts/lib/devtool/ide_sdk.py             |  2 +-
 scripts/lib/devtool/standard.py            | 12 ++++++------
 scripts/lib/devtool/upgrade.py             |  2 +-
 scripts/lib/recipetool/append.py           |  8 ++++----
 scripts/lib/recipetool/create.py           |  4 ++--
 8 files changed, 31 insertions(+), 31 deletions(-)
meta/classes/devtool-source.bbclass +2 -2
index 9762003ba75..2e0070486b4 100644
@@ -92,9 +92,9 @@ python devtool_post_unpack() {
             for fname in local_files:
                 f.write('%s\n' % fname)
 
-    if os.path.dirname(srcsubdir) != workdir:
+    if srcsubdir.startswith(unpackdir) and os.path.dirname(srcsubdir) != unpackdir:
         # Handle if S is set to a subdirectory of the source
-        srcsubdir = os.path.join(workdir, os.path.relpath(srcsubdir, workdir).split(os.sep)[0])
+        srcsubdir = os.path.normpath(os.path.join(unpackdir, os.path.relpath(srcsubdir, unpackdir).split(os.sep)[0]))
 
     scriptutils.git_convert_standalone_clone(srcsubdir)
 
meta/lib/oeqa/selftest/cases/devtool.py +9 -9
index f30dba5a469..74a7727cc00 100644
@@ -565,7 +565,7 @@ class DevtoolAddTests(DevtoolBase):
         recipefile = get_bb_var('FILE', testrecipe)
         self.assertIn('%s_%s.bb' % (testrecipe, testver), recipefile, 'Recipe file incorrectly named')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/MarkupSafe-${PV}'
+        checkvars['S'] = '${UNPACKDIR}/MarkupSafe-${PV}'
         checkvars['SRC_URI'] = url.replace(testver, '${PV}')
         self._test_recipe_contents(recipefile, checkvars, [])
         # Try with version specified
@@ -582,7 +582,7 @@ class DevtoolAddTests(DevtoolBase):
         recipefile = get_bb_var('FILE', testrecipe)
         self.assertIn('%s_%s.bb' % (testrecipe, fakever), recipefile, 'Recipe file incorrectly named')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
+        checkvars['S'] = '${UNPACKDIR}/MarkupSafe-%s' % testver
         checkvars['SRC_URI'] = url
         self._test_recipe_contents(recipefile, checkvars, [])
 
@@ -1627,12 +1627,12 @@ class DevtoolUpdateTests(DevtoolBase):
         # Check preconditions
         testrecipe = 'dos2unix'
         self.append_config('ERROR_QA:remove:pn-dos2unix = "patch-status"\n')
-        bb_vars = get_bb_vars(['SRC_URI', 'S', 'WORKDIR', 'FILE', 'BB_GIT_DEFAULT_DESTSUFFIX'], testrecipe)
+        bb_vars = get_bb_vars(['SRC_URI', 'S', 'UNPACKDIR', 'FILE', 'BB_GIT_DEFAULT_DESTSUFFIX'], testrecipe)
         self.assertIn('git://', bb_vars['SRC_URI'], 'This test expects the %s recipe to be a git recipe' % testrecipe)
-        workdir_git = '%s/%s/' % (bb_vars['WORKDIR'], bb_vars['BB_GIT_DEFAULT_DESTSUFFIX'])
-        if not bb_vars['S'].startswith(workdir_git):
+        unpackdir_git = '%s/%s/' % (bb_vars['UNPACKDIR'], bb_vars['BB_GIT_DEFAULT_DESTSUFFIX'])
+        if not bb_vars['S'].startswith(unpackdir_git):
             self.fail('This test expects the %s recipe to be building from a subdirectory of the git repo' % testrecipe)
-        subdir = bb_vars['S'].split(workdir_git, 1)[1]
+        subdir = bb_vars['S'].split(unpackdir_git, 1)[1]
         # Clean up anything in the workdir/sysroot/sstate cache
         bitbake('%s -c cleansstate' % testrecipe)
         # Try modifying a recipe
@@ -2414,7 +2414,7 @@ class DevtoolUpgradeTests(DevtoolBase):
         newsrctree = os.path.join(self.workspacedir, 'sources', newrecipename)
         self.assertExists(newsrctree, 'Source directory not renamed')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/%s-%s' % (recipename, recipever)
+        checkvars['S'] = '${UNPACKDIR}/%s-%s' % (recipename, recipever)
         checkvars['SRC_URI'] = url
         self._test_recipe_contents(newrecipefile, checkvars, [])
         # Try again - change just name this time
@@ -2426,7 +2426,7 @@ class DevtoolUpgradeTests(DevtoolBase):
         self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipename), 'Old recipe directory still exists')
         self.assertExists(os.path.join(self.workspacedir, 'sources', newrecipename), 'Source directory not renamed')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/%s-${PV}' % recipename
+        checkvars['S'] = '${UNPACKDIR}/%s-${PV}' % recipename
         checkvars['SRC_URI'] = url.replace(recipever, '${PV}')
         self._test_recipe_contents(newrecipefile, checkvars, [])
         # Try again - change just version this time
@@ -2437,7 +2437,7 @@ class DevtoolUpgradeTests(DevtoolBase):
         self.assertExists(newrecipefile, 'Recipe file not renamed')
         self.assertExists(os.path.join(self.workspacedir, 'sources', recipename), 'Source directory no longer exists')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/${BPN}-%s' % recipever
+        checkvars['S'] = '${UNPACKDIR}/${BPN}-%s' % recipever
         checkvars['SRC_URI'] = url
         self._test_recipe_contents(newrecipefile, checkvars, [])
 
meta/lib/oeqa/selftest/cases/recipetool.py +6 -6
index 8cd639bd45b..2a91f6c7ae4 100644
@@ -1144,10 +1144,10 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
 
     def test_recipetool_appendsrcfile_srcdir_basic(self):
         testrecipe = 'bash'
-        bb_vars = get_bb_vars(['S', 'WORKDIR'], testrecipe)
+        bb_vars = get_bb_vars(['S', 'UNPACKDIR'], testrecipe)
         srcdir = bb_vars['S']
-        workdir = bb_vars['WORKDIR']
-        subdir = os.path.relpath(srcdir, workdir)
+        unpackdir = bb_vars['UNPACKDIR']
+        subdir = os.path.relpath(srcdir, unpackdir)
         self._test_appendsrcfile(testrecipe, 'a-file', srcdir=subdir)
 
     def test_recipetool_appendsrcfile_existing_in_src_uri(self):
@@ -1196,10 +1196,10 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
     def test_recipetool_appendsrcfile_replace_file_srcdir(self):
         testrecipe = 'bash'
         filepath = 'Makefile.in'
-        bb_vars = get_bb_vars(['S', 'WORKDIR'], testrecipe)
+        bb_vars = get_bb_vars(['S', 'UNPACKDIR'], testrecipe)
         srcdir = bb_vars['S']
-        workdir = bb_vars['WORKDIR']
-        subdir = os.path.relpath(srcdir, workdir)
+        unpackdir = bb_vars['UNPACKDIR']
+        subdir = os.path.relpath(srcdir, unpackdir)
 
         self._test_appendsrcfile(testrecipe, filepath, srcdir=subdir)
         bitbake('%s:do_unpack' % testrecipe)
scripts/lib/devtool/ide_sdk.py +1 -1
index f8cf65f4a84..931408fa74e 100755
@@ -334,7 +334,7 @@ class RecipeModified:
         self.srctree = workspace[workspacepn]['srctree']
         # Need to grab this here in case the source is within a subdirectory
         self.real_srctree = get_real_srctree(
-            self.srctree, recipe_d.getVar('S'), recipe_d.getVar('WORKDIR'))
+            self.srctree, recipe_d.getVar('S'), recipe_d.getVar('UNPACKDIR'))
         self.bbappend = workspace[workspacepn]['bbappend']
 
         self.ide_sdk_dir = os.path.join(
scripts/lib/devtool/standard.py +6 -6
index cdfdba43eef..1fd5947c411 100644
@@ -625,7 +625,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works
                 srcsubdir = f.read()
         except FileNotFoundError as e:
             raise DevtoolError('Something went wrong with source extraction - the devtool-source class was not active or did not function correctly:\n%s' % str(e))
-        srcsubdir_rel = os.path.relpath(srcsubdir, os.path.join(tempdir, 'workdir'))
+        srcsubdir_rel = os.path.relpath(srcsubdir, os.path.join(tempdir, 'workdir', os.path.relpath(d.getVar('UNPACKDIR'), d.getVar('WORKDIR'))))
 
         # Check if work-shared is empty, if yes
         # find source and copy to work-shared
@@ -742,13 +742,13 @@ def get_staging_kbranch(srcdir):
         staging_kbranch = "".join(branch.split('\n')[0])
     return staging_kbranch
 
-def get_real_srctree(srctree, s, workdir):
+def get_real_srctree(srctree, s, unpackdir):
     # Check that recipe isn't using a shared workdir
     s = os.path.abspath(s)
-    workdir = os.path.abspath(workdir)
-    if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir:
+    unpackdir = os.path.abspath(unpackdir)
+    if s.startswith(unpackdir) and s != unpackdir and os.path.dirname(s) != unpackdir:
         # Handle if S is set to a subdirectory of the source
-        srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1]
+        srcsubdir = os.path.relpath(s, unpackdir).split(os.sep, 1)[1]
         srctree = os.path.join(srctree, srcsubdir)
     return srctree
 
@@ -907,7 +907,7 @@ def modify(args, config, basepath, workspace):
 
         # Need to grab this here in case the source is within a subdirectory
         srctreebase = srctree
-        srctree = get_real_srctree(srctree, rd.getVar('S'), rd.getVar('WORKDIR'))
+        srctree = get_real_srctree(srctree, rd.getVar('S'), rd.getVar('UNPACKDIR'))
 
         bb.utils.mkdirhier(os.path.dirname(appendfile))
         with open(appendfile, 'w') as f:
scripts/lib/devtool/upgrade.py +1 -1
index 0dace1fb240..d9aca6e2dbd 100644
@@ -571,7 +571,7 @@ def upgrade(args, config, basepath, workspace):
         else:
             srctree = standard.get_default_srctree(config, pn)
 
-        srctree_s = standard.get_real_srctree(srctree, rd.getVar('S'), rd.getVar('WORKDIR'))
+        srctree_s = standard.get_real_srctree(srctree, rd.getVar('S'), rd.getVar('UNPACKDIR'))
 
         # try to automatically discover latest version and revision if not provided on command line
         if not args.version and not args.srcrev:
scripts/lib/recipetool/append.py +4 -4
index c18926e56c6..041d79f1623 100644
@@ -317,7 +317,7 @@ def appendsrc(args, files, rd, extralines=None):
     import oe.recipeutils
 
     srcdir = rd.getVar('S')
-    workdir = rd.getVar('WORKDIR')
+    unpackdir = rd.getVar('UNPACKDIR')
 
     import bb.fetch
     simplified = {}
@@ -336,10 +336,10 @@ def appendsrc(args, files, rd, extralines=None):
         src_destdir = os.path.dirname(srcfile)
         if not args.use_workdir:
             if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'):
-                srcdir = os.path.join(workdir, rd.getVar('BB_GIT_DEFAULT_DESTSUFFIX'))
+                srcdir = os.path.join(unpackdir, rd.getVar('BB_GIT_DEFAULT_DESTSUFFIX'))
                 if not bb.data.inherits_class('kernel-yocto', rd):
-                    logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}')
-            src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir)
+                    logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}')
+            src_destdir = os.path.join(os.path.relpath(srcdir, unpackdir), src_destdir)
         src_destdir = os.path.normpath(src_destdir)
 
         if src_destdir and src_destdir != '.':
scripts/lib/recipetool/create.py +2 -2
index 0fd4953f752..f6a38e4a3f0 100644
@@ -734,7 +734,7 @@ def create_recipe(args):
     if srcsubdir and not args.binary:
         # (for binary packages we explicitly specify subdir= when fetching to
         # match the default value of S, so we don't need to set it in that case)
-        lines_before.append('S = "${WORKDIR}/%s"' % srcsubdir)
+        lines_before.append('S = "${UNPACKDIR}/%s"' % srcsubdir)
         lines_before.append('')
 
     if pkgarch:
@@ -838,7 +838,7 @@ def create_recipe(args):
                 line = line.replace(realpv, '${PV}')
             if pn:
                 line = line.replace(pn, '${BPN}')
-            if line == 'S = "${WORKDIR}/${BPN}-${PV}"' or 'tmp-recipetool-' in line:
+            if line == 'S = "${UNPACKDIR}/${BPN}-${PV}"' or 'tmp-recipetool-' in line:
                 skipblank = True
                 continue
         elif line.startswith('SRC_URI = '):
Signature · 1 line
2.39.5
#11 lore raw

RFC PATCH 8/9 insane/do_qa_unpack: add checks that ensure S is set correctly

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

The checks are fatal, as this avoids rather more cryptic errors further down the build. Example:

ERROR: gnu-config-native-20240823+git-r0 do_unpack: Recipes that set S = "${WORKDIR}/git" or S = "${UNPACKDIR}/git" should remove that assignment, as S set by bitbake.conf in oe-core now works.
ERROR: perlcross-native-1.6.2-r0 do_unpack: S should be set relative to UNPACKDIR, e.g. replace WORKDIR with UNPACKDIR in "S = ${WORKDIR}/perl-cross-${PV}"

Dropping the S = ${WORKDIR}/git assignment (addressing the first error) can be done with a single sed command when there is a lot of recipes:

sed -i "/^S = \"\${WORKDIR}\/git\"/d" find . -name *.bb

Replacing WORKDIR with UNPACKDIR can be done similarly, but should be done after the removals:

sed -i "s/^S = \"\${WORKDIR}\//S = \"\${UNPACKDIR}\//g" find . -name *.bb

---
 meta/classes-global/insane.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)
meta/classes-global/insane.bbclass +8 -0
index eb8591f6242..0a0a38a3b43 100644
@@ -1431,6 +1431,14 @@ Rerun configure task after fixing this."""
 python do_qa_unpack() {
     src_uri = d.getVar('SRC_URI')
     s_dir = d.getVar('S')
+    s_dir_orig = d.getVar('S', False)
+
+    if s_dir_orig == '${WORKDIR}/git' or s_dir_orig == '${UNPACKDIR}/git':
+        bb.fatal('Recipes that set S = "${WORKDIR}/git" or S = "${UNPACKDIR}/git" should remove that assignment, as S set by bitbake.conf in oe-core now works.')
+
+    if '${WORKDIR}' in s_dir_orig:
+        bb.fatal('S should be set relative to UNPACKDIR, e.g. replace WORKDIR with UNPACKDIR in "S = {}"'.format(s_dir_orig))
+
     if src_uri and not os.path.exists(s_dir):
         bb.warn('%s: the directory %s (%s) pointed to by the S variable doesn\'t exist - please set S within the recipe to point to where the source has been unpacked to' % (d.getVar('PN'), d.getVar('S', False), s_dir))
 }
Signature · 1 line
2.39.5
#12 lore raw

RFC PATCH 8/9 insane/do_qa_unpack: add checks that ensure S is set correctly

Quoted 5 lines

From: Alexander Kanavin <[email protected]>

The checks are fatal, as this avoids rather more cryptic errors further down the build. Example:

Quoted 7 lines

ERROR: gnu-config-native-20240823+git-r0 do_unpack: Recipes that set S = "${WORKDIR}/git" or S = "${UNPACKDIR}/git" should remove that assignment, as S set by bitbake.conf in oe-core now works.
ERROR: perlcross-native-1.6.2-r0 do_unpack: S should be set relative to UNPACKDIR, e.g. replace WORKDIR with UNPACKDIR in "S = ${WORKDIR}/perl-cross-${PV}"

Dropping the S = ${WORKDIR}/git assignment (addressing the first error) can be done with a single sed command when there is a lot of recipes:

sed -i "/^S = \"\${WORKDIR}\/git\"/d" find . -name *.bb

Perhaps, given the patches that you are posting, your find commands should cover the include files too?

find . -name *.bb -o -name *.inc

Thanks,
Jason

#13 lore raw

Re: [RFC PATCH 8/9] insane/do_qa_unpack: add checks that ensure S is set correctly

Quoted 3 lines · Jason Schonberg

Perhaps, given the patches that you are posting, your find commands should cover the include files too?

find . -name *.bb -o -name *.inc

Yes, good idea. And *.bbclass too. I adjusted the commit message.

Alex

#14 lore raw

RFC PATCH 9/9 base.bbclass: drop compatibility moving of sources into workdir

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Potentially there could be a grace period for fixing recipes (with warnings, etc), on the other hand, changes to git unpacking destination would already break various layers, so we might as well make this a hard qa error and drop the magic at the same time.

I commit to sending fixes for layers included in autobuilder testing (meta-oe/arm/intel/virt/agl/aws/mingw/etc).

SOURCE_BASEDIR is at the same time adjusted to be calculated relative to UNPACKDIR (previously it only worked if S was set to WORKDIR/something/otherthing, and that is no longer working). It is also no longer removed from the filesystem, as content of unpackdir is managed elsewhere.

---
 meta/classes-global/base.bbclass | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
meta/classes-global/base.bbclass +3 -10
index 8215969c7bb..0f4efa272cb 100644
@@ -168,23 +168,16 @@ python base_do_unpack() {
 
     basedir = None
     unpackdir = d.getVar('UNPACKDIR')
-    workdir = d.getVar('WORKDIR')
-    if sourcedir.startswith(workdir) and not sourcedir.startswith(unpackdir):
-        basedir = sourcedir.replace(workdir, '').strip("/").split('/')[0]
+    if sourcedir.startswith(unpackdir):
+        basedir = sourcedir.replace(unpackdir, '').strip("/").split('/')[0]
         if basedir:
-            bb.utils.remove(workdir + '/' + basedir, True)
-            d.setVar("SOURCE_BASEDIR", workdir + '/' + basedir)
+            d.setVar("SOURCE_BASEDIR", unpackdir + '/' + basedir)
 
     try:
         fetcher = bb.fetch2.Fetch(src_uri, d)
         fetcher.unpack(d.getVar('UNPACKDIR'))
     except bb.fetch2.BBFetchException as e:
         bb.fatal("Bitbake Fetcher Error: " + repr(e))
-
-    if basedir and os.path.exists(unpackdir + '/' + basedir):
-        # Compatibility magic to ensure ${WORKDIR}/git and ${WORKDIR}/${BP}
-        # as often used in S work as expected.
-        shutil.move(unpackdir + '/' + basedir, workdir + '/' + basedir)
 }
 
 SSTATETASKS += "do_deploy_source_date_epoch"
Signature · 1 line
2.39.5
#15 lore raw
In reply to Alexander Kanavin
Quoted 6 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Alexander Kanavin via lists.openembedded.org
Sent: den 10 juni 2025 11:44
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [RFC PATCH 1/9] bitbake.conf: set BB_GIT_DEFAULT_DESTSUFFIX to match default S value

This change does a huge amount more than that subject indicates. Would it be possible to give it a subject that reflects this?

Quoted 36 lines

From: Alexander Kanavin <[email protected]>

This allows removing all the S = ${WORKDIR}/git assignments.

A few recipes are setting S to a sub-directory of the git tree and need to be adjusted accordingly.

bzip2 recipe is fetching a tarball and separately cloning tests; adjust the recipe to put the latter into 'bzip2-tests', instead of 'git'.

devupstream.bbclass no longer needs to rewrite S, and is adjusted accordingly.

Adjust scripts/lib/recipetool/append.py to not hardcode 'git' as unpack destination.

Adjust kernel-yocto.bbclass to use the git unpack variable instead of hardcoding 'git' (there's also removal of repetition of string constants and a correction of workdir/unpackdir mismatch in one of the if-else branches).

Ensure build-appliance-image recipe does not use 'git' as checkout directory for
poky repo, but rather explicitly name it 'poky'.

Ensure reproducible.py code that looks for git repositories does not hardcode 'git' but uses the destination set by BB_GIT_DEFAULT_DESTSUFFIX.

Ensure recipetool does not write out unneeded S settings into newly created recipes that fetch from git.

Adjust selftest to not hardcode 'git' as unpack directory.

---

[cut]

Quoted 7 lines
 200 files changed, 46 insertions(+), 239 deletions(-)
meta-selftest/recipes-devtools/mtd/mtd-utils-selftest_git.bb +0 -0
index ca2141c9722..e87e8f15b3e 100644

meta-selftest/recipes-devtools/mtd/mtd-utils-selftest_git.bb SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \ · line 23

Quoted 7 lines
meta-selftest/recipes-devtools/mtd/mtd-utils-selftest_git.bb +0 -1
@@ -18,7 +18,6 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr

While not technically a problem, this introduces double empty lines to many recipes.

//Peter

#16 lore raw
Quoted 4 lines · Peter Kjellerstedt
Quoted 1 line

Subject: [OE-core] [RFC PATCH 1/9] bitbake.conf: set BB_GIT_DEFAULT_DESTSUFFIX to match default S value

This change does a huge amount more than that subject indicates. Would it be possible to give it a subject that reflects this?

Yes, how about "meta: eliminate S in recipes that fetch from git via setting BB_GIT_DEFAULT_DESTSUFFIX" ?

Quoted 8 lines
Quoted 5 lines

-S = "${WORKDIR}/git"

 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr

While not technically a problem, this introduces double empty lines to many recipes.

Yes, I'll see if I can trim these out. Normally I find it hard to care about whitespace, but this wastes precious vertical space.

Alex

#17 lore raw
Quoted 11 lines · Alexander Kanavin
Quoted 8 lines
Quoted 5 lines

-S = "${WORKDIR}/git"

 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr

While not technically a problem, this introduces double empty lines to many recipes.

Yes, I'll see if I can trim these out. Normally I find it hard to care about whitespace, but this wastes precious vertical space.

This is now done in a separate commit:
https://git.yoctoproject.org/poky-contrib/commit/?h=akanavin/s-in-unpackdir

Alex

#18 lore raw
In reply to Alexander Kanavin

Possibly the recipes would need more modifications than this, especially the ones using default ${S} (maybe?).

I tried to apply it on the current master and build some base recipes in a clean build dir. I tried to build git recipe (was curious how it behaves). First gnu-config-native failed to install, as it couldn't find some files due to the move. I fixed that, but right after pkgconfig and binutils failed to patch - the src is in .../sources/git folder, but it is trying to patch in .../sources/${PN}-${PV}.

Or am I missing something?

#19 lore raw
Quoted 4 lines · Gyorgy Sarvari

Possibly the recipes would need more modifications than this, especially the ones using default ${S} (maybe?).

Quoted 8 lines

I tried to apply it on the current master and build some base recipes in a clean build dir. I tried to build git recipe (was curious how it behaves). First gnu-config-native failed to install, as it couldn't find some files due to the move. I fixed that, but right after pkgconfig and binutils failed to patch - the src is in .../sources/git folder, but it is trying to patch in .../sources/${PN}-${PV}.

Or am I missing something?

Pulling these changes into incremental builds should trigger a re-run of do_unpack for all affected recipes, and if it isn't happening, the task hash dependency on where unpacking goes to is missing. I'll see if I can identify and fix this.

On the autobuilder all builds happen into a clean build directory, and so issues like these aren't seen.

Alex

#20 lore raw
In reply to Gyorgy Sarvari
Quoted 11 lines · Gyorgy Sarvari

Possibly the recipes would need more modifications than this, especially the ones using default ${S} (maybe?).

I tried to apply it on the current master and build some base recipes in a clean build dir. I tried to build git recipe (was curious how it behaves). First gnu-config-native failed to install, as it couldn't find some files due to the move. I fixed that, but right after pkgconfig and binutils failed to patch - the src is in .../sources/git folder, but it is trying to patch in .../sources/${PN}-${PV}.

Or am I missing something?

I just realized: did you take the necessary bitbake patch?

https://patchwork.yoctoproject.org/project/bitbake/patch/[email protected]/

Alex

#21 lore raw
Quoted 11 lines · Alexander Kanavin
Quoted 10 lines · Gyorgy Sarvari

Possibly the recipes would need more modifications than this, especially the ones using default ${S} (maybe?).

I tried to apply it on the current master and build some base recipes in a clean build dir. I tried to build git recipe (was curious how it behaves). First gnu-config-native failed to install, as it couldn't find some files due to the move. I fixed that, but right after pkgconfig and binutils failed to patch - the src is in .../sources/git folder, but it is trying to patch in .../sources/${PN}-${PV}.

Quoted 4 lines
Quoted 1 line

Or am I missing something?

I just realized: did you take the necessary bitbake patch?

https://patchwork.yoctoproject.org/project/bitbake/patch/[email protected]/

Hmmm.... quite possibly no, I grabbed only this series. Let me give it a go.

Quoted 2 lines

Alex

A message that is not in the archive (sent off-list or not yet received): [email protected]

#23 lore raw
Quoted 12 lines · Gyorgy Sarvari via lists.openembedded.org
Quoted 11 lines · Alexander Kanavin
Quoted 10 lines · Gyorgy Sarvari

Possibly the recipes would need more modifications than this, especially the ones using default ${S} (maybe?).

I tried to apply it on the current master and build some base recipes in a clean build dir. I tried to build git recipe (was curious how it behaves). First gnu-config-native failed to install, as it couldn't find some files due to the move. I fixed that, but right after pkgconfig and binutils failed to patch - the src is in .../sources/git folder, but it is trying to patch in .../sources/${PN}-${PV}.

Quoted 5 lines
Quoted 4 lines
Quoted 1 line

Or am I missing something?

I just realized: did you take the necessary bitbake patch?

https://patchwork.yoctoproject.org/project/bitbake/patch/[email protected]/

Hmmm.... quite possibly no, I grabbed only this series. Let me give it a go.

Yup, thank you, that was it, mystery solved.

Quoted 10 lines
Quoted 1 line

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#218591): https://lists.openembedded.org/g/openembedded-core/message/218591
Mute This Topic: https://lists.openembedded.org/mt/113566716/6084445
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-