xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00
Code Issues Releases Wiki Activity

Modification based on Victor's comments

Browse Source
This commit is contained in:
ertaozh 2017-01-09 23:36:10 -05:00
parent 6440032111
commit 197212a886
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build-ubunturepo
View File

@ -249,18 +249,24 @@ then
else
if [ "$file" = "xCAT-genesis-scripts" ]; then
echo "Rename control file to build pkg: mv ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control"
mv ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control
cp ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control
elif [ "$file" = "xCAT" ]; then
cp ${CURDIR}/../xCAT-genesis-scripts/bin/bmcsetup ${CURDIR}/postscripts/
cp ${CURDIR}/../xCAT-genesis-scripts/bin/getipmi ${CURDIR}/postscripts/
# shipping bmcsetup and getipmi scripts as part of postscripts
files=("bmcsetup" "getipmi")
for f in "${files[@]}"; do
cp ${CURDIR}/../xCAT-genesis-scripts/bin/$f ${CURDIR}/postscripts/$f
sed -i "s/xcat.genesis.$f/$f/g" ${CURDIR}/postscripts/$f
done
fi
dpkg-buildpackage -uc -us -a$target_arch
if [ "$file" = "xCAT-genesis-scripts" ]; then
echo "Move control file back: mv ${CURDIR}/debian/control ${CURDIR}/debian/control-${target_arch}"
mv ${CURDIR}/debian/control ${CURDIR}/debian/control-${target_arch}
rm ${CURDIR}/debian/control
elif [ "$file" = "xCAT" ]; then
rm -f ${CURDIR}/postscripts/bmcsetup
rm -f ${CURDIR}/postscripts/getipmi
files=("bmcsetup" "getipmi")
for f in "${files[@]}"; do
rm -f ${CURDIR}/postscripts/$f
done
fi
fi
rc=$?

16
makerpm
View File

@ -108,9 +108,13 @@ function makexcat {
if [ "$RPMNAME" = "xCAT" ]; then
cd `dirname $0`/
cp xCAT-genesis-scripts/bin/bmcsetup $RPMNAME/postscripts
cp xCAT-genesis-scripts/bin/getipmi $RPMNAME/postscripts
cd $RPMNAME
# shipping bmcsetup and getipmi scripts as part of postscripts
files=("bmcsetup" "getipmi")
for f in "${files[@]}"; do
cp "xCAT-genesis-scripts/bin/"$f ${RPMNAME}/postscripts/$f
sed -i "s/xcat.genesis.$f/$f/g" ${RPMNAME}/postscripts/$f
done
cd `dirname $0`/$RPMNAME
tar --exclude .svn --exclude upflag -czf $RPMROOT/SOURCES/postscripts.tar.gz postscripts LICENSE.html
tar --exclude .svn -czf $RPMROOT/SOURCES/prescripts.tar.gz prescripts
tar --exclude .svn -czf $RPMROOT/SOURCES/templates.tar.gz templates
@ -143,8 +147,10 @@ function makexcat {
rpmbuild $QUIET -ba $RPMNAME/$RPMNAME.spec $TARGET --define "version $VER" $REL "$EASE"
RC=$?
if [ "$RPMNAME" = "xCAT" ]; then
rm -f `dirname $0`/$RPMNAME/postscripts/bmcsetup
rm -f `dirname $0`/$RPMNAME/postscripts/getipmi
files=("bmcsetup" "getipmi")
for f in "${files[@]}"; do
rm -f `dirname $0`/${RPMNAME}/postscripts/$f
done
fi
fi
}

2
xCAT-genesis-scripts/bin/bmcsetup
View File

@ -13,7 +13,7 @@
# 0x08 0x00 0x49 0x4e 0x54 0x45 0x4c
# 0x08 0x04
#
log_label="bmcsetup"
log_label="xcat.genesis.bmcsetup"
TIMEOUT=15

2
xCAT-genesis-scripts/bin/getipmi
View File

@ -1,5 +1,7 @@
#!/bin/bash
log_label="xcat.genesis.getipmi"
allowcred.awk &
CREDPID=$!
if [ -z "$XCATDEST" ]; then