From 2eb33775b5c5d16a520e18cd15a9eb771618b984 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Mon, 18 Jun 2012 21:35:53 +0000 Subject: [PATCH] change zvm pkging to avoid fping require and other xcat files git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13122 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/xCAT-server.spec | 5 ++--- xCAT/xCAT.spec | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index ecfa76be9..253a760fb 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -164,7 +164,6 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples/* %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 @@ -176,6 +175,7 @@ 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/slpdiscover.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 @@ -183,8 +183,7 @@ 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/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 diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 96ecf760d..2d21a6a87 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -24,7 +24,7 @@ Conflicts: xCATsn Requires: xCAT-server xCAT-client perl-DBD-SQLite %ifos linux -Requires: httpd nfs-utils nmap fping bind perl-XML-Parser perl(CGI) +Requires: httpd nfs-utils nmap bind perl-XML-Parser perl(CGI) Requires: /etc/xinetd.d/tftp # On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server Requires: /usr/sbin/dhcpd @@ -32,7 +32,7 @@ Requires: /usr/sbin/dhcpd # No additional requires for zLinux right now %else # yaboot-xcat is pulled in so any MN can manage ppc nodes -Requires: conserver-xcat yaboot-xcat perl-Net-Telnet +Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping %endif %ifarch ppc64 Requires: perl-IO-Stty