From 044a75ef7c703440951c9e3e6944f0c42dbffb1f Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 4 Sep 2019 10:13:48 -0400
Subject: [PATCH] Config file changes to add 'ceph/ceph-manager
 ceph/python-cephclient utilities/nfscheck utilities/logmgmt
 security/tpm2-openssl-engine security/stx-ssl tools/collector
 tools/engtools/hostdata-collectors utilities/build-info
 utilities/namespace-utils utilities/pci-irq-affinity-agent
 utilities/platform-util utilities/stx-extensions utilities/update-motd '
 after relocation from 'stx-integ'

Story: 2006166
Task: 35687
Change-Id: Ied93c5440d7c360933da1ce2aa38ea18c93b0ca4
Signed-off-by: Scott Little <scott.little@windriver.com>
Depends-On: I20bedc68c469d5e4096f68f0e7f82ebd7df54b02
---
 centos_guest_image.inc                        |  3 ++
 centos_guest_image_rt.inc                     |  3 ++
 centos_iso_image.inc                          | 37 +++++++++++++++++++
 centos_pkg_dirs                               | 14 +++++++
 security/stx-ssl/centos/wrs-ssl.spec          |  4 +-
 utilities/stx-extensions/PKG-INFO             |  2 +-
 .../stx-extensions/centos/tis-extensions.spec |  2 +-
 7 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 centos_guest_image.inc
 create mode 100644 centos_guest_image_rt.inc

diff --git a/centos_guest_image.inc b/centos_guest_image.inc
new file mode 100644
index 00000000..1ec7be0a
--- /dev/null
+++ b/centos_guest_image.inc
@@ -0,0 +1,3 @@
+
+# build-info
+build-info
diff --git a/centos_guest_image_rt.inc b/centos_guest_image_rt.inc
new file mode 100644
index 00000000..1ec7be0a
--- /dev/null
+++ b/centos_guest_image_rt.inc
@@ -0,0 +1,3 @@
+
+# build-info
+build-info
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index b16bf45e..81fef845 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -2,3 +2,40 @@ pm-qos-mgr
 
 # worker-utils
 worker-utils
+
+# python-cephclient
+python-cephclient
+
+# nfscheck
+nfscheck
+
+# logmgmt
+logmgmt
+
+# tpm2-openssl-engine
+tpm2-openssl-engine
+
+# stx-ssl
+stx-ssl
+
+# collector
+collector
+
+# build-info
+build-info
+
+# namespace-utils
+namespace-utils
+
+# pci-irq-affinity-agent
+pci-irq-affinity-agent
+
+# platform-util
+platform-util
+platform-util-noncontroller
+
+# stx-extensions
+stx-extensions
+
+# update-motd
+update-motd
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index bd956194..d6258553 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,2 +1,16 @@
 utilities/pm-qos-mgr
 utilities/worker-utils
+ceph/ceph-manager
+ceph/python-cephclient
+utilities/nfscheck
+utilities/logmgmt
+security/tpm2-openssl-engine
+security/stx-ssl
+tools/collector
+tools/engtools/hostdata-collectors
+utilities/build-info
+utilities/namespace-utils
+utilities/pci-irq-affinity-agent
+utilities/platform-util
+utilities/stx-extensions
+utilities/update-motd
diff --git a/security/stx-ssl/centos/wrs-ssl.spec b/security/stx-ssl/centos/wrs-ssl.spec
index f4983978..ac053913 100644
--- a/security/stx-ssl/centos/wrs-ssl.spec
+++ b/security/stx-ssl/centos/wrs-ssl.spec
@@ -1,5 +1,5 @@
-Summary: wrs-ssl version 1.0.0-r2
-Name: wrs-ssl
+Summary: stx-ssl version 1.0.0-r2
+Name: stx-ssl
 Version: 1.0.0
 Release: %{tis_patch_ver}%{?_tis_dist}
 License: Apache-2.0
diff --git a/utilities/stx-extensions/PKG-INFO b/utilities/stx-extensions/PKG-INFO
index 80d6c515..b81d4bc0 100644
--- a/utilities/stx-extensions/PKG-INFO
+++ b/utilities/stx-extensions/PKG-INFO
@@ -1,5 +1,5 @@
 Metadata-Version: 1.1
-Name: tis-extensions
+Name: stx-extensions
 Version: 1.0
 Summary: TIS Extensions to thirdparty pkgs
 Home-page: 
diff --git a/utilities/stx-extensions/centos/tis-extensions.spec b/utilities/stx-extensions/centos/tis-extensions.spec
index 5b332b8f..f4b6e59a 100644
--- a/utilities/stx-extensions/centos/tis-extensions.spec
+++ b/utilities/stx-extensions/centos/tis-extensions.spec
@@ -5,7 +5,7 @@
 # without modifying or rebuilding the thirdparty package.
 #
 
-Name: tis-extensions
+Name: stx-extensions
 Version: 1.0
 Summary: TIS Extensions to thirdparty pkgs
 Release: %{tis_patch_ver}%{?_tis_dist}