diff --git a/xCAT/debian/control b/xCAT/debian/control index 997910a96..29b2c2c1c 100644 --- a/xCAT/debian/control +++ b/xCAT/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: xcat Architecture: amd64 ppc64el -Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.15-2), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-amd64, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) +Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.15-2), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-amd64, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) Description: Server and configuration utilities of the xCAT management project xcat-server provides the core server and configuration management components of xCAT. This package should be installed on your management server diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 8557d2c8c..57247a257 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -59,11 +59,14 @@ Requires: conserver-xcat %endif %endif +#support mixed cluster +Requires: elilo-xcat xnba-undi + %ifarch i386 i586 i686 x86 x86_64 -Requires: syslinux elilo-xcat +Requires: syslinux Requires: ipmitool-xcat >= 1.8.15-2 -Requires: xnba-undi %endif + %ifos linux %ifarch ppc ppc64 ppc64le Requires: ipmitool-xcat >= 1.8.15-2 @@ -71,11 +74,9 @@ Requires: ipmitool-xcat >= 1.8.15-2 %endif %if %notpcm -%ifarch i386 i586 i686 x86 x86_64 # PCM does not need or ship syslinux-xcat Requires: syslinux-xcat %endif -%endif %description xCAT is a server management package intended for at-scale management, including diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index f18eda6d0..833a84def 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -54,10 +54,12 @@ Requires: conserver-xcat %endif %endif +#support mixed cluster +Requires: elilo-xcat xnba-undi + %ifarch i386 i586 i686 x86 x86_64 -Requires: syslinux elilo-xcat +Requires: syslinux Requires: ipmitool-xcat >= 1.8.15-2 -Requires: xnba-undi %endif %ifos linux %ifarch ppc ppc64 ppc64le @@ -66,11 +68,9 @@ Requires: ipmitool-xcat >= 1.8.15-2 %endif %if %notpcm -%ifarch i386 i586 i686 x86 x86_64 # PCM does not need or ship syslinux-xcat Requires: syslinux-xcat %endif -%endif %description xCATsn is a service node management package intended for at-scale management,