From 497905225ddc7b2fefdb6461709f375520e72b6f Mon Sep 17 00:00:00 2001
From: Babak Sarashki <Babak.SarAshki@windriver.com>
Date: Tue, 22 Sep 2020 20:01:16 -0700
Subject: [PATCH] stx-nfv: set and limit checkouts to subpaths

Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
---
 meta-stx-flock/stx-nfv/mtce-guest.bb     |  2 +-
 meta-stx-flock/stx-nfv/nfv-client.bb     |  3 +--
 meta-stx-flock/stx-nfv/nfv-common.bb     |  4 +---
 meta-stx-flock/stx-nfv/nfv-common.inc    | 11 ++++++-----
 meta-stx-flock/stx-nfv/nfv-plugins.bb    |  3 +--
 meta-stx-flock/stx-nfv/nfv-tools.bb      |  3 +--
 meta-stx-flock/stx-nfv/nfv-vim.bb        |  3 +--
 meta-stx-flock/stx-nfv/nova-api-proxy.bb |  4 +---
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/meta-stx-flock/stx-nfv/mtce-guest.bb b/meta-stx-flock/stx-nfv/mtce-guest.bb
index 405c6cb..ab45277 100644
--- a/meta-stx-flock/stx-nfv/mtce-guest.bb
+++ b/meta-stx-flock/stx-nfv/mtce-guest.bb
@@ -3,7 +3,7 @@ PACKAGES += " mtce-guestserver"
 
 require nfv-common.inc
 
-S = "${S_DIR}/mtce-guest/src"
+SUBPATH0 = "mtce-guest/src"
 
 SRC_URI += " \
 	file://0001-mtce-guest-Fix-ldflags-usage.patch \
diff --git a/meta-stx-flock/stx-nfv/nfv-client.bb b/meta-stx-flock/stx-nfv/nfv-client.bb
index f905225..7b2a7c2 100644
--- a/meta-stx-flock/stx-nfv/nfv-client.bb
+++ b/meta-stx-flock/stx-nfv/nfv-client.bb
@@ -1,7 +1,6 @@
-
 require nfv-common.inc
 
-S = "${S_DIR}/nfv/nfv-client"
+SUBPATH0 = "nfv/nfv-client"
 
 inherit setuptools
 
diff --git a/meta-stx-flock/stx-nfv/nfv-common.bb b/meta-stx-flock/stx-nfv/nfv-common.bb
index 141e692..fc71622 100644
--- a/meta-stx-flock/stx-nfv/nfv-common.bb
+++ b/meta-stx-flock/stx-nfv/nfv-common.bb
@@ -1,7 +1,5 @@
-
-
 require nfv-common.inc
 
-S = "${S_DIR}/nfv/nfv-common"
+SUBPATH0 = "nfv/nfv-common"
 
 inherit setuptools
diff --git a/meta-stx-flock/stx-nfv/nfv-common.inc b/meta-stx-flock/stx-nfv/nfv-common.inc
index b6fc1b5..c6cc883 100644
--- a/meta-stx-flock/stx-nfv/nfv-common.inc
+++ b/meta-stx-flock/stx-nfv/nfv-common.inc
@@ -1,18 +1,19 @@
-
 DESCRIPTION = "stx-nfv"
 
 PROTOCOL = "https"
 BRANCH = "r/stx.3.0"
+SRCNAME = "nfv"
 SRCREV = "aaa932c00e028dcbaf0eed6843c4d3e51f09b2c1"
-S_DIR = "${WORKDIR}/git"
+SRCREV_opendev = "aaa932c00e028dcbaf0eed6843c4d3e51f09b2c1"
+DESTSUFFIX = "${PN}-${PV}"
 PV = "1.0.0"
 
 LICENSE = "Apache-2.0"
-
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-
-SRC_URI = "git://opendev.org/starlingx/nfv.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
+SRC_URI = " \
+	git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
+	"
 
 DEPENDS += " \
 	python \
diff --git a/meta-stx-flock/stx-nfv/nfv-plugins.bb b/meta-stx-flock/stx-nfv/nfv-plugins.bb
index 4ade02a..cea36f7 100644
--- a/meta-stx-flock/stx-nfv/nfv-plugins.bb
+++ b/meta-stx-flock/stx-nfv/nfv-plugins.bb
@@ -1,7 +1,6 @@
-
 require nfv-common.inc
 
-S = "${S_DIR}/nfv/nfv-plugins"
+SUBPATH0 = "nfv/nfv-plugins"
 
 inherit setuptools
 
diff --git a/meta-stx-flock/stx-nfv/nfv-tools.bb b/meta-stx-flock/stx-nfv/nfv-tools.bb
index d854175..760b5a0 100644
--- a/meta-stx-flock/stx-nfv/nfv-tools.bb
+++ b/meta-stx-flock/stx-nfv/nfv-tools.bb
@@ -1,6 +1,5 @@
-
 require nfv-common.inc
 
-S = "${S_DIR}/nfv/nfv-tools"
+SUBPATH0 = "nfv/nfv-tools"
 
 inherit setuptools
diff --git a/meta-stx-flock/stx-nfv/nfv-vim.bb b/meta-stx-flock/stx-nfv/nfv-vim.bb
index 84bb31d..942e85f 100644
--- a/meta-stx-flock/stx-nfv/nfv-vim.bb
+++ b/meta-stx-flock/stx-nfv/nfv-vim.bb
@@ -1,7 +1,6 @@
-
 require nfv-common.inc
 
-S = "${S_DIR}/nfv/nfv-vim"
+SUBPATH0 = "nfv/nfv-vim"
 
 inherit setuptools
 
diff --git a/meta-stx-flock/stx-nfv/nova-api-proxy.bb b/meta-stx-flock/stx-nfv/nova-api-proxy.bb
index a9cf7c6..5ab68ba 100644
--- a/meta-stx-flock/stx-nfv/nova-api-proxy.bb
+++ b/meta-stx-flock/stx-nfv/nova-api-proxy.bb
@@ -1,7 +1,5 @@
-
 require nfv-common.inc
-
-S = "${S_DIR}/nova-api-proxy/nova-api-proxy"
+SUBPATH0 = "nova-api-proxy/nova-api-proxy"
 
 inherit setuptools systemd
 SYSTEMD_PACKAGES += "nova-api-proxy"