xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-05 17:58:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5271 from xcat2/master

Browse Source 
merge from master to 2.14 branch for 2.14.1 release. (3)
This commit is contained in:
Weihua Hu
2018-05-31 18:23:26 +08:00
committed by GitHub
parent 4489480054 5e0a1211b9
commit be93422832
4 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/conf.py
View File

@@ -59,7 +59,7 @@ author = u'IBM Corporation'
# The short X.Y version.
version = '2'
# The full version, including alpha/beta/rc tags.
release = '2.14'
release = '2.14.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

14
docs/source/overview/xcat2_release.rst
View File

@@ -14,6 +14,20 @@ xCAT 2.14.x
|xCAT |New OS |New |New Feature |
|Version | |Hardware | |
+=================================+===============+=============+==================================+
|| xCAT 2.14.1 |- RHV4.2 + | |- OpenBMC in python enhance: |
|| 2018/6/1 | RHEL7.5 + p8 | | |
|| | | | rinv enhance,issue #5176 |
| `2.14.1 Release Notes <https:// | | | |
| github.com/xcat2/xcat-core/wiki | | |- Cumulus Switch OS - syncfile |
| /XCAT_2.14.1_Release_Notes>`_ | | | |
| | | |- Discover process enhance |
| | | | |
| | | |- xcatprobe `xcatmn` enhance |
| | | | |
| | | |- xcat-inventory enhance(beta) |
| | | | |
| | | |- goconserver v0.2.2 |
+---------------------------------+---------------+-------------+----------------------------------+
|| xCAT 2.14 |- RHEL 7.5 | |- OpenBMC support in python: |
|| 2018/4/20 | | | |
|| | | | rspconfig,reventlog |

15
xCAT-genesis-builder/buildrpm
View File

@@ -133,7 +133,6 @@ elif [ $BUILDARCH = "ppc64" ]; then
sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install
sed -i 's/ reiserfstune//' $DRACUTMODDIR/install
sed -i 's/ vconfig//' $DRACUTMODDIR/install
sed -i 's/ ntp-wait//' $DRACUTMODDIR/install
fi
sed -i 's/ efibootmgr//' $DRACUTMODDIR/install
sed -i 's/ dmidecode//' $DRACUTMODDIR/install
@@ -145,6 +144,20 @@ libnss_pkgname=`find /usr/lib64/ -name libnss_dns-2*.so | xargs basename`
sed -i "s/\/lib64\/libnss_dns-2.12.so/\/usr\/lib64\/$libnss_pkgname/g" $DRACUTMODDIR/install
sed -i 's/\/lib64\/libnss_dns.so.2/\/usr\/lib64\/libnss_dns.so.2/' $DRACUTMODDIR/install
# Based on cmdlist_check, makesure the commands are included in $DRACUTMODDIR/install
if [ -e "${DRACUTMODDIR}/cmdlist_check" ]; then
miss_cmd=0
for cmd in `cat ${DRACUTMODDIR}/cmdlist_check`; do
if ! grep $cmd $DRACUTMODDIR/install; then
echo "ERROR: The required $cmd is not included in the install file to build the Genesis base package"
miss_cmd=1
fi
done
if [ "$miss_cmd" = 1 ]; then
exit 1
fi
fi
mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs
# run dracut

1
xCAT-genesis-builder/cmdlist_check Normal file
View File

@@ -0,0 +1 @@
ntp-wait