xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5473 from robin2008/build-tar

Browse Source 
put the tarball directly under DEST directory when building xcat-core
This commit is contained in:
xuweibj 2018-08-07 13:57:41 +08:00 committed by GitHub
commit 523ada7297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build-ubunturepo
View File

@ -28,7 +28,6 @@
#
# DEST=<directory> - provide a directory to contains the build result
#
# 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
@ -399,14 +398,10 @@ __EOF__
chgrp root $tar_name
chmod g+w $tar_name
if [ "$BUILDDESTDIR" ]; then
rm -rf $BUILDDESTDIR
mkdir -p $BUILDDESTDIR
cp $tar_name $BUILDDESTDIR
if [ -n "$DEST" ]; then
ln -sf $(basename `pwd`)/$tar_name ../$tar_name
if [ $? != 0 ]; then
echo "Failed to copy $tar_name to $BUILDDESTDIR"
else
echo "Copied $tar_name to $BUILDDESTDIR"
echo "ERROR: Failed to make symbol link $DEST/$tar_name"
fi
fi

12
buildcore.sh
View File

@ -32,8 +32,6 @@
# GPGSIGN/RPMSIGN=0 or GPGSIGN/RPMSIGN=1 - Sign the RPMs using the keys on GSA, the default is to sign the rpms without GPGSIGN/RPMSIGN specified
# DEST=<directory> - provide a directory to contains the build result
#
# BUILDDESTDIR=<build_tarball_dir> - Copy build core tarball to BUILDDESTDIR if defined
#
# The following environment variables can be modified if you need
#
@ -585,14 +583,10 @@ fi
chgrp $SYSGRP $TARNAME
chmod g+w $TARNAME
if [ "$BUILDDESTDIR" ]; then
rm -rf $BUILDDESTDIR
mkdir -p $BUILDDESTDIR
cp $TARNAME $BUILDDESTDIR
if [ -n "$DEST" ]; then
ln -sf $(basename `pwd`)/$TARNAME ../$TARNAME
if [ $? != 0 ]; then
echo "Failed to copy $TARNAME to $BUILDDESTDIR"
else
echo "Copied $TARNAME to $BUILDDESTDIR"
echo "ERROR: Failed to make symbol link $DEST/$TARNAME"
fi
fi