recipes-extended: adapt to UNPACKDIR changes

Adjusting our extended recipes to the OE core UNPACKDIR processing.

We mainly just drop our S = assignments for git recipes

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

28 files changed, 6 insertions, 50 deletions

diff --git a/recipes-extended/ceph/ceph_git.bb b/recipes-extended/ceph/ceph_git.bb
index 2eaa335a..2cf1c88a 100644
--- a/recipes-extended/ceph/ceph_git.bb
+++ b/recipes-extended/ceph/ceph_git.bb
@@ -21,8 +21,6 @@ SRC_URI = "gitsm://github.com/ceph/ceph.git;protocol=https;branch=main \
 SRCREV = "a53e858fd7cc6fd8c04f37d503ce9ed7080f2da6"
 PV = "20.0.0+git"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "boost bzip2 curl cryptsetup expat gperf-native \
            keyutils libaio libibverbs lua lz4 \
            nspr nss ninja-native \
diff --git a/recipes-extended/cloud-init/cloud-init_git.bb b/recipes-extended/cloud-init/cloud-init_git.bb
index d40035c4..d150b759 100644
--- a/recipes-extended/cloud-init/cloud-init_git.bb
+++ b/recipes-extended/cloud-init/cloud-init_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/canonical/cloud-init;branch=25.1.x;protocol=https \
 
 PV = "v25.1.1+git"
 
-S = "${WORKDIR}/git"
-
 DISTUTILS_INSTALL_ARGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}"
 DISTUTILS_INSTALL_ARGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}"
 
diff --git a/recipes-extended/dev86/dev86_git.bb b/recipes-extended/dev86/dev86_git.bb
index d43d1200..fb854ed1 100644
--- a/recipes-extended/dev86/dev86_git.bb
+++ b/recipes-extended/dev86/dev86_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https;branch=master \
     file://0001-cpp-fix-race-writing-token.h-files.patch \
 "
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "gperf-native"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-extended/diod/diod_1.0.24.bb b/recipes-extended/diod/diod_1.0.24.bb
index 72a31a68..9a78e7da 100644
--- a/recipes-extended/diod/diod_1.0.24.bb
+++ b/recipes-extended/diod/diod_1.0.24.bb
@@ -20,8 +20,6 @@ DEPENDS = "libcap ncurses lua"
 EXTRA_OECONF = "--disable-auth \
                 --with-systemdsystemunitdir=${systemd_unitdir}/system"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig systemd
 
 do_install:append () {
diff --git a/recipes-extended/fuse-overlayfs/fuse-overlayfs_1.14.bb b/recipes-extended/fuse-overlayfs/fuse-overlayfs_1.14.bb
index 0f6d0fb6..e4c59d4a 100644
--- a/recipes-extended/fuse-overlayfs/fuse-overlayfs_1.14.bb
+++ b/recipes-extended/fuse-overlayfs/fuse-overlayfs_1.14.bb
@@ -10,6 +10,4 @@ SRC_URI = "git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=ht
 
 DEPENDS = "fuse3"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb
index 8625919d..c39b86ba 100644
--- a/recipes-extended/ipxe/ipxe_git.bb
+++ b/recipes-extended/ipxe/ipxe_git.bb
@@ -25,6 +25,8 @@ SRC_URI = " \
     file://0004-build-Remove-unsafe-disable-function-wrapper-from-le.patch;patchdir=.. \
     "
 
+S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}/src"
+
 FILES:${PN} = "/usr/share/firmware/*.rom"
 
 EXTRA_OEMAKE = ' \
@@ -35,8 +37,6 @@ EXTRA_OEMAKE = ' \
     NO_WERROR="1" \
 '
 
-S = "${WORKDIR}/git/src"
-
 do_compile() {
     # Makefile.housekeeping:111: GNU gold is unsuitable for building iPXE
     # Makefile.housekeeping:112: Use GNU ld instead
diff --git a/recipes-extended/irqbalance/irqbalance_git.bb b/recipes-extended/irqbalance/irqbalance_git.bb
index 068cf12e..46b8ed0f 100644
--- a/recipes-extended/irqbalance/irqbalance_git.bb
+++ b/recipes-extended/irqbalance/irqbalance_git.bb
@@ -13,6 +13,4 @@ SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \
            file://0001-add-void-to-fix-strict-prototypes.patch \
           "
 
-S = "${WORKDIR}/git"
-
 CFLAGS += "-Wno-error=format-security"
diff --git a/recipes-extended/kvmtool/kvmtool_git.bb b/recipes-extended/kvmtool/kvmtool_git.bb
index 6597873d..31443b0a 100644
--- a/recipes-extended/kvmtool/kvmtool_git.bb
+++ b/recipes-extended/kvmtool/kvmtool_git.bb
@@ -19,8 +19,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git;branch
 SRCREV = "e48563f5c4a48fe6a6bc2a98a9a7c84a10f043be"
 PV = "5.10.0+git"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = 'V=1 EXTRA_CFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated -I${STAGING_KERNEL_BUILDDIR}/arch/${ARCH}/include/generated"'
 
 do_install() {
diff --git a/recipes-extended/libvirt/libvirt-dbus_1.4.1.bb b/recipes-extended/libvirt/libvirt-dbus_1.4.1.bb
index 3f6da334..767470e2 100644
--- a/recipes-extended/libvirt/libvirt-dbus_1.4.1.bb
+++ b/recipes-extended/libvirt/libvirt-dbus_1.4.1.bb
@@ -13,7 +13,6 @@ DEPENDS += "glib-2.0 libvirt libvirt-glib python3-docutils-native"
 SRC_URI = "git://gitlab.com/libvirt/libvirt-dbus.git;nobranch=1;protocol=https"
 
 SRCREV = "0c355bb8921d7cbccf93f41a8615fcd973e64f70"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/recipes-extended/libvirt/libvirt-glib_5.0.0.bb b/recipes-extended/libvirt/libvirt-glib_5.0.0.bb
index 4435ca0b..82089b37 100644
--- a/recipes-extended/libvirt/libvirt-glib_5.0.0.bb
+++ b/recipes-extended/libvirt/libvirt-glib_5.0.0.bb
@@ -11,7 +11,6 @@ SRC_URI = " \
 "
 
 SRCREV = "9b26bec8828a38fcb3bc0e5f6f33b03fa99c4b68"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gobject-introspection gettext vala gtk-doc
 
diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb
index 7ed708f5..6557af17 100644
--- a/recipes-extended/libvirt/libvirt_git.bb
+++ b/recipes-extended/libvirt/libvirt_git.bb
@@ -43,8 +43,6 @@ SRC_URI = "gitsm://github.com/libvirt/libvirt.git;name=libvirt;protocol=https;br
            file://0001-qemu_nbdkit.c-use-llu-to-print-time_t.patch \
           "
 
-S = "${WORKDIR}/git"
-
 inherit meson gettext update-rc.d pkgconfig systemd useradd perlnative
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "-r qemu; -r kvm; -r libvirt; -r virtlogin"
diff --git a/recipes-extended/libvmi/libvmi_git.bb b/recipes-extended/libvmi/libvmi_git.bb
index cd2eba7f..1ebdb05e 100644
--- a/recipes-extended/libvmi/libvmi_git.bb
+++ b/recipes-extended/libvmi/libvmi_git.bb
@@ -14,8 +14,6 @@ SRC_URI = "git://github.com/libvmi/libvmi.git;branch=master;protocol=https \
 
 SRCREV = "f02aeb751fd27bd4ae753dcd5904a4ef3232821e"
 
-S = "${WORKDIR}/git"
-
 inherit autotools-brokensep pkgconfig
 
 # Noramlly dynamic libs would be of the form libXX.so.1.0.0 in which case
diff --git a/recipes-extended/nagios/nagios-core_git.bb b/recipes-extended/nagios/nagios-core_git.bb
index 5ffb4e17..3cb05cb3 100644
--- a/recipes-extended/nagios/nagios-core_git.bb
+++ b/recipes-extended/nagios/nagios-core_git.bb
@@ -23,8 +23,6 @@ SRC_URI = "git://github.com/NagiosEnterprises/nagioscore.git;protocol=https;bran
 
 PV = "4.5.9+git"
 
-S = "${WORKDIR}/git"
-
 inherit autotools-brokensep update-rc.d systemd update-alternatives pkgconfig
 
 DEPENDS = "gd unzip-native openssl"
diff --git a/recipes-extended/nagios/nagios-plugins_git.bb b/recipes-extended/nagios/nagios-plugins_git.bb
index 82263def..31661f5d 100644
--- a/recipes-extended/nagios/nagios-plugins_git.bb
+++ b/recipes-extended/nagios/nagios-plugins_git.bb
@@ -12,7 +12,6 @@ SRCREV = "7c74420158c3e228b3d66d4c781a6abc7a93075a"
 SRC_URI = "git://github.com/nagios-plugins/nagios-plugins.git;protocol=https;branch=master"
 
 PV = "2.4.12+git"
-S = "${WORKDIR}/git"
 
 inherit autotools gettext pkgconfig autotools-brokensep
 
diff --git a/recipes-extended/oath/oath_2.6.2.bb b/recipes-extended/oath/oath_2.6.2.bb
index 3d962869..a9d9fab3 100644
--- a/recipes-extended/oath/oath_2.6.2.bb
+++ b/recipes-extended/oath/oath_2.6.2.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolki
            file://0001-oath-fix-macro-definition-error.patch \
 "
 
-S = "${WORKDIR}/${BPN}-toolkit-${PV}"
+S = "${UNPACKDIR}/${BPN}-toolkit-${PV}"
 SRC_URI[md5sum] = "4a05cd4768764843bd5493609a6bdb17"
 SRC_URI[sha256sum] = "b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0"
 
diff --git a/recipes-extended/rootlesskit/rootlesskit_git.bb b/recipes-extended/rootlesskit/rootlesskit_git.bb
index f8dd55af..13a53090 100644
--- a/recipes-extended/rootlesskit/rootlesskit_git.bb
+++ b/recipes-extended/rootlesskit/rootlesskit_git.bb
@@ -29,8 +29,6 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd
 
 GO_IMPORT = "import"
 
-S = "${WORKDIR}/git"
-
 PV = "v2.3.4+git"
 
 ROOTLESS_PKG = "github.com/rootless-containers/rootlesskit"
diff --git a/recipes-extended/seabios/seabios_1.16.0.bb b/recipes-extended/seabios/seabios_1.16.0.bb
index ebab54bf..22959fc4 100644
--- a/recipes-extended/seabios/seabios_1.16.0.bb
+++ b/recipes-extended/seabios/seabios_1.16.0.bb
@@ -10,7 +10,7 @@ SRC_URI = " \
     file://hostcc.patch \
     file://python3.patch \
     "
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${UNPACKDIR}/${PN}-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
                     file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
diff --git a/recipes-extended/upx/libucl_1.03.bb b/recipes-extended/upx/libucl_1.03.bb
index 57a5602e..da11feeb 100644
--- a/recipes-extended/upx/libucl_1.03.bb
+++ b/recipes-extended/upx/libucl_1.03.bb
@@ -9,11 +9,11 @@ SRC_URI = "http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz \
            file://use-static-assert.patch \
            file://Reproducible-build.patch"
 
+S = "${UNPACKDIR}/ucl-${PV}"
+
 SRC_URI[md5sum] = "852bd691d8abc75b52053465846fba34"
 SRC_URI[sha256sum] = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"
 
-S = "${WORKDIR}/ucl-${PV}"
-
 inherit autotools lib_package
 
 BBCLASSEXTEND = "native"
diff --git a/recipes-extended/virt-manager/virt-manager_git.bb b/recipes-extended/virt-manager/virt-manager_git.bb
index 4af8977c..9d206641 100644
--- a/recipes-extended/virt-manager/virt-manager_git.bb
+++ b/recipes-extended/virt-manager/virt-manager_git.bb
@@ -12,8 +12,6 @@ SRC_URI = " \
 
 PV = "v5.0.0+git"
 
-S = "${WORKDIR}/git"
-
 PACKAGECONFIG ??= "gui"
 PACKAGECONFIG[gui] = ",-Dupdate-icon-cache=false -Dcompile-schemas=false,python3-pygobject"
 
diff --git a/recipes-extended/virt-viewer/virt-viewer_git.bb b/recipes-extended/virt-viewer/virt-viewer_git.bb
index 322d92ff..0bfe6363 100644
--- a/recipes-extended/virt-viewer/virt-viewer_git.bb
+++ b/recipes-extended/virt-viewer/virt-viewer_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://gitlab.com/virt-viewer/virt-viewer.git;protocol=https;branch=ma
 
 SRCREV = "107f60c168c405cf1782b686a65bf4af16ec8c9d"
 PV = "11.0+git"
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
diff --git a/recipes-extended/xen/xen-tools_4.19.bb b/recipes-extended/xen/xen-tools_4.19.bb
index 3667e044..608b9cf4 100644
--- a/recipes-extended/xen/xen-tools_4.19.bb
+++ b/recipes-extended/xen/xen-tools_4.19.bb
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
 PV = "${XEN_REL}+stable"
 
-S = "${WORKDIR}/git"
-
 DEFAULT_PREFERENCE ??= "-1"
 
 require xen.inc
diff --git a/recipes-extended/xen/xen-tools_4.20.bb b/recipes-extended/xen/xen-tools_4.20.bb
index 0f864e63..aa3391f0 100644
--- a/recipes-extended/xen/xen-tools_4.20.bb
+++ b/recipes-extended/xen/xen-tools_4.20.bb
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
 PV = "${XEN_REL}+stable"
 
-S = "${WORKDIR}/git"
-
 DEFAULT_PREFERENCE ??= "-1"
 
 require xen.inc
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index 47d1e236..14624254 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
 PV = "${XEN_REL}+git"
 
-S = "${WORKDIR}/git"
-
 DEFAULT_PREFERENCE ??= "-1"
 
 require xen.inc
diff --git a/recipes-extended/xen/xen_4.19.bb b/recipes-extended/xen/xen_4.19.bb
index 3ee29ae1..fa7165bf 100644
--- a/recipes-extended/xen/xen_4.19.bb
+++ b/recipes-extended/xen/xen_4.19.bb
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
 PV = "${XEN_REL}+stable"
 
-S = "${WORKDIR}/git"
-
 DEFAULT_PREFERENCE ??= "-1"
 
 require xen.inc
diff --git a/recipes-extended/xen/xen_4.20.bb b/recipes-extended/xen/xen_4.20.bb
index 85c56296..de3e8934 100644
--- a/recipes-extended/xen/xen_4.20.bb
+++ b/recipes-extended/xen/xen_4.20.bb
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
 PV = "${XEN_REL}+stable"
 
-S = "${WORKDIR}/git"
-
 DEFAULT_PREFERENCE ??= "-1"
 
 require xen.inc
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index 18b19be7..8d66dd0a 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
 
 PV = "${XEN_REL}+git"
 
-S = "${WORKDIR}/git"
-
 DEFAULT_PREFERENCE ??= "-1"
 
 require xen.inc
diff --git a/recipes-extended/xen/xtf_git.bb b/recipes-extended/xen/xtf_git.bb
index f1e76f7b..f6792c1f 100644
--- a/recipes-extended/xen/xtf_git.bb
+++ b/recipes-extended/xen/xtf_git.bb
@@ -14,8 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a5680865974e05cf0510615ee1d745d8"
 
 PV = "0+git"
 
-S = "${WORKDIR}/git"
-
 inherit python3native
 
 PACKAGES = "${PN}"
diff --git a/recipes-extended/xvisor/xvisor_git.bb b/recipes-extended/xvisor/xvisor_git.bb
index 205951e9..1d6e79f9 100644
--- a/recipes-extended/xvisor/xvisor_git.bb
+++ b/recipes-extended/xvisor/xvisor_git.bb
@@ -17,8 +17,6 @@ SRC_URI = "git://github.com/avpatel/xvisor-next.git;branch=master;protocol=https
     file://0001-build-use-usr-bin-env-for-python-scripts.patch \
 "
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE += "ARCH=\"${@map_xvisor_arch(d.getVar('TARGET_ARCH'), d)}\" I=${D}"
 
 CONFIG = "${@get_oemake_config(d.getVar('TARGET_ARCH'), d)}"