From d5696d6c210e2c37dae44847bd2017fe166f110d Mon Sep 17 00:00:00 2001 From: Patrick Lundgren Date: Wed, 5 Oct 2016 16:13:24 -0400 Subject: [PATCH 1/4] Add pkglist file skeletons for xcat-coral rpm --- .../share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist | 1 + .../share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist | 1 + .../share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist | 1 + .../share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist | 1 + .../xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist | 1 + 5 files changed, 5 insertions(+) create mode 100644 xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist create mode 100644 xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist create mode 100644 xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist create mode 100644 xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist create mode 100644 xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist diff --git a/xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist new file mode 100644 index 000000000..e0d8f6ca7 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist @@ -0,0 +1 @@ +#coral compute diff --git a/xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist new file mode 100644 index 000000000..06bcce304 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist @@ -0,0 +1 @@ +#coral launch diff --git a/xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist new file mode 100644 index 000000000..125d1ace0 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist @@ -0,0 +1 @@ +#coral login diff --git a/xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist new file mode 100644 index 000000000..d19b3e4e4 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist @@ -0,0 +1 @@ +#coral service diff --git a/xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist new file mode 100644 index 000000000..a3242b680 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist @@ -0,0 +1 @@ +#coral workload manager From e50ab3c0a68fa1cbf56101e40d036a83701735a9 Mon Sep 17 00:00:00 2001 From: Patrick Lundgren Date: Wed, 12 Oct 2016 15:59:44 -0400 Subject: [PATCH 2/4] Renamed rpm to xCAT-csm. Moved pkglist files to xcat-core/xCAT-csm/ directory. Added spec file --- .../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 xCAT-csm/xCAT-csm.spec | 52 +++++++++++++++++++ 6 files changed, 52 insertions(+) rename xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist => xCAT-csm/csm.compute.rhels7.ppc64le.pkglist (100%) rename xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist => xCAT-csm/csm.launch.rhels7.ppc64le.pkglist (100%) rename xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist => xCAT-csm/csm.login.rhels7.ppc64le.pkglist (100%) rename xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist => xCAT-csm/csm.service.rhels7.ppc64le.pkglist (100%) rename xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist => xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist (100%) create mode 100644 xCAT-csm/xCAT-csm.spec diff --git a/xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist b/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist similarity index 100% rename from xCAT-server/share/xcat/netboot/rh/coral.compute.rhels7.ppc64le.pkglist rename to xCAT-csm/csm.compute.rhels7.ppc64le.pkglist diff --git a/xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist b/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist similarity index 100% rename from xCAT-server/share/xcat/netboot/rh/coral.launch.rhels7.ppc64le.pkglist rename to xCAT-csm/csm.launch.rhels7.ppc64le.pkglist diff --git a/xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist b/xCAT-csm/csm.login.rhels7.ppc64le.pkglist similarity index 100% rename from xCAT-server/share/xcat/netboot/rh/coral.login.rhels7.ppc64le.pkglist rename to xCAT-csm/csm.login.rhels7.ppc64le.pkglist diff --git a/xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist b/xCAT-csm/csm.service.rhels7.ppc64le.pkglist similarity index 100% rename from xCAT-server/share/xcat/netboot/rh/coral.service.rhels7.ppc64le.pkglist rename to xCAT-csm/csm.service.rhels7.ppc64le.pkglist diff --git a/xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist b/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist similarity index 100% rename from xCAT-server/share/xcat/netboot/rh/coral.workloadmanager.rhels7.ppc64le.pkglist rename to xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist diff --git a/xCAT-csm/xCAT-csm.spec b/xCAT-csm/xCAT-csm.spec new file mode 100644 index 000000000..9c6e61e1c --- /dev/null +++ b/xCAT-csm/xCAT-csm.spec @@ -0,0 +1,52 @@ +Summary: Packages for installation of CSM nodes +Name: xCAT-csm +Version: %{?version:%{version}}%{!?version:%(cat Version)} +Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} +Epoch: 4 +License: IBM +Group: Applications/System +Source: xCAT-csm-%{version}.tar.gz +Packager: IBM Corp. +Vendor: IBM Corp. +Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} +Prefix: /opt/xcat +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root + +%ifos linux +BuildArch: noarch +%endif + +Provides: xCAT-csm = %{epoch}:%{version} + +Requires: xCAT + +%description +xCAT-csm provides Packages for installation of CSM nodes + +%prep +%setup -q -n xCAT-csm + + +%build + +%install +rm -rf %{buildroot} + +mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/ + +set +x + +cp csm* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/ + +%clean +# This step does not happen until *after* the %files packaging below +rm -rf $RPM_BUILD_ROOT + +%files +%{prefix} +%defattr(-,root,root,-) +%doc + + + +%changelog From cb54221261a46e6ff62fbd5759befb68ea304fc1 Mon Sep 17 00:00:00 2001 From: Patrick Lundgren Date: Tue, 18 Oct 2016 09:27:41 -0400 Subject: [PATCH 3/4] 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 From eefea03d0a1acbfe8468ffb0a137b9e59978f783 Mon Sep 17 00:00:00 2001 From: Patrick Lundgren Date: Tue, 18 Oct 2016 16:11:14 -0400 Subject: [PATCH 4/4] Added xCAT-csm to buildcore.sh, fixed typo in xCAT-csm.spec --- buildcore.sh | 4 ++-- xCAT-csm/xCAT-csm.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index 400eb4620..f575c3c9c 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -67,7 +67,7 @@ if [ -z "$UP" ]; then fi # These are the rpms that should be built for each kind of xcat build -ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe" +ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm" ZVMBUILD="perl-xCAT xCAT-server xCAT-UI" ZVMLINK="xCAT-client xCAT xCATsn" # xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat @@ -299,7 +299,7 @@ if [ "$OSNAME" = "AIX" ]; then fi # Build the rest of the noarch rpms -for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe; do +for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm; do if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi # do not build xCAT-buildkit on aix if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-SoftLayer" ]; then continue; fi # do not build xCAT-softlayer on aix diff --git a/xCAT-csm/xCAT-csm.spec b/xCAT-csm/xCAT-csm.spec index cd1d31f3d..23c1a9b92 100644 --- a/xCAT-csm/xCAT-csm.spec +++ b/xCAT-csm/xCAT-csm.spec @@ -45,7 +45,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{prefix} -/install/poscripts +/install/postscripts %doc