xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-16 11:20:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #284 from fenggaobj/master

Browse Source 
xCAT-genesis-builder for Openpower
This commit is contained in:
zet809
2015-11-06 16:38:40 +08:00
parent eac16d9ce2 b6b1155f41
commit 275cd92260
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
perl-xCAT/xCAT/ProfiledNodeUtils.pm
View File

@ -1347,12 +1347,23 @@ sub gen_chain_for_profiles{
}
#run bmcsetups.
#PowerNV nodes can't use 'runcmd=bmcsetup' to set BMC.
if ((exists $netprofileattr->{"bmc"}) and $hw_reconfig and $netboot ne 'petitboot'){
if (index($final_chain, "runcmd=bmcsetup") == -1){
$final_chain = 'runcmd=bmcsetup,'.$final_chain.':reboot4deploy';
}
else{
$final_chain = $final_chain.':reboot4deploy';
#But OpenPower need to support bmcsetup
my $nodehmtab = xCAT::Table->new('nodehm');
my $comments = "";
my $nodehmtab_entry = $nodehmtab->getNodeAttribs($hwprofile, ['comments']);
if (defined $nodehmtab_entry->{'comments'}) {
$comments = $nodehmtab_entry->{'comments'};
}
if ((exists $netprofileattr->{"bmc"}) and $hw_reconfig){
if ((($netboot eq 'petitboot') and ($comments eq 'openpower')) or ($netboot ne 'petiboot'))
{
if (index($final_chain, "runcmd=bmcsetup") == -1){
$final_chain = 'runcmd=bmcsetup,'.$final_chain.':reboot4deploy';
}
else{
$final_chain = $final_chain.':reboot4deploy';
}
}
}
return (0, $final_chain);

7
xCAT-genesis-builder/buildrpm
View File

@ -24,6 +24,11 @@ DIR=`dirname $0`
DIR=`readlink -f $DIR`
BUILDARCH=`uname -m`
#For Openpower
if [ $BUILDARCH = "ppc64le" ]; then
BUILDARCH="ppc64"
fi
# get the input files for dracut in the right place
# Fedora 20 ppc64 uses /usr/lib/dracut/modules.d
# CentOS 7 probably uses /usr/lib/dracut/modules.d also
@ -53,6 +58,8 @@ if [ "$HOSTOS" = "mcp" ]; then
sed -i 's/dracut_install dmidecode \/usr\/lib64\/libstdc++.so.5//' $DRACUTMODDIR/install
sed -i 's/dmidecode//' $DRACUTMODDIR/install
sed -i 's/\/lib\/ld-linux.so.2/\/usr\/lib64\/ld-2.17.so/' $DRACUTMODDIR/install
sed -i 's/\/lib64\/libsysfs.so.2//' $DRACUTMODDIR/install
sed -i 's/\/usr\/sbin\/iprconfig//' $DRACUTMODDIR/install
else
sed -i 's/\/lib\/ld-linux.so.2/\/usr\/lib64\/ld-linux-x86-64.so.2/' $DRACUTMODDIR/install
fi

2
xCAT-genesis-builder/xCAT-genesis-base.spec
View File

@ -5,7 +5,7 @@
%ifarch x86_64
%define tarch x86_64
%endif
%ifarch ppc ppc64
%ifarch ppc ppc64 ppc64le
%define tarch ppc64
%endif
BuildArch: noarch

5
xCAT-genesis-builder/xcat-cmdline.sh
View File

@ -45,6 +45,11 @@ while :; do screen -ln < /dev/tty2 > /dev/tty2 2>&1; done &
# Need to wait for NIC initialization
sleep 20
ARCH=`uname -m`
#For Openpower
if [ $ARCH = "ppc64le" ]; then
ARCH="ppc64"
fi
if [ $ARCH == 'ppc64' ]; then
ALL_NICS=`ip link show | grep -v "^ " | awk '{print $2}' | sed -e 's/:$//' | grep -v lo`