Skip to content

Commit

Permalink
Merge pull request #6874 from xcat2/master
Browse files Browse the repository at this point in the history 
Merge from master to 2.16 branch for 2.16.1 release. (2)
  • Loading branch information
@gurevichmark
gurevichmark authored Nov 4, 2020
2 parents e548e4b + 69f8924 commit a85566c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion xCAT/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Homepage: https://xcat.org/

Package: xcat
Architecture: amd64 ppc64el
Depends: ${perl:Depends}, goconserver, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, libxml-parser-perl, rsync, tftpd-hpa, libnet-telnet-perl, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
Depends: ${perl:Depends}, goconserver(>= 0.3.3-snap000000000000), xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, libxml-parser-perl, rsync, tftpd-hpa, libnet-telnet-perl, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000)
Suggests: yaboot-xcat
Description: Metapackage for a common, default xCAT setup
Expand Down
2 changes: 1 addition & 1 deletion xCAT/xCAT.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Requires: perl-IO-Stty
%endif

%ifos linux
Requires: goconserver
Requires: goconserver >= 0.3.3
%endif

#support mixed cluster
Expand Down
2 changes: 1 addition & 1 deletion xCATsn/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Homepage: https://xcat.org/

Package: xcatsn
Architecture: amd64 ppc64el
Depends: ${perl:Depends}, goconserver, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, libnet-telnet-perl, isc-dhcp-server, apache2, nfs-kernel-server, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
Depends: ${perl:Depends}, goconserver (>=0.3.3-snap000000000000), xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, libnet-telnet-perl, isc-dhcp-server, apache2, nfs-kernel-server, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000)
Suggests: yaboot-xcat
Description: Metapackage for a common, default xCAT service node setup
Expand Down
2 changes: 1 addition & 1 deletion xCATsn/xCATsn.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Requires: perl-IO-Stty
%endif

%ifos linux
Requires: goconserver
Requires: goconserver >= 0.3.3
%endif

#support mixed cluster
Expand Down

0 comments on commit a85566c

Please sign in to comment.