meta-openembedded/all: adapt to UNPACKDIR changes

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

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

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

29 files changed, 7 insertions, 30 deletions

diff --git a/meta-oe/recipes-core/basu/basu_0.2.1.bb b/meta-oe/recipes-core/basu/basu_0.2.1.bb
index 1b4d5a0fe5..330fe1c607 100644
--- a/meta-oe/recipes-core/basu/basu_0.2.1.bb
+++ b/meta-oe/recipes-core/basu/basu_0.2.1.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://git.sr.ht/~emersion/basu;protocol=https;branch=master"
 
 DEPENDS += "gperf-native"
 
-S = "${WORKDIR}/git"
 PV = "0.2.1+git"
 SRCREV = "a08cf5a575325435040d35710dbac3d0c32b1676"
 
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
index 992a414009..0908409e1e 100644
--- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
+++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
@@ -12,7 +12,6 @@ DEPENDS = "libsigc++-3"
 
 RDEPENDS:${PN}:class-target = "${VIRTUAL-RUNTIME_dbus}"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig cmake
 
diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
index 086a37ca1c..e99bf28ce5 100644
--- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
+++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc
index 713b012177..ff2a106c6e 100644
--- a/meta-oe/recipes-core/emlog/emlog.inc
+++ b/meta-oe/recipes-core/emlog/emlog.inc
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master"
 SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch"
 SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca"
 PV = "0.70+git"
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "nicupavel:emlog"
 
diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.8.bb b/meta-oe/recipes-core/glfw/glfw_3.3.8.bb
index 684355ef3e..8abb13b580 100644
--- a/meta-oe/recipes-core/glfw/glfw_3.3.8.bb
+++ b/meta-oe/recipes-core/glfw/glfw_3.3.8.bb
@@ -14,7 +14,6 @@ PV .= "+git"
 SRCREV = "7482de6071d21db77a7236155da44c172a7f6c9e"
 SRC_URI = "git://github.com/glfw/glfw.git;branch=3.3-stable;protocol=https"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF"
 
diff --git a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
index ebcc2b267b..97a5592f94 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
+++ b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "git://gitlab.gnome.org/pwithnall/libglib-testing.git;protocol=https;branch=main"
 
 PV = "0.1.1"
-S = "${WORKDIR}/git"
 SRCREV = "e326f73a7139c5e54fcf926896ae6e4cc899a1a7"
 
 inherit  meson pkgconfig
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
index a45d31edc2..48a1a2a624 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
@@ -14,7 +14,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
 SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a"
 
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/${BPN}/include/ ${libdir}/${BPN}/proc/ ${libdir}/giomm-2.68/include/"
diff --git a/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-oe/recipes-core/libnfc/libnfc_git.bb
index a97a2841f7..ac3a0d85a4 100644
--- a/meta-oe/recipes-core/libnfc/libnfc_git.bb
+++ b/meta-oe/recipes-core/libnfc/libnfc_git.bb
@@ -9,7 +9,6 @@ inherit autotools pkgconfig
 
 PV = "1.8.0+git"
 
-S = "${WORKDIR}/git"
 SRCREV = "f02ff51449240102c27a97173dc495e8e7789046"
 SRC_URI = "git://github.com/nfc-tools/libnfc.git;branch=master;protocol=https"
 
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb
index 9a3ddfd15c..3496220fe1 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359b
 UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/2.12/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/libsigc++-${PV}"
+S = "${UNPACKDIR}/libsigc++-${PV}"
 
 inherit meson
 
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
index 38a80bbf3e..0bfe55fd93 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "c3d23b37dfd6e39f2e09f091b77b1541fbfa17c4f0b6bf5c89baef7229
 UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/3.6/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/libsigc++-${PV}"
+S = "${UNPACKDIR}/libsigc++-${PV}"
 
 inherit setuptools3 meson
 
diff --git a/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb b/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb
index 0271602555..58c2697b9a 100644
--- a/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb
+++ b/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb
@@ -11,7 +11,7 @@ DEPENDS = "libxml2 glibmm"
 GNOMEBN = "libxml++"
 inherit gnomebase ptest
 
-S = "${WORKDIR}/libxml++-${PV}"
+S = "${UNPACKDIR}/libxml++-${PV}"
 
 SRC_URI[archive.sha256sum] = "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098"
 
diff --git a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
index a7ac358f27..948d50b471 100644
--- a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
+++ b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=https;branch=maste
            "
 SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig vala
 
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
index a013d99ba1..cf98c0cf2e 100644
--- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
+++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master
 
 SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de"
 
-S = "${WORKDIR}/git"
 
 RCONFLICTS:${PN} += "minizip"
 
diff --git a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb b/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
index 0d36ffbcf6..56cd28c9ae 100644
--- a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
+++ b/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b3
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.gz"
 UPSTREAM_CHECK_URI = "http://zlib.net/"
 
-S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
+S = "${UNPACKDIR}/zlib-${PV}/contrib/minizip"
 
 SRC_URI[sha256sum] = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"
 
diff --git a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb
index fe3cf73e43..9c4db7efec 100644
--- a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb
+++ b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb
@@ -12,4 +12,3 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v79.bb b/meta-oe/recipes-core/ndctl/ndctl_v79.bb
index 1ad1476d93..4014e3bca6 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v79.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v79.bb
@@ -18,7 +18,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
 
 DEPENDS = "kmod udev json-c keyutils iniparser libtraceevent libtracefs"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMESON += "-Diniparserdir=${STAGING_INCDIR}/iniparser"
 
diff --git a/meta-oe/recipes-core/opencl/clpeak_1.1.4.bb b/meta-oe/recipes-core/opencl/clpeak_1.1.4.bb
index 8c05ad6d02..59f807b7ae 100644
--- a/meta-oe/recipes-core/opencl/clpeak_1.1.4.bb
+++ b/meta-oe/recipes-core/opencl/clpeak_1.1.4.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 SRCREV = "527695de8393a3144863a0a07f9b92f1c734d1c4"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
index d43ea281ae..9e32242e31 100644
--- a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
+++ b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https;branch=master"
 
 SRCREV = "fdde6677b21329432db8b481e2637cd10f7d3cb2"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb b/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
index b815c22eec..7335712d6f 100644
--- a/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
+++ b/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
@@ -10,7 +10,6 @@ SRCREV = "c7b4aded1cab9560b226041dd962f63375a9a384"
 
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb
index e374ef1863..c766a66640 100644
--- a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb
+++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb
@@ -8,7 +8,6 @@ inherit pkgconfig cmake
 DEPENDS += "opencl-headers opencl-icd-loader"
 RDEPENDS:${PN} += "python3-core python3-io"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \
            file://0001-Ignore-Compiler-Warnings.patch"
diff --git a/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
index 412b573cb4..0ec2fe5f33 100644
--- a/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
+++ b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
@@ -4,7 +4,6 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "base"
 
-S = "${WORKDIR}/git"
 SRCREV = "4ea6df132107e3b4b9407f903204b5522fdffcd6"
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https \
            file://0001-Command-buffer-supported-queue-properties-265.patch \
diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
index 38db7a2453..7cfc75f5ed 100644
--- a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
+++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
@@ -11,7 +11,6 @@ DEPENDS += "opencl-headers"
 PROVIDES = "virtual/opencl-icd"
 RPROVIDES:${PN} = "virtual-opencl-icd"
 
-S = "${WORKDIR}/git"
 
 SRCREV = "861b68b290e76d08e7241608479c16431f529945"
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"
diff --git a/meta-oe/recipes-core/pim435/pim435_git.bb b/meta-oe/recipes-core/pim435/pim435_git.bb
index 8fc8749a1f..a18e889683 100644
--- a/meta-oe/recipes-core/pim435/pim435_git.bb
+++ b/meta-oe/recipes-core/pim435/pim435_git.bb
@@ -15,7 +15,6 @@ SRCREV = "445ed623ec8d3ecbb1d566900b4ef3fb3031d689"
 # Upstream repo does not tag
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "i2c-tools"
 
diff --git a/meta-oe/recipes-core/safec/safec_3.7.1.bb b/meta-oe/recipes-core/safec/safec_3.7.1.bb
index 9dd6f1c7cc..a2f66e9a1a 100644
--- a/meta-oe/recipes-core/safec/safec_3.7.1.bb
+++ b/meta-oe/recipes-core/safec/safec_3.7.1.bb
@@ -6,7 +6,6 @@ SECTION = "lib"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 SRCREV = "f9add9245b97c7bda6e28cceb0ee37fb7e254fd8"
 SRC_URI = "git://github.com/rurban/safeclib.git;branch=master;protocol=https \
            file://0001-strpbrk_s-Remove-unused-variable-len.patch \
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
index ceb422325c..9c39d40d23 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
@@ -55,7 +55,6 @@ CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 "
 
 EXTRA_OEMESON += "-Dstatic-libsystemd=pic"
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN}-dev = ""
 
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.1.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.1.0.bb
index c55c305611..0467c834b8 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.1.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.1.0.bb
@@ -11,6 +11,6 @@ DEPENDS += "expat"
 SRCREV = "0261d0ec60b68c1f0a6ec9acf63d1379f7d569f8"
 SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;tag=v${PV};subpath=tools"
 
-S = "${WORKDIR}/tools"
+S = "${UNPACKDIR}/tools"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb
index f3799adb3c..62b30e9894 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb
@@ -24,7 +24,6 @@ EXTRA_OECMAKE = "-DSDBUSCPP_BUILD_CODEGEN=OFF \
                  -DSDBUSCPP_BUILD_DOCS=ON \
                  -DSDBUSCPP_BUILD_DOXYGEN_DOCS=OFF"
 
-S = "${WORKDIR}/git"
 
 # Link libatomic on architectures without 64bit atomics fixes
 # libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8'
diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb
index e8b4a7fef9..530104e964 100644
--- a/meta-oe/recipes-core/usleep/usleep_1.2.bb
+++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb
@@ -3,8 +3,7 @@ SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 DEPENDS = "popt"
 
 SRC_URI = "file://usleep.c \
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.1.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.1.0.bb
index d7c8c44aad..fb95a2de5c 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.1.0.bb
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.1.0.bb
@@ -13,7 +13,6 @@ SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main \
 "
 
 SRCREV = "18b963ed6f612ac30ebca92426280cf4c1451f6a"
-S = "${WORKDIR}/git"
 
 require ${BPN}-crates.inc