2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00

specify build pkg dir when build rpm/deb (#5463)

* specify build pkg dir when build rpm/deb

* modified depending on comments
This commit is contained in:
xuweibj 2018-08-06 16:16:19 +08:00 committed by yangsong
parent 5d0db4e092
commit 5bafda521e
2 changed files with 24 additions and 1 deletions

View File

@ -26,6 +26,7 @@
#
# LOG=<filename> - provide an LOG file option to redirect some output into log file
#
# BUILDDESTDIR=<build_tarball_dir> - Copy build core tarball to BUILDDESTDIR if defined
# For the dependency packages 1. All the xcat dependency deb packages should be uploaded to
# "pokgsa/projects/x/xcat/build/ubuntu/xcat-dep/debs/" on GSA
# 2. run ./build-ubunturepo -d
@ -400,6 +401,17 @@ __EOF__
chgrp root $tar_name
chmod g+w $tar_name
if [ "$BUILDDESTDIR" ]; then
rm -rf $BUILDDESTDIR
mkdir -p $BUILDDESTDIR
cp $tar_name $BUILDDESTDIR
if [ $? != 0 ]; then
echo "Failed to copy $tar_name to $BUILDDESTDIR"
else
echo "Copied $tar_name to $BUILDDESTDIR"
fi
fi
if [ ! -e core-snap ]; then
ln -s xcat-core core-snap
fi

View File

@ -30,7 +30,7 @@
# VERBOSE=1 - to see lots of verbose output
# LOG=<filename> - provide an LOG file option to redirect some output into log file
# RPMSIGN=0 or RPMSIGN=1 - Sign the RPMs using the keys on GSA, the default is to sign the rpms without RPMSIGN specified
# BUILDDESTDIR=<build_tarball_dir> - Copy build core tarball to BUILDDESTDIR if defined
#
# The following environment variables can be modified if you need
#
@ -569,6 +569,17 @@ fi
chgrp $SYSGRP $TARNAME
chmod g+w $TARNAME
if [ "$BUILDDESTDIR" ]; then
rm -rf $BUILDDESTDIR
mkdir -p $BUILDDESTDIR
cp $TARNAME $BUILDDESTDIR
if [ $? != 0 ]; then
echo "Failed to copy $TARNAME to $BUILDDESTDIR"
else
echo "Copied $TARNAME to $BUILDDESTDIR"
fi
fi
# Decide whether to upload or not
if [ -n "$UP" ] && [ "$UP" == 0 ]; then
exit 0;