diff --git a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.ppc64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.ppc64.otherpkgs.pkglist index 4b1936774..e96638fd4 100644 --- a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.ppc64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/fedora8/ppc64/conserver +xcat/xcat-dep/fedora8/ppc64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86.otherpkgs.pkglist index b8b4efff0..29b9bddd3 100644 --- a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/fedora8/x86/conserver +xcat/xcat-dep/fedora8/x86/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86_64.otherpkgs.pkglist index d90773d94..8abb1e614 100644 --- a/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora8.x86_64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/fedora8/x86_64/conserver +xcat/xcat-dep/fedora8/x86_64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/fedora/service.fedora9.ppc64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.fedora9.ppc64.otherpkgs.pkglist index 3e3874eb2..ccb26957b 100644 --- a/xCAT-server/share/xcat/netboot/fedora/service.fedora9.ppc64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora9.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/fedora9/ppc64/conserver +xcat/xcat-dep/fedora9/ppc64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/fedora/service.fedora9.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.fedora9.x86_64.otherpkgs.pkglist index 4efba47b2..03efd4eea 100644 --- a/xCAT-server/share/xcat/netboot/fedora/service.fedora9.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/fedora/service.fedora9.x86_64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/fedora9/x86_64/conserver +xcat/xcat-dep/fedora9/x86_64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.otherpkgs.pkglist index 8637f47ca..da694f3dc 100644 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/rh5/ppc64/conserver +xcat/xcat-dep/rh5/ppc64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86.otherpkgs.pkglist index 2a77f01bd..3ee203131 100644 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/rh5/x86/conserver +xcat/xcat-dep/rh5/x86/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86_64.otherpkgs.pkglist index e1e45c10c..2809f539e 100644 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.x86_64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/rh5/x86_64/conserver +xcat/xcat-dep/rh5/x86_64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.otherpkgs.pkglist index dba6c3d5a..8d53d3fc2 100644 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -OpenIPMI-tools -tftp-server xcat/xcat-core/xCATsn -xcat/xcat-dep/rh6/ppc64/conserver +xcat/xcat-dep/rh6/ppc64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.otherpkgs.pkglist index 0caf1b5f1..ac130ce4b 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles10/ppc64/conserver +xcat/xcat-dep/sles10/ppc64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles10.x86.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles10.x86.otherpkgs.pkglist index 7164a800e..17d23584d 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles10.x86.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles10.x86.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles10/x86/conserver +xcat/xcat-dep/sles10/x86/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles10.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles10.x86_64.otherpkgs.pkglist index f98429878..df4e56226 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles10.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles10.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles10/x86_64/conserver +xcat/xcat-dep/sles10/x86_64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.otherpkgs.pkglist index 89584312c..1c1c50a52 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles11/ppc64/conserver +xcat/xcat-dep/sles11/ppc64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.x86.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles11.x86.otherpkgs.pkglist index 469dd2bb8..c1657a6f0 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.x86.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.x86.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles11/x86/conserver +xcat/xcat-dep/sles11/x86/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles11.x86_64.otherpkgs.pkglist index d47abccf2..85abbe379 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles11/x86_64/conserver +xcat/xcat-dep/sles11/x86_64/conserver-xcat diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index d99c87832..1a8acf52a 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -29,7 +29,7 @@ Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd # No additional requires for zLinux right now %else # yaboot-xcat is pulled in so any MN can manage ppc nodes -Requires: atftp-xcat conserver yaboot-xcat perl-Net-Telnet +Requires: atftp-xcat conserver-xcat yaboot-xcat perl-Net-Telnet %endif %ifarch ppc64 Requires: perl-IO-Stty diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index d95ef553c..c2ef827ab 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -32,7 +32,7 @@ Requires: perl-IO-Stty %ifarch s390x # No additional requires for zLinux right now %else -Requires: atftp-xcat conserver yaboot-xcat perl-Net-Telnet +Requires: atftp-xcat conserver-xcat yaboot-xcat perl-Net-Telnet %endif %endif