diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm index fad875bc3..51f8ef799 100644 --- a/xCAT-server/lib/xcat/plugins/lsslp.pm +++ b/xCAT-server/lib/xcat/plugins/lsslp.pm @@ -39,8 +39,8 @@ use constant { SERVICE_CMM => "chassis-management-module", SERVICE_RSA => "remote-supervisor-adapter", SERVICE_RSA2 => "remote-supervisor-adapter-2", - SLP_CONF => "/usr/local/etc/slp.conf", - SLPTOOL => "/usr/local/bin/slptool", + #SLP_CONF => "/usr/local/etc/slp.conf", + #SLPTOOL => "/usr/local/bin/slptool", TYPE_MM => "mm", TYPE_CMM => "cmm", TYPE_RSA => "rsa", diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 0176ec0f2..15ce86e40 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -27,9 +27,7 @@ Requires: xCAT-server xCAT-client perl-DBD-SQLite Requires: httpd nfs-utils nmap bind perl-XML-Parser perl(CGI) # On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server Requires: /usr/sbin/dhcpd -%ifarch s390x -# No additional requires for zLinux right now -%else +%ifnarch s390x Requires: /etc/xinetd.d/tftp # yaboot-xcat is pulled in so any MN can manage ppc nodes Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping @@ -37,9 +35,6 @@ Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping %ifarch ppc64 Requires: perl-IO-Stty %endif -%ifarch ppc64 x86_64 -Requires: openslp-xcat -%endif %endif %ifarch i386 i586 i686 x86 x86_64