From 10882f07bae726ce9dc1c46dd869b6a837fdca73 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 27 Jun 2018 16:46:39 -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

Edit build_srpm.data files to remove references to mwa-* directories.
Substitute $STX_BASE, $GIT_BASE, $PKG_BASE as required.

While editing build_srpm.data, might also move some files
on the principle ...
  $PKG_BASE/files is for distro independednt files
  $PKG_BASE/centos/files is for CentOS specific files

Depends-On: https://review.openstack.org/579954
Depends-On: https://review.openstack.org/579957
Change-Id: I97e4aeb967a974d91ca254bd6a6f640cc393eb77
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 kernel/kernel-modules/intel-i40evf/PKG-INFO         | 13 -------------
 .../intel-i40evf/centos/build_srpm.data             |  5 ++---
 .../intel-i40evf/{centos => }/files/GPL-v2.0.txt    |  0
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 kernel/kernel-modules/intel-i40evf/PKG-INFO
 rename kernel/kernel-modules/intel-i40evf/{centos => }/files/GPL-v2.0.txt (100%)

diff --git a/kernel/kernel-modules/intel-i40evf/PKG-INFO b/kernel/kernel-modules/intel-i40evf/PKG-INFO
deleted file mode 100644
index d35d93650..000000000
--- a/kernel/kernel-modules/intel-i40evf/PKG-INFO
+++ /dev/null
@@ -1,13 +0,0 @@
-Metadata-Version: 1.1
-Name: i40evf-kmod
-Version: 1.4.15
-Summary: Linux* Driver for Intel(R) XL710/X710 Virtual Function
-Home-page: http://www.intel.com/network/connectivity/products/server_adapters.htm
-Author:
-Author-email:
-License: GPL
-Description:
-This package contains the Linux driver for the Virtual Functions of Intel(R)
-Ethernet Connection XL710 Family of devices.
-
-Platform: UNKNOWN
diff --git a/kernel/kernel-modules/intel-i40evf/centos/build_srpm.data b/kernel/kernel-modules/intel-i40evf/centos/build_srpm.data
index f05768cb9..154759692 100644
--- a/kernel/kernel-modules/intel-i40evf/centos/build_srpm.data
+++ b/kernel/kernel-modules/intel-i40evf/centos/build_srpm.data
@@ -1,5 +1,4 @@
 COPY_LIST=" \
-  $FILES_BASE/* \
-  $CGCS_BASE/mwa-gplv2/intel-i40evf/files/* \
-  $CGCS_BASE/downloads/i40evf-3.4.2.tar.gz"
+  $PKG_BASE/files/* \
+  $STX_BASE/downloads/i40evf-3.4.2.tar.gz"
 TIS_PATCH_VER=4
diff --git a/kernel/kernel-modules/intel-i40evf/centos/files/GPL-v2.0.txt b/kernel/kernel-modules/intel-i40evf/files/GPL-v2.0.txt
similarity index 100%
rename from kernel/kernel-modules/intel-i40evf/centos/files/GPL-v2.0.txt
rename to kernel/kernel-modules/intel-i40evf/files/GPL-v2.0.txt