diff --git a/build-ubunturepo b/build-ubunturepo index 2f9457727..7511a168d 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -213,7 +213,7 @@ then for file in $packages do file_low=`echo $file | tr '[A-Z]' '[a-z]'` - if [ "$file" = "xCAT" -o "$file" = "xCAT-genesis-scripts" ]; then + if [ "$file" = "xCAT" -o "$file" = "xCAT-genesis-scripts" -o "$file" = "xCATsn" ]; then target_archs="amd64 ppc64el" else target_archs="all" diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 0bb0b52d9..e869078ce 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -1057,7 +1057,7 @@ passed as argument rather than by table value', " requests it does not know to these servers. Note that the DNS servers on the\n" . " service nodes will ignore this value and always be configured to forward \n" . " to the management node.\n\n" . -" emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section. \n\n" +" emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section. \n\n" . " master: The hostname of the xCAT management node, as known by the nodes.\n\n" . " nameservers: A comma delimited list of DNS servers that each node in the cluster should\n" . " use. This value will end up in the nameserver settings of the\n" . diff --git a/travis.pl b/travis.pl index 526cb5977..785879435 100644 --- a/travis.pl +++ b/travis.pl @@ -218,8 +218,8 @@ sub install_xcat{ my @cmds = ("cd ./../../xcat-core && sudo ./mklocalrepo.sh", "sudo chmod 777 /etc/apt/sources.list", - "sudo echo \"deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main\" >> /etc/apt/sources.list", - "sudo echo \"deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main\" >> /etc/apt/sources.list", + "sudo echo \"deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/xcat-dep trusty main\" >> /etc/apt/sources.list", + "sudo echo \"deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/devel/xcat-dep trusty main\" >> /etc/apt/sources.list", "sudo wget -q -O - \"http://xcat.org/files/xcat/repos/apt/apt.key\" | sudo apt-key add -", "sudo apt-get -qq update"); my @output; diff --git a/xCAT-vlan/debian/changelog b/xCAT-vlan/debian/changelog old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/compat b/xCAT-vlan/debian/compat old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/control b/xCAT-vlan/debian/control old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/copyright b/xCAT-vlan/debian/copyright old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/dirs b/xCAT-vlan/debian/dirs old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/docs b/xCAT-vlan/debian/docs old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/install b/xCAT-vlan/debian/install old mode 100755 new mode 100644 diff --git a/xCAT-vlan/debian/postinst b/xCAT-vlan/debian/postinst old mode 100755 new mode 100644 diff --git a/xCATsn/debian/control b/xCATsn/debian/control index 250449a81..4f2b6f223 100644 --- a/xCATsn/debian/control +++ b/xCATsn/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Homepage: https://xcat.org/ Package: xcatsn -Architecture: all +Architecture: amd64 ppc64el Depends: ${perl:Depends}, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, conserver-xcat, 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