From cb54221261a46e6ff62fbd5759befb68ea304fc1 Mon Sep 17 00:00:00 2001 From: Patrick Lundgren Date: Tue, 18 Oct 2016 09:27:41 -0400 Subject: [PATCH] Suggested changes to skeleton from github discussion --- xCAT-csm/csm.compute.rhels7.ppc64le.pkglist | 2 +- xCAT-csm/csm.launch.rhels7.ppc64le.pkglist | 2 +- xCAT-csm/csm.login.rhels7.ppc64le.pkglist | 2 +- xCAT-csm/csm.service.rhels7.ppc64le.pkglist | 2 +- xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist | 2 +- xCAT-csm/install/postscripts/csm_post | 1 + xCAT-csm/xCAT-csm.spec | 7 ++++--- 7 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 xCAT-csm/install/postscripts/csm_post diff --git a/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist b/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist index e0d8f6ca7..a187e38a2 100644 --- a/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist +++ b/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist @@ -1 +1 @@ -#coral compute +#csm compute diff --git a/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist b/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist index 06bcce304..f24861fbb 100644 --- a/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist +++ b/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist @@ -1 +1 @@ -#coral launch +#csm launch diff --git a/xCAT-csm/csm.login.rhels7.ppc64le.pkglist b/xCAT-csm/csm.login.rhels7.ppc64le.pkglist index 125d1ace0..4410939e0 100644 --- a/xCAT-csm/csm.login.rhels7.ppc64le.pkglist +++ b/xCAT-csm/csm.login.rhels7.ppc64le.pkglist @@ -1 +1 @@ -#coral login +#csm login diff --git a/xCAT-csm/csm.service.rhels7.ppc64le.pkglist b/xCAT-csm/csm.service.rhels7.ppc64le.pkglist index d19b3e4e4..932d448df 100644 --- a/xCAT-csm/csm.service.rhels7.ppc64le.pkglist +++ b/xCAT-csm/csm.service.rhels7.ppc64le.pkglist @@ -1 +1 @@ -#coral service +#csm service diff --git a/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist b/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist index a3242b680..80ea18046 100644 --- a/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist +++ b/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist @@ -1 +1 @@ -#coral workload manager +#csm workload manager diff --git a/xCAT-csm/install/postscripts/csm_post b/xCAT-csm/install/postscripts/csm_post new file mode 100644 index 000000000..bfad0d20e --- /dev/null +++ b/xCAT-csm/install/postscripts/csm_post @@ -0,0 +1 @@ +#example postscript for CSM diff --git a/xCAT-csm/xCAT-csm.spec b/xCAT-csm/xCAT-csm.spec index 9c6e61e1c..cd1d31f3d 100644 --- a/xCAT-csm/xCAT-csm.spec +++ b/xCAT-csm/xCAT-csm.spec @@ -33,18 +33,19 @@ xCAT-csm provides Packages for installation of CSM nodes rm -rf %{buildroot} mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/ - -set +x +mkdir -p $RPM_BUILD_ROOT/install/postscripts/csm/ cp csm* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/ +cp install/postscripts/* $RPM_BUILD_ROOT/install/postscripts/csm/ %clean # This step does not happen until *after* the %files packaging below rm -rf $RPM_BUILD_ROOT %files -%{prefix} %defattr(-,root,root,-) +%{prefix} +/install/poscripts %doc