From b38ca7b81c85aa72f007937d304da63a52871eb7 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: I07603c2d437af8f0bb2e11dc75799e2fcb58f331
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 kernel/kernel-modules/tpmdd/PKG-INFO                | 13 -------------
 kernel/kernel-modules/tpmdd/centos/build_srpm.data  |  6 +++---
 .../kernel-modules/tpmdd/{centos => }/files/COPYING |  0
 .../kernel-modules/tpmdd/{centos => }/files/README  |  0
 .../tpmdd/{centos => }/files/modules-load.conf      |  0
 5 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 kernel/kernel-modules/tpmdd/PKG-INFO
 rename kernel/kernel-modules/tpmdd/{centos => }/files/COPYING (100%)
 rename kernel/kernel-modules/tpmdd/{centos => }/files/README (100%)
 rename kernel/kernel-modules/tpmdd/{centos => }/files/modules-load.conf (100%)

diff --git a/kernel/kernel-modules/tpmdd/PKG-INFO b/kernel/kernel-modules/tpmdd/PKG-INFO
deleted file mode 100644
index f43900427..000000000
--- a/kernel/kernel-modules/tpmdd/PKG-INFO
+++ /dev/null
@@ -1,13 +0,0 @@
-Metadata-Version: 1.1
-Name: tpm-kmod
-Version: 4.12
-Summary: TPM Linux* Base Driver and Kernel Module
-Home-page: http://tpmdd.sourceforge.net/
-Author:
-Author-email:
-License: GPL
-Description:
-This package contains the Linux driver and modules for the TPM 1.2 and 2.0
-Family of devices.
-
-Platform: UNKNOWN
diff --git a/kernel/kernel-modules/tpmdd/centos/build_srpm.data b/kernel/kernel-modules/tpmdd/centos/build_srpm.data
index cb44fe866..128c19a5c 100644
--- a/kernel/kernel-modules/tpmdd/centos/build_srpm.data
+++ b/kernel/kernel-modules/tpmdd/centos/build_srpm.data
@@ -1,5 +1,5 @@
 COPY_LIST=" \
-  $FILES_BASE/* \
-  $CGCS_BASE/mwa-gplv2/tpmdd/patches/* \
-  $CGCS_BASE/downloads/tpm-kmod-668a8270.tar.gz"
+  $PKG_BASE/files/* \
+  $PKG_BASE/patches/* \
+  $STX_BASE/downloads/tpm-kmod-668a8270.tar.gz"
 TIS_PATCH_VER=5
diff --git a/kernel/kernel-modules/tpmdd/centos/files/COPYING b/kernel/kernel-modules/tpmdd/files/COPYING
similarity index 100%
rename from kernel/kernel-modules/tpmdd/centos/files/COPYING
rename to kernel/kernel-modules/tpmdd/files/COPYING
diff --git a/kernel/kernel-modules/tpmdd/centos/files/README b/kernel/kernel-modules/tpmdd/files/README
similarity index 100%
rename from kernel/kernel-modules/tpmdd/centos/files/README
rename to kernel/kernel-modules/tpmdd/files/README
diff --git a/kernel/kernel-modules/tpmdd/centos/files/modules-load.conf b/kernel/kernel-modules/tpmdd/files/modules-load.conf
similarity index 100%
rename from kernel/kernel-modules/tpmdd/centos/files/modules-load.conf
rename to kernel/kernel-modules/tpmdd/files/modules-load.conf