From bef72f90d51a3d845c260ce3c7eba6d85bbf80ee Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 12 Oct 2017 15:41:24 -0400
Subject: [PATCH] Create netboot and install images for CSM rpm

---
 .../csm.compute.rhels7.ppc64le.pkglist             |  0
 .../csm.launch.rhels7.ppc64le.pkglist              |  0
 .../csm.login.rhels7.ppc64le.pkglist               |  0
 .../csm.service.rhels7.ppc64le.pkglist             |  0
 .../csm.workloadmanager.rhels7.ppc64le.pkglist     |  0
 .../netboot.rh/csm.compute.rhels7.ppc64le.pkglist  | 14 ++++++++++++++
 .../netboot.rh/csm.launch.rhels7.ppc64le.pkglist   |  1 +
 .../netboot.rh/csm.login.rhels7.ppc64le.pkglist    |  1 +
 .../netboot.rh/csm.service.rhels7.ppc64le.pkglist  |  1 +
 .../csm.workloadmanager.rhels7.ppc64le.pkglist     |  1 +
 xCAT-csm/xCAT-csm.spec                             |  6 ++++--
 11 files changed, 22 insertions(+), 2 deletions(-)
 rename xCAT-csm/{ => install.rh}/csm.compute.rhels7.ppc64le.pkglist (100%)
 rename xCAT-csm/{ => install.rh}/csm.launch.rhels7.ppc64le.pkglist (100%)
 rename xCAT-csm/{ => install.rh}/csm.login.rhels7.ppc64le.pkglist (100%)
 rename xCAT-csm/{ => install.rh}/csm.service.rhels7.ppc64le.pkglist (100%)
 rename xCAT-csm/{ => install.rh}/csm.workloadmanager.rhels7.ppc64le.pkglist (100%)
 create mode 100644 xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist
 create mode 100644 xCAT-csm/netboot.rh/csm.launch.rhels7.ppc64le.pkglist
 create mode 100644 xCAT-csm/netboot.rh/csm.login.rhels7.ppc64le.pkglist
 create mode 100644 xCAT-csm/netboot.rh/csm.service.rhels7.ppc64le.pkglist
 create mode 100644 xCAT-csm/netboot.rh/csm.workloadmanager.rhels7.ppc64le.pkglist

diff --git a/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist b/xCAT-csm/install.rh/csm.compute.rhels7.ppc64le.pkglist
similarity index 100%
rename from xCAT-csm/csm.compute.rhels7.ppc64le.pkglist
rename to xCAT-csm/install.rh/csm.compute.rhels7.ppc64le.pkglist
diff --git a/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist b/xCAT-csm/install.rh/csm.launch.rhels7.ppc64le.pkglist
similarity index 100%
rename from xCAT-csm/csm.launch.rhels7.ppc64le.pkglist
rename to xCAT-csm/install.rh/csm.launch.rhels7.ppc64le.pkglist
diff --git a/xCAT-csm/csm.login.rhels7.ppc64le.pkglist b/xCAT-csm/install.rh/csm.login.rhels7.ppc64le.pkglist
similarity index 100%
rename from xCAT-csm/csm.login.rhels7.ppc64le.pkglist
rename to xCAT-csm/install.rh/csm.login.rhels7.ppc64le.pkglist
diff --git a/xCAT-csm/csm.service.rhels7.ppc64le.pkglist b/xCAT-csm/install.rh/csm.service.rhels7.ppc64le.pkglist
similarity index 100%
rename from xCAT-csm/csm.service.rhels7.ppc64le.pkglist
rename to xCAT-csm/install.rh/csm.service.rhels7.ppc64le.pkglist
diff --git a/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist b/xCAT-csm/install.rh/csm.workloadmanager.rhels7.ppc64le.pkglist
similarity index 100%
rename from xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist
rename to xCAT-csm/install.rh/csm.workloadmanager.rhels7.ppc64le.pkglist
diff --git a/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist b/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..50fb4c7ab
--- /dev/null
+++ b/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist
@@ -0,0 +1,14 @@
+# 
+# Basic xCAT Netboot Compute node package List 
+# 
+#INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist#
+# 
+# Mellanox IB required packages 
+# 
+#INCLUDE:/opt/xcat/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist#
+#
+yum
+pciutils
+nvme-cli
+lsscsi
+lsvpd
diff --git a/xCAT-csm/netboot.rh/csm.launch.rhels7.ppc64le.pkglist b/xCAT-csm/netboot.rh/csm.launch.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..f24861fbb
--- /dev/null
+++ b/xCAT-csm/netboot.rh/csm.launch.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm launch
diff --git a/xCAT-csm/netboot.rh/csm.login.rhels7.ppc64le.pkglist b/xCAT-csm/netboot.rh/csm.login.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..4410939e0
--- /dev/null
+++ b/xCAT-csm/netboot.rh/csm.login.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm login
diff --git a/xCAT-csm/netboot.rh/csm.service.rhels7.ppc64le.pkglist b/xCAT-csm/netboot.rh/csm.service.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..932d448df
--- /dev/null
+++ b/xCAT-csm/netboot.rh/csm.service.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm service
diff --git a/xCAT-csm/netboot.rh/csm.workloadmanager.rhels7.ppc64le.pkglist b/xCAT-csm/netboot.rh/csm.workloadmanager.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..80ea18046
--- /dev/null
+++ b/xCAT-csm/netboot.rh/csm.workloadmanager.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm workload manager
diff --git a/xCAT-csm/xCAT-csm.spec b/xCAT-csm/xCAT-csm.spec
index b173e3043..b9865d37e 100644
--- a/xCAT-csm/xCAT-csm.spec
+++ b/xCAT-csm/xCAT-csm.spec
@@ -32,10 +32,12 @@ xCAT-csm provides Packages for installation of CSM nodes
 %install
 rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/
 mkdir -p $RPM_BUILD_ROOT/install/postscripts/
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/rh/
 
-cp csm* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/
+cp install.rh/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/
+cp netboot.rh/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/rh/
 cp install/postscripts/* $RPM_BUILD_ROOT/install/postscripts/
 
 %clean