[meta-cgl][PATCH] meta-cgl-common: Clean up S overrides

[meta-cgl][PATCH] meta-cgl-common: Clean up S overrides

[Ryosuke Saito]

From: Ryosuke Saito <ryosuke.saito@linaro.org>

Fix S assignment to fix the build error:

do_unpack: Recipes that set S = "${WORKDIR}/git" or S = "${UNPACKDIR}/git" should remove that assignment, as S set by bitbake.conf in oe-core now works.

Signed-off-by: Ryosuke Saito <ryosuke.saito@linaro.org>
---
 meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 1 -
 .../cluster-resource-agents/resource-agents_4.5.0.bb            | 2 --
 meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb                | 1 -
 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb    | 2 --
 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb        | 2 --
 meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb        | 1 -
 meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb     | 2 +-
 meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb       | 2 +-
 meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb      | 2 +-
 meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb           | 2 +-
 10 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
index aed8be6ef132..0184e7dbcc1c 100644
--- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
@@ -32,7 +32,6 @@ SYSTEMD_AUTO_ENABLE = "disable"
 HA_USER = "hacluster"
 HA_GROUP = "haclient"
 
-S = "${WORKDIR}/git"
 PV = "1.0.12+git${SRCPV}"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
index a1b662499c94..3c722750a85d 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
@@ -28,8 +28,6 @@ SRCREV = "fee181320547365d7f8c88cca2b32801412b933d"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S="${WORKDIR}/git"
-
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504"
diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
index 8f319b5073f6..065f9f05fd5b 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
@@ -12,7 +12,6 @@ DEPENDS = "asciidoc-native \
            "
 RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash python3-doctest"
 
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=master;protocol=https \
            file://tweaks_for_build.patch \
            file://0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch \
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
index 8cce2598be76..fd7e8ef915f9 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
@@ -25,8 +25,6 @@ SRCREV = "4d76ceb4aa7aaa1fd595368089e99575d708f719"
 
 UPSTREAM_CHECK_GITTAGREGEX = "ocfs2-tools-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
-
 inherit autotools-brokensep pkgconfig systemd
 
 DEPENDS = "corosync pacemaker \
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
index 4f0f56316e46..04bb62fcf939 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
@@ -28,8 +28,6 @@ SRCREV = "ba59be71228fed04f78ab374dfac748d314d0e89"
 
 inherit autotools-brokensep pkgconfig systemd python3native python3-dir useradd
 
-S = "${WORKDIR}/git"
-
 UPSTREAM_CHECK_GITTAGREGEX = "Pacemaker-(?P<pver>\d+(\.\d+)+)"
 
 CLEANBROKEN = "1"
diff --git a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb
index d0daa914a817..0a04bf5aa960 100644
--- a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb
+++ b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb
@@ -33,7 +33,6 @@ SRC_URI = "git://github.com/zoulasc/racoon2;branch=master;protocol=https \
           "
 
 SRCREV="7b68950328454b0e91ba24698c10c4a790705cc1"
-S= "${WORKDIR}/git" 
 SRC_URI[md5sum] = "2fa33abff1ccd6fc22876a23db77aaa8"
 SRC_URI[sha256sum] = "f23773e4d97cec823ec634085b5e60a7884a13467ff1bffc17daac14d02f9caa"
 
diff --git a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb
index 4c67582df219..c1707fdca77e 100644
--- a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb
+++ b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb
@@ -20,6 +20,6 @@ PR = "r2"
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-${PV}.tar.gz"
 SRC_URI[sha256sum] = "4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb"
 
-S = "${WORKDIR}/MailTools-${PV}"
+S = "${UNPACKDIR}/MailTools-${PV}"
 
 inherit cpan
diff --git a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb
index a01620cea796..b2d4838d3415 100644
--- a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb
+++ b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb
@@ -15,7 +15,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.g
 "
 SRC_URI[socket6-perl-0.29.sha256sum] = "468915fa3a04dcf6574fc957eff495915e24569434970c91ee8e4e1459fc9114"
 
-S = "${WORKDIR}/Socket6-${PV}"
+S = "${UNPACKDIR}/Socket6-${PV}"
 
 do_configure:prepend () {
 	mkdir -p m4
diff --git a/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb b/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb
index 968c628458f2..f72dbd390061 100644
--- a/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb
+++ b/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb
@@ -14,6 +14,6 @@ PR = "r2"
 SRC_URI ="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Pod-${PV}.tar.gz;name=test-pod-perl-${PV}"
 SRC_URI[test-pod-perl-1.52.md5sum] = "472dda77746d48e6465bf62e47aeca81"
 SRC_URI[test-pod-perl-1.52.sha256sum] = "60a8dbcc60168bf1daa5cc2350236df9343e9878f4ab9830970a5dde6fe8e5fc"
-S = "${WORKDIR}/Test-Pod-${PV}"
+S = "${UNPACKDIR}/Test-Pod-${PV}"
 
 inherit cpan
diff --git a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb
index 5a4f55cadc0f..ea7f44fe7dfb 100644
--- a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb
+++ b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb
@@ -18,6 +18,6 @@ PR = "r2"
 SRC_URI = "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}"
 SRC_URI[libwww-perl-6.43.sha256sum] = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d"
 
-S = "${WORKDIR}/libwww-perl-${PV}"
+S = "${UNPACKDIR}/libwww-perl-${PV}"
 
 inherit cpan
-- 
2.51.0