mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
Merge pull request #19937 from nshalman/fix-esky-version-2014.7
SmartOS Esky: fix build version identification (backport of saltstack/salt#19936)
This commit is contained in:
commit
491cfbfab1
@ -1,20 +1,28 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -o errexit
|
||||
|
||||
PKG_DIR=$(cd $(dirname $0); pwd)
|
||||
BUILD_DIR=build/output/salt
|
||||
|
||||
rm -rf dist/ $BUILD_DIR &&\
|
||||
cp $PKG_DIR/_syspaths.py salt/ &&\
|
||||
python2.7 setup.py sdist &&\
|
||||
python2.7 setup.py bdist &&\
|
||||
python2.7 setup.py bdist_esky &&\
|
||||
rm salt/_syspaths.py &&\
|
||||
rm -f dist/*.tar.gz &&\
|
||||
mkdir -p $BUILD_DIR/{etc,install,bin/appdata} &&\
|
||||
cp conf/* $BUILD_DIR/etc/
|
||||
cp $PKG_DIR/*.xml $PKG_DIR/install.sh $BUILD_DIR/install &&\
|
||||
chmod +x $BUILD_DIR/install/install.sh &&\
|
||||
unzip -d $BUILD_DIR/bin dist/*.zip &&\
|
||||
cp $BUILD_DIR/bin/*/libgcc_s.so.1 $BUILD_DIR/bin/ &&\
|
||||
find build/output/salt/bin/ -mindepth 1 -maxdepth 1 -type d -not -name appdata -exec mv {} $BUILD_DIR/bin/appdata/ \; &&\
|
||||
gtar -C $BUILD_DIR/.. -czvf dist/salt-$(git describe | sed 's|^v||')-esky-smartos.tar.gz salt &&\
|
||||
# In case this is a git checkout, run sdist then extract out tarball
|
||||
# contents to get all the critical versioning files into place
|
||||
rm -rf dist/
|
||||
python2.7 setup.py sdist
|
||||
gtar xzvf dist/salt*.tar.gz --strip-components=1
|
||||
|
||||
rm -rf dist/ $BUILD_DIR
|
||||
cp $PKG_DIR/_syspaths.py salt/
|
||||
python2.7 setup.py bdist
|
||||
python2.7 setup.py bdist_esky
|
||||
rm salt/_syspaths.py
|
||||
rm -f dist/*.tar.gz
|
||||
mkdir -p $BUILD_DIR/{install,bin/appdata}
|
||||
cp -r conf $BUILD_DIR/etc
|
||||
cp $PKG_DIR/*.xml $PKG_DIR/install.sh $BUILD_DIR/install
|
||||
chmod +x $BUILD_DIR/install/install.sh
|
||||
unzip -d $BUILD_DIR/bin dist/*.zip
|
||||
cp $BUILD_DIR/bin/*/libgcc_s.so.1 $BUILD_DIR/bin/
|
||||
find build/output/salt/bin/ -mindepth 1 -maxdepth 1 -type d -not -name appdata -exec mv {} $BUILD_DIR/bin/appdata/ \;
|
||||
gtar -C $BUILD_DIR/.. -czvf dist/salt-$(awk '/^Version:/{print $2}' < PKG-INFO)-esky-smartos.tar.gz salt
|
||||
echo "tarball built"
|
||||
|
Loading…
Reference in New Issue
Block a user