layer/global: update S assignments

Updating meta-cloud-services and sublayers to comply with the UNPACKDIR
changes. The techniques mentioned in the following commit are used:

  Author: Alexander Kanavin <alex@linutronix.de>
  Date:   Tue Jun 24 13:53:51 2025 +0200

      migration-guides/migration-5.3.rst: add guidance for breaking WORKDIR changes

      (From yocto-docs rev: f59504d8706a817e0b5a6235ebb69cb3b3ebb277)

      Signed-off-by: Alexander Kanavin <alex@linutronix.de>
      Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
      Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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

123 files changed, 7 insertions, 220 deletions

diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb
index 6941234..81b3cd0 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = " http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz "
 
-
-S = "${WORKDIR}/open-iscsi-${PV}"
+S = "${UNPACKDIR}/open-iscsi-${PV}"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 inherit module
@@ -22,6 +21,5 @@ do_install() {
         oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' LDFLAGS="" DESTDIR="${D}" install_kernel
 }
 
-
 SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7"
 SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9"
diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
index d92404a..9401ca4 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=mast
 
 SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f"
 
-S = "${WORKDIR}/git"
 B = "${S}"
 
 PARALLEL_MAKEINST = ""
diff --git a/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb b/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb
index 51ce60c..d96196c 100644
--- a/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb
+++ b/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/${SRCNAME}-${PV}.
 SRC_URI[md5sum] = "e3ea2a6dc76931cf638b5227aceabf60"
 SRC_URI[sha256sum] = "0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index c71229d..90ed8d7 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/openstack/barbican.git;branch=master;protocol=https
 
 SRCREV = "e6f05febbe18a86e4e6b05acc5f4868fa3beb291"
 PV = "2015.1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools3 identity hosts useradd default_configs monitor
 
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index ca5d62f..1592cd2 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -14,10 +14,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 # dropped for juno:
 #   file://ceilometer-builtin-tests-config-location.patch
 
-
 SRCREV = "026a5d475e1958bf761e41c2bb426b09e0f3d270"
 PV = "5.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 CEILOMETER_SECRET ?= "12121212"
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 2a3ef47..5f56024 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 SRCREV = "4fb3a702ba8c3de24c41a6f706597bfa81e60435"
 PV = "11.1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 systemd useradd identity default_configs hosts monitor
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index bd360ed..2f62677 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "\
 
 PV="3.1.0+git${SRCPV}"
 SRCREV="3640aeab6e11987288a2f149fbeedb1c026045e2"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 monitor
 
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 9fa23ed..06e4d93 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -17,8 +17,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 SRCREV = "06af2eb5abe0332f7035a7d7c2fbfd19fbc4dae7"
 PV = "15.0.0+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3 identity default_configs hosts monitor useradd systemd
 
 USER = "glance"
@@ -35,7 +33,6 @@ GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
  glance.store.filesystem.Store,\
  glance.store.http.Store"
 
-
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
 KEYSTONE_HOST="${CONTROLLER_IP}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index 01be0cf..36062e8 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/python-glanceclient.git;branch=master;prot
 
 PV = "2.17.0+git${SRCPV}"
 SRCREV = "40c19aa44361e13ac997d325d357d3e4748fa063"
-S = "${WORKDIR}/git"
 
 DEPENDS += " \
         gmp \
diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
index 9ae104a..2f3ec2a 100644
--- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
@@ -11,8 +11,6 @@ SRC_URI = "\
         git://github.com/openstack/glance_store.git;branch=master;protocol=https \
         "
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 0070928..c46fc7a 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 
 SRCREV = "4348b7ababd1048e17ec354ca38c903c908cd74e"
 PV = "5.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn"
 KEYSTONE_HOST="${CONTROLLER_IP}"
diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
index 0c15380..b1f7b4f 100644
--- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
@@ -31,11 +31,9 @@ SRC_URI = "git://github.com/openstack/python-heatclient.git;branch=master;protoc
 
 PV = "1.17.0+git${SRCPV}"
 SRCREV = "8af5deb458d51f4ec16e769d7fd6c94655f82f5f"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
 
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 4eedead..4a2fb11 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -88,7 +88,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 SRCREV = "246ff9f81248a00a434e66d18fad70519ba811cc"
 PV = "12.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 systemd python3-dir default_configs monitor useradd
 
diff --git a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
index 72f5a04..375969b 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana
 
 PV="git${SRCPV}"
 SRCREV="0bd376242f8522edef7031d2339b9533b86c17aa"
-S = "${WORKDIR}/git"
 
 inherit python3-dir
 
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index a1b5dd0..5ec5af2 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -24,8 +24,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 SRCREV = "d07677aba54362a4a3aa2d165b155105ffe30d73"
 PV = "12.0.0+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3 identity hosts default_configs monitor useradd systemd
 
 SERVICE_TOKEN = "password"
diff --git a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
index 343942f..84e766d 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV="1.9.1+git${SRCPV}"
 SRCREV="f0d7e470c2ef1702b2715ceb2fd8a00fce2a23be"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 11dbb84..7229e47 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -30,8 +30,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 SRCREV = "7fd30cb652fb5d516b4c1f5415f18f54d7a40c2a"
 PV = "11.0.2+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3 systemd useradd identity hosts default_configs monitor
 
 USER = "neutron"
@@ -106,7 +104,6 @@ do_install:append() {
     sed -e "/^#connection = .*/aconnection = postgresql+psycopg2://${DB_USER}:${DB_PASSWORD}@localhost/neutron" \
             -i ${CONF_FILE}
 
-
     # ml2_conf.ini changes (replace with .ini file editing)
     CONF_FILE=${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
     sed -e "/#type_drivers =/atype_drivers = flat,vlan" -i ${CONF_FILE} 
@@ -262,7 +259,6 @@ FILES:${PN} = "${libdir}/*"
 FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
 RDEPENDS:${SRCNAME}-tests += " bash"
 
-
 FILES:${SRCNAME} = " \
     ${bindir}/neutron-db-manage \
     ${bindir}/neutron-rootwrap \
@@ -429,6 +425,5 @@ SYSTEMD_AUTO_ENABLE:${SRCNAME}-dhcp-agent = "disable"
 SYSTEMD_AUTO_ENABLE:${SRCNAME}-linuxbridge-agent = "disable"
 SYSTEMD_AUTO_ENABLE:${SRCNAME}-metadata-agent = "disable"
 
-
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "neutron"
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index 42993e6..6984d3e 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -41,7 +41,6 @@ SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=stable/pik
 
 PV = "6.5.0+git${SRCPV}"
 SRCREV = "e145c4ef8a0e8390f0468df422a757760e77f823"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 monitor rmargparse
 
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 7afe347..fc96b51 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -36,8 +36,6 @@ SRC_URI += " \
 SRCREV = "b535f0808526c8eba37f15e83cede536e4e06029"
 PV = "16.0.4+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 inherit systemd setuptools3 identity hosts useradd default_configs monitor
 
 LIBVIRT_IMAGES_TYPE ?= "default"
@@ -229,7 +227,6 @@ PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-
 PACKAGES =+ "${BPN}-bash-completion"
 FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
 
-
 ALLOW_EMPTY:${SRCNAME}-setup = "1"
 ALLOW_EMPTY:${SRCNAME}-ec2 = "1"
 ALLOW_EMPTY:${SRCNAME}-api = "1"
@@ -242,8 +239,6 @@ ALLOW_EMPTY:${SRCNAME}-novncproxy = "1"
 ALLOW_EMPTY:${SRCNAME}-scheduler = "1"
 ALLOW_EMPTY:${SRCNAME}-spicehtml5proxy = "1"
 
-
-
 FILES:${PN} = "${libdir}/*"
 
 # MAA FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
@@ -357,7 +352,6 @@ RDEPENDS:${SRCNAME}-tests = " \
                             bash \
                             "
 
-
 SYSTEMD_PACKAGES = " \
     ${SRCNAME}-setup \
     ${SRCNAME}-compute \
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index af9c601..a46c032 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -11,7 +11,6 @@ SRC_URI = "\
 
 PV = "9.1.1+git${SRCPV}"
 SRCREV = "204eff6dc7b234d2807a6caa24a2fc58ebee520b"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 monitor rmargparse
 
diff --git a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb
index e989567..e84a9a9 100644
--- a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb
+++ b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb
@@ -16,7 +16,6 @@ RDEPENDS:${PN} += "python-prettytable \
             python-pep8 \
             python-pyflakes"
 
-
 do_install:append() {
         perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO")
         for f in $perm_files; do
diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
index b345c39..a2b194e 100644
--- a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
 
 PV = "3.12.0+git${SRCPV}"
 SRCREV = "ff4abb7d19829efa0209cb67faf01011d9c841c5"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config.inc b/meta-openstack/recipes-devtools/python/python-os-client-config.inc
index e05746d..d7dd14c 100644
--- a/meta-openstack/recipes-devtools/python/python-os-client-config.inc
+++ b/meta-openstack/recipes-devtools/python/python-os-client-config.inc
@@ -10,8 +10,6 @@ SRCREV = "261c05f0057d556a8910457f1e22ca4d81801081"
 SRCNAME = "os-client-config"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
 
-S = "${WORKDIR}/git"
-
 DEPENDS += " \
         ${PYTHON_PN}-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb
index 9327ff5..11bd331 100644
--- a/meta-openstack/recipes-devtools/python/python-rally_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb
@@ -22,7 +22,6 @@ SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master;protocol=htt
 
 SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a"
 PV="git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 update-rc.d hosts identity default_configs
 
diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
index 8b4fa84..f02d36f 100644
--- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
@@ -10,8 +10,6 @@ SRCREV = "51a1130f6cdcb029a51b6a75d43ac5e4cdde7072"
 SRCNAME = "ryu"
 SRC_URI = "git://github.com/osrg/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 FILES:${PN} += "${datadir}/etc/${SRCNAME}/*"
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index a62d6ab..e734d24 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 
 SRCREV="4ca08cc395e686265574366497a6869e94eebcb2"
 PV="2.2.2+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 python3-dir update-rc.d hosts identity
 
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index b9045e2..a0dfaa4 100755
--- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/openstack/trove.git;branch=master;protocol=https \
 
 SRCREV="11996635299396f181f5aec3c6825f8011d45e2c"
 PV="4.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools3 identity hosts useradd default_configs
 
@@ -60,7 +59,6 @@ do_install:append() {
         done
     fi
 
-
     install -d ${D}${localstatedir}/lib/trove
 
     cp -r ${TEMPLATE_CONF_DIR}/* ${TROVE_CONF_DIR}
@@ -116,10 +114,8 @@ do_install:append() {
                     -i ${TROVE_CONF_DIR}/$file
         done
 
-
     done
 
-
     # Modify api-paste.ini
     sed -e "s:%SERVICE_TENANT_NAME%:${TROVE_TENANT}:g" \
             -i ${TROVE_CONF_DIR}/api-paste.ini
@@ -140,10 +136,8 @@ do_install:append() {
         sed "/^${delete}\(.*\)/d" -i ${TROVE_CONF_DIR}/api-paste.ini
     done
 
-
 }
 
-
 pkg_postinst:${SRCNAME}-setup () {
     # python-trove-setup postinst start
     if [ -z "$D" ]; then
@@ -171,7 +165,6 @@ pkg_postinst:${SRCNAME}-setup () {
     fi
 }
 
-
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "--system trove"
 USERADD_PARAM:${PN}  = "--system --home /var/lib/trove -g trove \
@@ -231,8 +224,6 @@ FILES:${SRCNAME}-setup = " \
     ${sysconfdir}/${SRCNAME}/* \
     "
 
-
-
 DEPENDS += " \
     python-pbr \
     python-pip \
@@ -315,7 +306,6 @@ RDEPENDS:${SRCNAME}-tests += " \
     python-pexpect \
     "
 
-
 INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-conductor ${SRCNAME}-taskmanager"
 
 INITSCRIPT_NAME:${SRCNAME}-api = "trove-api"
diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
index a9d20ed..0c68a5d 100644
--- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
@@ -12,11 +12,9 @@ SRC_URI = "\
 
 PV = "3.0.0+git${SRCPV}"
 SRCREV = "960843de8142db6e61cc4d148a51f55862acbba0"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 hosts default_configs rmargparse
 
-
 USERADD_PACKAGES = "${PN}"
 
 PROVIDES += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
index 5e7c140..cd11d2c 100644
--- a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
@@ -12,6 +12,6 @@ SRC_URI = "https://github.com/barryp/py-amqplib/archive/${PV}.tar.gz"
 SRC_URI[md5sum] = "ff405a7b57aa98cdf07d02bd8090fa29"
 SRC_URI[sha256sum] = "9461d73f75ca704e6b656738b5dad42a1948e61dfbc8233077d84d00f74c3936"
 
-S = "${WORKDIR}/py-amqplib-${PV}"
+S = "${UNPACKDIR}/py-amqplib-${PV}"
 
 inherit setuptools3
diff --git a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
index 614c4eb..07ef1f4 100644
--- a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
+++ b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
@@ -11,7 +11,7 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
 SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
 SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
 
-S = "${WORKDIR}/avahi-${PV}"
+S = "${UNPACKDIR}/avahi-${PV}"
 
 inherit python3native python3-dir
 
diff --git a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
index 7a0fc81..31eb14e 100644
--- a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV = "5.0.1+git${SRCPV}"
 SRCREV = "1f0feb30ccd3b19bc23453d85d3266c85fcf04d6"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb b/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb
index 7e50557..7b88632 100644
--- a/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb
@@ -23,5 +23,4 @@ do_install:append() {
     find -L "${D}${PYTHON_SITEPACKAGES_DIR}/compressor" -type d -exec chmod 755 {} \;
 }
 
-
 CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb
index 745de51..41e3633 100644
--- a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb
@@ -16,4 +16,3 @@ RDEPENDS:${PN} += " \
         python3-stevedore \
 "
 
-
diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb
index 9592660..28d9b8a 100644
--- a/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb
@@ -9,4 +9,3 @@ SRC_URI[sha256sum] = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9
 
 inherit setuptools3 pypi
 
-
diff --git a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
index 7dc729c..9c923f6 100644
--- a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV="0.22.0+git${SRCPV}"
 SRCREV="49c915f498fc8d91c98fcf4e07ceecdcf167fc5a"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
index 24b3220..7298f97 100644
--- a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
@@ -11,8 +11,6 @@ SRCNAME = "kafka-python"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22efebb1e053dcc946f4b9d17f3cbbea"
 SRC_URI = "git://github.com/mumrah/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
index 689cb0d..e704d03 100644
--- a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "\
 
 PV = "4.1.0+git${SRCPV}"
 SRCREV = "7ff05baa1fa56f152173651f16fc6fd181291292"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 monitor
 
diff --git a/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb
index 66ed642..133b784 100644
--- a/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "\
 
 PV = "4.17.1+git${SRCPV}"
 SRCREV = "6712e8b7125fcbcf891b7e89ecb240798dad28ac"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
index aaa5d68..e6477a4 100644
--- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
@@ -13,8 +13,6 @@ SRCREV = "959e068fec8b4c956b0d82269336818e667726e7"
 
 SRC_URI = "git://github.com/linsomniac/python-memcached.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 RDEPENDS:${PN} += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
index 0860aae..ad3d7c8 100644
--- a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV = "1.0.1+git${SRCPV}"
 SRCREV = "2c36df6bf33e42c379fbd8228fbe63c77b3714b1"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-novnc_git.bb b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
index b41b587..39336c6 100644
--- a/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
@@ -11,8 +11,6 @@ PV = "1.3.0"
 SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \
            file://python-distutils.patch"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " python3-websockify"
diff --git a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
index 5e5035d..7528d57 100644
--- a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
 
 PV = "0.52.0+git${SRCPV}"
 SRCREV = "e169c495de39a2d97ef1d8bb7894b18e4ef268dd"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
index cef666d..5c67d6d 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 SRCREV = "f0cf77672fed70f20896c23015cb50341f311f38"
 
 PV = "4.0.1+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
index a8fe3c0..337abe0 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV = "2.2.0+git${SRCPV}"
 SRCREV = "d7928102d69dadf653c9f734e5cf8fd504335849"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
index b8a23fb..8c59c26 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV = "5.1.0+git${SRCPV}"
 SRCREV = "066c1c49b52de17217edfdbefe9c96e457ad23d2"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
index 5ce82ed..910f5f8 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
@@ -10,8 +10,6 @@ SRCREV = "df075b2465195de53e42897e7d9be6c6c375ce5e"
 SRCNAME = "oslo.cache"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 # DEPENDS_default: python-pip
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
index abcff6b..276efff 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
@@ -10,8 +10,6 @@ SRCREV = "1b25351d1c63e573068fff3d16faca440bbdcabf"
 SRCNAME = "oslo.concurrency"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 # DEPENDS_default: python3-pip
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
index 2aa318f..abecac5 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 PV = "2.17.0+git${SRCPV}"
 SRCREV = "f4b6914db02e6bcf0de4a97bbc3dc85dd6e06d91"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
index 0a5a05d..ea2b530 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
@@ -10,8 +10,6 @@ SRCREV = "e42c73343f640eaacb0a76d204eb55c85de4f5d5"
 SRCNAME = "oslo.db"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
index 49709d6..d12dd3b 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
-
 # DEPENDS_default: python-pip
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
index c702e5c..3447658 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 PV = "3.30.3+git${SRCPV}"
 SRCREV = "76d1dee7b80c62172ea3900b75a47edf5b64cab4"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
index 0dc65be..9ac3b42 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 
 PV = "12.5.0+git${SRCPV}"
 SRCREV = "62e104bdb57714a0754f788795d1b4faf8ebb74d"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
index 51b3e7c..d651330 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
@@ -10,8 +10,6 @@ SRCREV = "7355d905bc0e6b7d8884e290cc26895eed0f7179"
 SRCNAME = "oslo.middleware"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 # DEPENDS_default: python3-pip
@@ -25,7 +23,6 @@ DEPENDS += " \
         python3-pbr-native \
         "
 
-
 # RDEPENDS:default: 
 RDEPENDS:${PN} += " \
         python3-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
index e567432..b326b49 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
@@ -11,8 +11,6 @@ SRCREV = "cab28649c689067970a51a2f9b329bdd6a0f0501"
 SRCNAME = "oslo.policy"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
index f6e5102..5ddb650 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 
 PV = "2.4.0+git${SRCPV}"
 SRCREV = "512b5d9f6b79b798474d8bb2dac2462b0f705cb9"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
index 1b9e493..b767a67 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
@@ -10,8 +10,6 @@ SRCREV = "bc631aedef131bc45225720e5c8f8e4ca35ff020"
 SRCNAME = "oslo.reports"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
index b873afd..08d0212 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
@@ -10,8 +10,6 @@ SRCREV = "ff61e1577c3aaec6242951876263108559d1a203"
 SRCNAME = "oslo.rootwrap"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 # DEPENDS_default: python3-pip
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
index 542404a..27c0819 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 PV = "2.20.0+git${SRCPV}"
 SRCREV = "e56d91427c11a3813a0154d47e804018e580086e"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
index 7ea4373..d63fb5b 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
@@ -10,8 +10,6 @@ SRCREV = "8481ce67951aa1b44203c03639b79e06f65bd8bc"
 SRCNAME = "oslo.service"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
index 7bec980..e2ab168 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 PV = "3.28.0+git${SRCPV}"
 SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c"
-S = "${WORKDIR}/git"
 
 # DEPENDS_default: python3-pip
 inherit setuptools3
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
index b24158e..1c12284 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
@@ -10,8 +10,6 @@ SRCREV = "8db69628834332ed2df6690135be5d5c1ebd3ca1"
 SRCNAME = "oslo.versionedobjects"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
index e748a1f..08f6aef 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
@@ -10,8 +10,6 @@ SRCREV = "32c8d43a20cb6a29f03324fbc2e6cad3bfb5a294"
 SRCNAME = "oslo.vmware"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
index c441650..9821c35 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
@@ -12,8 +12,6 @@ SRCREV = "54ac29c3edd46530c1ee90eb860a7e686d9a3740"
 SRCNAME = "oslotest"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += "\
diff --git a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
index b5de262..4024656 100644
--- a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
 
 PV = "0.4.4+git${SRCPV}"
 SRCREV = "40064ca2d99389f278028508a17f2e38d6df6f10"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
index 4f9618d..0beb99b 100644
--- a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
@@ -10,8 +10,6 @@ SRCREV = "2402013a8719873d65136fc283e1855166adbc26"
 SRCNAME = "pycadf"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 FILES:${PN} += "${datadir}/etc/${SRCNAME}/*"
diff --git a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
index 7dfd0f8..f131259 100644
--- a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
@@ -26,5 +26,4 @@ SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master;prot
 
 PV = "3.2.1+git${SRCPV}"
 SRCREV = "a9fee07108c432e20a3ca7760541d4fcb4f14811"
-S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
index 51cf18e..a939d5f 100644
--- a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
@@ -11,8 +11,6 @@ SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop;protocol=h
 SRCREV = "8d21627a4eef316d22cc424deeca16a0ec8472e9"
 PV = "2018.9.21+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = "\
                   python3-mock \
                   python3-unittest \
diff --git a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
index 193f80e..7425580 100644
--- a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
 
 PV="2.14.1+git${SRCPV}"
 SRCREV="ed867c4fd17e4102a133c313a13af37baccf14a4"
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
index 12941ba..964a699 100644
--- a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
@@ -10,8 +10,6 @@ SRCREV = "7b2d8abfce1d7ef18ef516f9b1b7032172630375"
 SRCNAME = "trollius"
 SRC_URI = "git://github.com/haypo/${SRCNAME}.git;branch=trollius;protocol=https"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/ruby/bundler_git.bb b/meta-openstack/recipes-devtools/ruby/bundler_git.bb
index a4300a2..5c5148d 100644
--- a/meta-openstack/recipes-devtools/ruby/bundler_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/bundler_git.bb
@@ -22,8 +22,6 @@ BPV = "1.6.2"
 PV = "${BPV}"
 SRCREV = "06e3647c117da210ffd15a174624497830addd7b"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/bundler/bundler.git;branch=1-7-stable;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
index 199fd41..41e0fd0 100644
--- a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
@@ -18,8 +18,6 @@ BPV = "4.2.3"
 PV = "${BPV}"
 SRCREV = "28fe2928469885b0138de4d4270c6eccac8ab482"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/chef-zero.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/coderay_git.bb b/meta-openstack/recipes-devtools/ruby/coderay_git.bb
index a45942f..b7dc822 100644
--- a/meta-openstack/recipes-devtools/ruby/coderay_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/coderay_git.bb
@@ -13,8 +13,6 @@ BPV = "1.1.0"
 PV = "${BPV}"
 SRCREV = "a48037b85a12228431b32103786456f36beb355f"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/rubychan/coderay.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb b/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb
index e2c99d7..8ae17fc 100644
--- a/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb
+++ b/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb
@@ -9,8 +9,6 @@ SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;
            "
 SRCREV = "52c08fca13cc3811673ea2f6fdb244a0e42e0ebe"
 
-S = "${WORKDIR}/git"
-
 do_install:append () {
     rmdir --ignore-fail-on-non-empty ${D}${libdir}/ruby/gems/${RUBY_GEM_VERSION}/plugins
 }
diff --git a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb
index 6f6758c..ba95753 100644
--- a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb
@@ -17,8 +17,6 @@ PV = "${BPV}"
 #SRCREV = "d53e92242b9dd6745e56a0ff4ba15d2f62052b91"
 SRCREV = "704bc2c0000b5f9bf49d607dcd0d3989b63b2595"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/halostatue/diff-lcs.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/erubis_git.bb b/meta-openstack/recipes-devtools/ruby/erubis_git.bb
index 16fd542..afa41dc 100644
--- a/meta-openstack/recipes-devtools/ruby/erubis_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/erubis_git.bb
@@ -13,8 +13,6 @@ BPV = "2.7.0"
 PV = "${BPV}"
 SRCREV = "1f0b38d9e66885f8af0244d12d1a6702fc04a8de"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/kwatch/erubis.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/fluentd_1.17.1.bb b/meta-openstack/recipes-devtools/ruby/fluentd_1.17.1.bb
index cfc6828..e36f0de 100644
--- a/meta-openstack/recipes-devtools/ruby/fluentd_1.17.1.bb
+++ b/meta-openstack/recipes-devtools/ruby/fluentd_1.17.1.bb
@@ -7,8 +7,6 @@ SRCREV = "b4814cb672f8d0fef2bf441214aae368a4091662"
 
 SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = "cool.io http-parser.rb msgpack serverengine sigdump strptime tzinfo tzinfo-data yajl-ruby"
 
 inherit ruby
diff --git a/meta-openstack/recipes-devtools/ruby/hashie_git.bb b/meta-openstack/recipes-devtools/ruby/hashie_git.bb
index 65ccb11..8226a60 100644
--- a/meta-openstack/recipes-devtools/ruby/hashie_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/hashie_git.bb
@@ -13,8 +13,6 @@ BPV = "3.4.2"
 PV = "${BPV}"
 SRCREV = "02df8918dd07ef2da1aceba5fd17e8757027345a"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/intridea/hashie.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/highline_git.bb b/meta-openstack/recipes-devtools/ruby/highline_git.bb
index 546bfc9..897610c 100644
--- a/meta-openstack/recipes-devtools/ruby/highline_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/highline_git.bb
@@ -19,8 +19,6 @@ BPV = "1.7.3"
 PV = "${BPV}"
 SRCREV = "327051c1c217df2880c3a53f31484f7e815e847f"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/JEG2/highline.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.8.0.bb b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.8.0.bb
index 4823003..fdf3c6d 100644
--- a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.8.0.bb
+++ b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.8.0.bb
@@ -8,8 +8,6 @@ SRCREV = "71ecce2a498f87ba83ea3d77322a001132610a6e"
 
 SRC_URI = "gitsm://github.com/tmm1/http_parser.rb.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 # Bitbake doesn't allow the underscore in file name, hence the dash
 SRCNAME = "http_parser.rb"
 
diff --git a/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb b/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb
index 29a8933..af06892 100644
--- a/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb
@@ -17,8 +17,6 @@ PV = "${BPV}"
 # SRCREV is one above release as upstream tag was off
 SRCREV = "96aaf68210d644157bd57a6ec3e38c49f38bfc34"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/ipaddress-gem/ipaddress.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb
index 61655e5..583fa86 100644
--- a/meta-openstack/recipes-devtools/ruby/json_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/json_git.bb
@@ -13,8 +13,6 @@ BPV = "1.8.5"
 PV = "${BPV}"
 SRCREV = "4cf6c6270f52888997ec1b626b9f557db4f26f2e"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/flori/json.git;branch=v1.8;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/method-source_git.bb b/meta-openstack/recipes-devtools/ruby/method-source_git.bb
index 6756f99..7fcc6ef 100644
--- a/meta-openstack/recipes-devtools/ruby/method-source_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/method-source_git.bb
@@ -13,8 +13,6 @@ BPV = "0.8.2"
 PV = "${BPV}"
 SRCREV = "1b1f8323a7c25f29331fe32511f50697e5405dbd"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/banister/method_source.git;branch=master;protocol=https \
     file://gemspec-bump-version.patch \
diff --git a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb
index 989cb62..db34777 100644
--- a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb
@@ -16,8 +16,6 @@ BPV = "2.5"
 PV = "${BPV}"
 SRCREV = "bc15d62118b59aabbc9cb6e5734b65bf3bc273f0"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/halostatue/mime-types.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
index d10835d..c9f3d91 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
@@ -14,8 +14,6 @@ BPV = "1.3.0"
 PV = "${BPV}"
 SRCREV = "db24a56c6f5b99114998a50942220a7023060229"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/mixlib-authentication.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb
index 44309c4..c16c614 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb
@@ -14,8 +14,6 @@ BPV = "1.5.0"
 PV = "${BPV}"
 SRCREV = "b3b3c12141b5380ec61945770690fc1ae31d92b0"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/mixlib-cli.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb
index 68eb393..fae4e96 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb
@@ -14,8 +14,6 @@ BPV = "2.2.1"
 PV = "${BPV}"
 SRCREV = "d7bdd7c999e13a0bd67607011731a536323dd51c"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/mixlib-config.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb
index 52a95d6..59190d5 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb
@@ -14,8 +14,6 @@ BPV = "1.4.1"
 PV = "${BPV}"
 SRCREV = "b750625a79cc46fffe6b886320f96e7874497fa0"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/mixlib-log.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb
index 70e316e..9f96c23 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb
@@ -17,8 +17,6 @@ BPV = "2.1.0"
 PV = "${BPV}"
 SRCREV = "27ba1e882dcab280527aa1764d1b45aca3ef5961"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/mixlib-shellout.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/msgpack_1.7.3.bb b/meta-openstack/recipes-devtools/ruby/msgpack_1.7.3.bb
index f883556..bc59a50 100644
--- a/meta-openstack/recipes-devtools/ruby/msgpack_1.7.3.bb
+++ b/meta-openstack/recipes-devtools/ruby/msgpack_1.7.3.bb
@@ -8,8 +8,6 @@ SRCREV = "6bbaa97600430c438675540e1f970d61ce5ccd9e"
 
 SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 inherit rubyv2
 
 GEM_NAME = "msgpack"
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb
index 160237c..de0e2c8 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb
@@ -17,8 +17,6 @@ BPV = "1.2.0"
 PV = "${BPV}"
 SRCREV = "1de7611a7f7cedbe7a4c6cf3798c88d00637582d"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/net-ssh/net-ssh-gateway.git;branch=master;protocol=https \
     file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
index d95042e..f07fbd6 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
@@ -17,8 +17,6 @@ BPV = "1.2.1"
 PV = "${BPV}"
 SRCREV = "5b668d5ef34102c9ac159a8f21c889fdc7f99f1b"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/net-ssh/net-ssh-multi.git;branch=master;protocol=https \
     file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb
index 344b34b..252ddd9 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb
@@ -15,8 +15,6 @@ BPV = "2.9.1"
 PV = "${BPV}"
 SRCREV = "9f8607984d8e904f211cc5edb39ab2a2ca94008e"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/net-ssh/net-ssh.git;branch=master;protocol=https \
     file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \
diff --git a/meta-openstack/recipes-devtools/ruby/ohai_git.bb b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
index f7bad07..7f219d3 100644
--- a/meta-openstack/recipes-devtools/ruby/ohai_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
@@ -17,8 +17,6 @@ BPV = "8.5.0"
 PV = "${BPV}"
 SRCREV = "5c166cf3fa4b2af541ee54855aae73c809044b3d"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/ohai.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb
index d2c3325..4b9eb03 100644
--- a/meta-openstack/recipes-devtools/ruby/pry_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb
@@ -15,8 +15,6 @@ BPV = "0.10.1"
 PV = "${BPV}"
 SRCREV = "191dc519813402acd6db0d7f73e652ed61f8111f"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/pry/pry.git;branch=master;protocol=https \
     file://rdoc-fixup-opt.banner-heredoc.patch \
diff --git a/meta-openstack/recipes-devtools/ruby/rack_git.bb b/meta-openstack/recipes-devtools/ruby/rack_git.bb
index 2c03cff..0af803f 100644
--- a/meta-openstack/recipes-devtools/ruby/rack_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/rack_git.bb
@@ -17,8 +17,6 @@ BPV = "1.6.3"
 PV = "${BPV}"
 SRCREV = "134d6218d0881d87ae6a522e88eafbddb6cd1bb7"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/rack/rack.git;branch=1-6-stable;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
index 706af39..7d28ea7 100644
--- a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
@@ -15,8 +15,6 @@ BPV = "2.0.0.rc1"
 PV = "${BPV}"
 SRCREV = "40eddc184a7b3fe79f9b68f291e06df4c1fbcb0b"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/rest-client/rest-client.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb
index fc5152e..b4c1354 100644
--- a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb
+++ b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb
@@ -8,8 +8,6 @@ SRCREV = "57570f04456560512e4efc1c6fa695b76c17dc0d"
 
 SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 inherit ruby
 
 FILES:${PN} += "${libdir}/*"
diff --git a/meta-openstack/recipes-devtools/ruby/slop_git.bb b/meta-openstack/recipes-devtools/ruby/slop_git.bb
index 14debbf..a878866 100644
--- a/meta-openstack/recipes-devtools/ruby/slop_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/slop_git.bb
@@ -13,8 +13,6 @@ BPV = "4.2.0"
 PV = "${BPV}"
 SRCREV = "50c4d5a6553c9d0b78dee35a092ea3a40c136fa1"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/leejarvis/slop.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb
index 900e0f2..f7fd72e 100644
--- a/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb
+++ b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb
@@ -8,8 +8,6 @@ SRCREV = "1583aaa510cae4660907b22c8262ab31b1eb1864"
 
 SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = "bash"
 
 inherit rubyv2
diff --git a/meta-openstack/recipes-devtools/ruby/systemu_git.bb b/meta-openstack/recipes-devtools/ruby/systemu_git.bb
index fa407f1..611189e 100644
--- a/meta-openstack/recipes-devtools/ruby/systemu_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/systemu_git.bb
@@ -14,8 +14,6 @@ BPV = "2.5.2"
 PV = "${BPV}"
 SRCREV = "cb253a8bf213beea69f27418202e936a22d7308f"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/ahoward/systemu.git;branch=master;protocol=https \
     "
diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2024.2.bb b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2024.2.bb
index 7fb9cba..e86638d 100644
--- a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2024.2.bb
+++ b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2024.2.bb
@@ -8,8 +8,6 @@ SRCREV = "7645b92dccf2c13e3958fedff7b0d105e1c6bb72"
 
 SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 inherit ruby
 
 FILES:${PN} += "${libdir}/*"
diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.6.bb b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.6.bb
index ee41c7e..180e2e5 100644
--- a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.6.bb
+++ b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.6.bb
@@ -8,8 +8,6 @@ SRCREV = "5fc278676efde3c85a788fa85ddabddcd91b846f"
 
 SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = "concurrent-ruby"
 
 inherit ruby
diff --git a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb
index e25be73..9199301 100644
--- a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb
@@ -8,8 +8,6 @@ SRCREV = "8830754ac1ca04a0c14f71f6e7c1d240934366fe"
 
 SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 inherit rubyv2
 
 GEM_NAME = "yajl-ruby"
diff --git a/meta-openstack/recipes-devtools/ruby/yard_git.bb b/meta-openstack/recipes-devtools/ruby/yard_git.bb
index 2728802..8fcec19 100644
--- a/meta-openstack/recipes-devtools/ruby/yard_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/yard_git.bb
@@ -17,8 +17,6 @@ BPV = "0.8.7.6"
 PV = "${BPV}"
 SRCREV = "d83194e1a09098ec5be28b616cde3b9a15380873"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/lsegal/yard.git;branch=main;protocol=https \
     "
diff --git a/meta-openstack/recipes-extended/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb
index 82dcd4b..f7c03fc 100644
--- a/meta-openstack/recipes-extended/novnc/novnc_git.bb
+++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb
@@ -9,8 +9,6 @@ PV = "1.2.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 do_compile() {
     :
 }
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb
index 4806b2b..bff5d98 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb
@@ -10,4 +10,3 @@ RDEPENDS:${PN} = " \
     packagegroup-core-tools-debug \
     "
 
-
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
index 0d561e0..8289a6c 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
@@ -13,4 +13,3 @@ RDEPENDS:${PN} = " \
 
 IMAGE_FEATURES += "package-management"
 
-
diff --git a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
index 3a486b4..1427114 100644
--- a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://archive.apache.org/dist/qpid/${PV}/${PN}-${PV}.tar.gz"
 SRC_URI[md5sum] = "d4dc28a3d68e4b364e54d8fe7f244e5d"
 SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c9e1c90"
 
-S = "${WORKDIR}/qpid-${PV}/python"
+S = "${UNPACKDIR}/qpid-${PV}/python"
 
 inherit setuptools3
 
diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
index 9d8bfc6..b879dcc 100644
--- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://archive.apache.org/dist/${PN}/${PV}/qpid-cpp-0.20.tar.gz \
 SRC_URI[md5sum] = "566132c5939ca31a32a0e80cc4124122"
 SRC_URI[sha256sum] = "31b80ba3c4773d288b4e6245e3b2048438386331d460f7a7b0794cbd200301de"
 
-S = "${WORKDIR}/${PN}c-${PV}"
+S = "${UNPACKDIR}/${PN}c-${PV}"
 
 inherit autotools python3-dir perlnative cpan-base update-rc.d pkgconfig
 
diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index 4854516..545d71f 100644
--- a/meta-openstack/recipes-extended/tempest/tempest_git.bb
+++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
 
 SRCREV="2707a0f065e52d8331d12c983ead95de1224cb32"
 PV="2014.1+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-setup-altdemo ${SRCNAME}-setup-admin"
 KEYSTONE_HOST="${CONTROLLER_IP}"
diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
index 62e0df4..c6e225c 100644
--- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
+++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0;protocol=https \
 
 SRCREV="af44211739136e22471a2897383f34586284bf86"
 PV="2.0.14+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 pkgconfig
 
diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb
index 8a88152..1240907 100644
--- a/meta-openstack/recipes-support/chef/chef_git.bb
+++ b/meta-openstack/recipes-support/chef/chef_git.bb
@@ -15,8 +15,6 @@ BPV = "12.4.1"
 PV = "${BPV}"
 SRCREV = "1dc20627aa5d742376269dc5b4d5c67f34d08008"
 
-S = "${WORKDIR}/git"
-
 SRC_URI = " \
     git://github.com/opscode/chef.git;branch=12.4-stable;protocol=https \
     file://0001-chang-ksh-to-sh.patch \
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index f22a242..13fd67f 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRCREV = "1b645ebd7d87f7a27d23690c19e97dbf8dafe6b4"
 PV = "5.0.2+git${SRCPV}"
 
-S = "${WORKDIR}/git"
-
 SRCNAME = "mod_wsgi"
 SRC_URI = "\
         git://github.com/GrahamDumpleton/mod_wsgi.git;branch=master;protocol=https \
diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
index 4a77fb8..967ee6f 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -24,12 +24,11 @@ SRC_URI = "https://files.pythonhosted.org/packages/source/s/${BPN}/${BPN}-${PV}.
 SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9"
 SRC_URI[sha256sum] = "e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc"
 
-
 SYSTEMD_AUTO_ENABLE:${PN}-master = "disable"
 SYSTEMD_AUTO_ENABLE:${PN}-minion = "disable"
 SYSTEMD_AUTO_ENABLE:${PN}-api = "disable"
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${UNPACKDIR}/${PN}-${PV}"
 
 inherit setuptools3 systemd
 
@@ -124,7 +123,6 @@ RSUGGESTS:${PN}-api = "python3-cherrypy"
 CONFFILES:${PN}-api = "${sysconfdir}/init.d/${PN}-api"
 FILES:${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service"
 
-
 SUMMARY:${PN}-master = "remote manager to administer servers via salt"
 DESCRIPTION:${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
 RDEPENDS:${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
@@ -134,7 +132,6 @@ CONFFILES:${PN}-master="${sysconfdir}/init.d/${PN}-master  ${sysconfdir}/${PN}/m
 RSUGGESTS:${PN}-master = "python3-git"
 FILES:${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service"
 
-
 SUMMARY:${PN}-syndic = "master-of-masters for salt, the distributed remote execution system"
 DESCRIPTION:${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \
 salt; it enables the management of multiple masters at a time."
diff --git a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
index b69b08c..d3b8f66 100644
--- a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
+++ b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
@@ -21,8 +21,6 @@ PV = "0.1.4"
 SRCREV = "19ade3cf38cc5f5b61fd038f5ce5f4cdb080e9ca"
 SRC_URI = "git://anongit.freedesktop.org/spice/spice-html5;branch=master"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = "python-websockify"
 
 do_install() {
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index 9c5c24b..8a055a9 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -17,8 +17,6 @@ SRC_URI += "file://tgtd.init \
             file://tgtd \
 "
 
-S = "${WORKDIR}/git"
-
 CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf"
 
 inherit update-rc.d systemd
diff --git a/recipes-connectivity/consul/consul-migrate_git.bb b/recipes-connectivity/consul/consul-migrate_git.bb
index 1393c91..9d4544a 100644
--- a/recipes-connectivity/consul/consul-migrate_git.bb
+++ b/recipes-connectivity/consul/consul-migrate_git.bb
@@ -7,8 +7,6 @@ GO_IMPORT = "github.com/hashicorp/consul-migrate"
 SRC_URI = "https://${GO_IMPORT}.git;branch=master"
 SRCREV = "678fb10cdeae25ab309e99e655148f0bf65f9710"
 
-S = "${WORKDIR}/git"
-
 SRCREV_raft = "057b893fd996696719e98b6c44649ea14968c811"
 SRCREV_go-metrics = "f303b03b91d770a11a39677f1d3b55da4002bbcb"
 SRCREV_raft-boltdb = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"
diff --git a/recipes-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb
index 0d084b0..cfebac4 100644
--- a/recipes-connectivity/consul/consul_git.bb
+++ b/recipes-connectivity/consul/consul_git.bb
@@ -10,8 +10,6 @@ SRC_URI = "git://${GO_IMPORT}.git;branch=main;protocol=https \
            file://consul.service \
           "
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN}-dev:append = " bash"
 
 # Temporarily workaround an issue with GO 1.12.1
diff --git a/recipes-connectivity/serf/hashicorp-serf_0.9.4.bb b/recipes-connectivity/serf/hashicorp-serf_0.9.4.bb
index 8318400..d498691 100644
--- a/recipes-connectivity/serf/hashicorp-serf_0.9.4.bb
+++ b/recipes-connectivity/serf/hashicorp-serf_0.9.4.bb
@@ -22,8 +22,6 @@ SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master"
 PV = "0.8.5+git${SRCPV}"
 SRCREV = "1d3fdf93bbe5002c5023da50402368a817488691"
 
-S = "${WORKDIR}/git"
-
 inherit go
 
 RDEPENDS:${PN}-dev += "bash make"
diff --git a/recipes-devtools/python/python-ansible.inc b/recipes-devtools/python/python-ansible.inc
index 4bb90cb..0889659 100644
--- a/recipes-devtools/python/python-ansible.inc
+++ b/recipes-devtools/python/python-ansible.inc
@@ -10,8 +10,6 @@ SRC_URI = "git://github.com/ansible/ansible.git;protocol=https;branch=stable-2.1
 
 SRCREV = "dc0e3bd16cc7ded081bc46c88e4e3d1997ca9bb0"
 
-S = "${WORKDIR}/git"
-
 ANSIBLE_WHITELIST_MODULES ?= "commands files system network/ovs __pycache__ service"
 
 do_install:append() {
diff --git a/recipes-support/puppet-vswitch/puppet-vswitch_git.bb b/recipes-support/puppet-vswitch/puppet-vswitch_git.bb
index b241328..c8482b3 100644
--- a/recipes-support/puppet-vswitch/puppet-vswitch_git.bb
+++ b/recipes-support/puppet-vswitch/puppet-vswitch_git.bb
@@ -16,8 +16,6 @@ inherit rubyv2
 GEM_NAME = "puppetlabs-std"
 GEM_SPEC_FILE = "puppet-vswitch.gemspec"
 
-S = "${WORKDIR}/git"
-
 DEPENDS += " \
         ruby \
         facter \
diff --git a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
index 8a3c1de..9c7ff9e 100644
--- a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
+++ b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
@@ -16,8 +16,6 @@ inherit rubyv2
 GEM_NAME = "puppetlabs-std"
 GEM_SPEC_FILE = "puppetlabs-stdlib.gemspec"
 
-S = "${WORKDIR}/git"
-
 DEPENDS += " \
         ruby \
         facter \
diff --git a/recipes-support/ruby-shadow/ruby-shadow_git.bb b/recipes-support/ruby-shadow/ruby-shadow_git.bb
index 9a82a5b..c9251aa 100644
--- a/recipes-support/ruby-shadow/ruby-shadow_git.bb
+++ b/recipes-support/ruby-shadow/ruby-shadow_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/apalmblad/ruby-shadow.git;branch=master;protocol=htt
            file://extconf.rb"
 
 SRCREV = "f135b3fd52d0a638f2eb9b17a8952a7f0f317688"
-S = "${WORKDIR}/git"
 
 inherit ruby