From a1d39cd1174b604bdb8948dd488466ea2a3df247 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Wed, 1 Feb 2012 01:01:27 +0000 Subject: [PATCH] Fixed minimal build for zvm git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11449 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/perl-xCAT.spec | 3 ++ xCAT-server/xCAT-server.spec | 77 ++++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/perl-xCAT/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec index 7f8504663..f89ec07db 100644 --- a/perl-xCAT/perl-xCAT.spec +++ b/perl-xCAT/perl-xCAT.spec @@ -70,6 +70,9 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/vboxService.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/FSP*.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC*.pm +# have to put PPCdb.pm back because it is needed by Postage.pm +cp xCAT/PPCdb.pm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/ +chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPCdb.pm %endif cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/perl-xCAT diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index 56e150db7..b0e8e6705 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -135,40 +135,6 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/activedirectory.pm %endif -# Don't ship these on zVM, to reduce dependencies -%if %zvm -rm $RPM_BUILD_ROOT/%{prefix}/sbin/stopstartxcatd -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm.legacy -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/nodediscover.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/switch.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xen.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/kvm.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/activedirectory.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/aixinstall.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bmcconfig.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bpa.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/esx.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/FIP.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/fsp.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hmc.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ivm.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/lsslp.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/pxe.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/toolscenter.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/windows.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xcat2nim.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xnba.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/ADUtils.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IPMI.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/MellanoxIB.pm -rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm -%endif - cp lib/xcat/dsh/Context/* $RPM_BUILD_ROOT/%{prefix}/xdsh/Context chmod 644 $RPM_BUILD_ROOT/%{prefix}/xdsh/Context/* @@ -186,6 +152,49 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/* chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples/* +# Don't ship these on zVM, to reduce dependencies +%if %zvm +rm $RPM_BUILD_ROOT/%{prefix}/sbin/stopstartxcatd +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/activedirectory.pm +# this is needed by lsslp.pm +#rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm.legacy +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/nodediscover.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/switch.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xen.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/kvm.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/aixinstall.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bmcconfig.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bpa.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/esx.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/FIP.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/fsp.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hmc.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ivm.pm +# this is needed by PPCdb.pm in perl-xCAT +#rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/lsslp.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/pxe.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/toolscenter.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/windows.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xcat2nim.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xnba.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IPMI.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/MellanoxIB.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm +# Can not remove this, because it is needed by Templates.pm +#rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/ADUtils.pm +rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/hmc +rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/ivm +rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/multiple +rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/fsp +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/snmpmon.pm +rm $RPM_BUILD_ROOT/%{prefix}/sbin/xcat_traphandler +%endif + cp lib/xcat/shfunctions $RPM_BUILD_ROOT/%{prefix}/lib chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/shfunctions