From 89dd36625e92759505555bd4b35e532640c01da2 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 25 Jun 2018 15:01:08 -0400
Subject: [PATCH] Rename mwa-* subdirectories to match the git repo name

mwa-delphia -> stx-clients
mwa-pitta   -> stx-config
mwa-cleo    -> stx-fault
mwa-gplv2   -> stx-gplv2
mwa-gplv3   -> stx-gplv3
mwa-solon   -> stx-ha
mwa-sparta  -> stx-integ
mwa-beas    -> stx-metal
mwa-thales  -> stx-nfv
mwa-chilon  -> stx-update
mwa-perian  -> stx-upstream

Depends-On: https://review.openstack.org/579954
Depends-On: https://review.openstack.org/579957
Change-Id: I269a4e79425a41709381f8894456d21233463e9f
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 installer/pxe-network-installer/centos/build_srpm.data | 6 +++---
 kickstart/centos/build_srpm.data                       | 2 +-
 mtce-compute/centos/build_srpm.data                    | 2 +-
 mtce-control/centos/build_srpm.data                    | 2 +-
 mtce-storage/centos/build_srpm.data                    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/installer/pxe-network-installer/centos/build_srpm.data b/installer/pxe-network-installer/centos/build_srpm.data
index 2e157186..a3856e13 100644
--- a/installer/pxe-network-installer/centos/build_srpm.data
+++ b/installer/pxe-network-installer/centos/build_srpm.data
@@ -1,6 +1,6 @@
-COPY_LIST="pxe-network-installer//* \
-           $CGCS_BASE/mwa-beas/bsp-files/grub.cfg \
-           $CGCS_BASE/mwa-beas/bsp-files/kickstarts/post_clone_iso_ks.cfg \
+COPY_LIST="pxe-network-installer/* \
+           $GIT_BASE/bsp-files/grub.cfg \
+           $GIT_BASE/bsp-files/kickstarts/post_clone_iso_ks.cfg \
            $SRC_BASE/cgcs-centos-repo/Binary/images/efiboot.img \
            /import/mirrors/CentOS/tis-installer/initrd.img-stx-0.2 \
            /import/mirrors/CentOS/tis-installer/squashfs.img-stx-0.2 \
diff --git a/kickstart/centos/build_srpm.data b/kickstart/centos/build_srpm.data
index 4f70f963..4845de22 100644
--- a/kickstart/centos/build_srpm.data
+++ b/kickstart/centos/build_srpm.data
@@ -1,3 +1,3 @@
-SRC_DIR="${CGCS_BASE}/mwa-beas/bsp-files"
+SRC_DIR="${GIT_BASE}/bsp-files"
 COPY_LIST="$PKG_BASE/LICENSE"
 TIS_PATCH_VER=1
diff --git a/mtce-compute/centos/build_srpm.data b/mtce-compute/centos/build_srpm.data
index fc8c9cca..0d12d4f7 100644
--- a/mtce-compute/centos/build_srpm.data
+++ b/mtce-compute/centos/build_srpm.data
@@ -1,3 +1,3 @@
-SRC_DIR=$CGCS_BASE/mwa-beas/mtce-compute/cgts-mtce-compute-1.0/scripts
+SRC_DIR="$PKG_BASE/cgts-mtce-compute-1.0/scripts"
 COPY_LIST="$SRC_DIR/*"
 TIS_PATCH_VER=4
diff --git a/mtce-control/centos/build_srpm.data b/mtce-control/centos/build_srpm.data
index 65f97c20..f86ef834 100644
--- a/mtce-control/centos/build_srpm.data
+++ b/mtce-control/centos/build_srpm.data
@@ -1,4 +1,4 @@
-SRC_DIR=$CGCS_BASE/mwa-beas/mtce-control/cgts-mtce-control-1.0/scripts
+SRC_DIR="$PKG_BASE/cgts-mtce-control-1.0/scripts"
 COPY_LIST="$SRC_DIR/* \
            $PKG_BASE/LICENSE"
 TIS_PATCH_VER=4
diff --git a/mtce-storage/centos/build_srpm.data b/mtce-storage/centos/build_srpm.data
index 45426db7..27e90c35 100644
--- a/mtce-storage/centos/build_srpm.data
+++ b/mtce-storage/centos/build_srpm.data
@@ -1,4 +1,4 @@
-SRC_DIR=$CGCS_BASE/mwa-beas/mtce-storage/cgts-mtce-storage-1.0/scripts
+SRC_DIR="$PKG_BASE/cgts-mtce-storage-1.0/scripts"
 COPY_LIST="$SRC_DIR/* \
            $PKG_BASE/LICENSE"
 TIS_PATCH_VER=3