850dee1a06
- Update to 2017.7.0 See https://docs.saltstack.com/en/develop/topics/releases/2017.7.0.html for full changelog - fix ownership for whole master cache directory (bsc#1035914) - fix setting the language on SUSE systems (bsc#1038855) - wrong os_family grains on SUSE - fix unittests (bsc#1038855) - speed-up cherrypy by removing sleep call - Disable 3rd party runtime packages to be explicitly recommended. (bsc#1040886) - fix format error (bsc#1043111) - Add a salt-minion watchdog for RHEL6 and SLES11 systems (sysV) to restart salt-minion in case of crashes during upgrade. - Add procps as dependency. - Bugfix: jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) - All current patches has been removed as they were added upstream: * add-a-salt-minion-service-control-file.patch * add-options-for-dockerng.patch * add-ssh-option-to-salt-ssh.patch * add-unit-test-for-skip-false-values-from-preferred_i.patch * add-yum-plugin.patch * add-zypp-notify-plugin.patch * adding-support-for-installing-patches-in-yum-dnf-exe.patch * avoid-failures-on-sles-12-sp2-because-of-new-systemd.patch * bugfix-unable-to-use-127-as-hostname.patch * change-travis-configuration-file-to-use-salt-toaster.patch * check-if-byte-strings-are-properly-encoded-in-utf-8.patch * clean-up-change-attribute-from-interface-dict.patch * do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch * fix-grain-for-os_family-on-suse-series.patch OBS-URL: https://build.opensuse.org/request/show/514555 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=90
101 lines
2.0 KiB
Bash
101 lines
2.0 KiB
Bash
#!/bin/bash
|
|
#
|
|
# Update html.tar.bz2 documentation tarball
|
|
# Author: Bo Maryniuk <bo@suse.de>
|
|
#
|
|
|
|
NO_SPHINX_PARAM="--without-sphinx"
|
|
|
|
function build_virtenv() {
|
|
virtualenv --system-site-packages $1
|
|
source $1/bin/activate
|
|
pip install --upgrade pip
|
|
if [ -z "$2" ]; then
|
|
pip install -I Sphinx
|
|
fi
|
|
}
|
|
|
|
function check_env() {
|
|
if [[ -z "$1" || "$1" != "$NO_SPHINX_PARAM" ]] && [ ! -z "$(which sphinx-build 2>/dev/null)" ]; then
|
|
cat <<EOF
|
|
You've installed Spinx globally. But it might be outdated or
|
|
clash with the version I am going to install into the temporary
|
|
virtual environment from PIP.
|
|
|
|
Please consider to remove Sphinx from your system, perhaps?
|
|
Or pass me "$NO_SPHINX_PARAM" param so I will try reusing yours
|
|
and see what happens. :)
|
|
|
|
EOF
|
|
exit 1;
|
|
fi
|
|
|
|
for cmd in "make" "quilt" "virtualenv" "pip"; do
|
|
if [ -z "$(which $cmd 2>/dev/null)" ]; then
|
|
echo "Error: '$cmd' is still missing. Install it, please."
|
|
exit 1;
|
|
fi
|
|
done
|
|
}
|
|
|
|
function quilt_setup() {
|
|
quilt setup salt.spec
|
|
cd $1
|
|
quilt push -a
|
|
}
|
|
|
|
function build_docs() {
|
|
cd $1
|
|
make html
|
|
rm _build/html/.buildinfo
|
|
cd _build/html
|
|
chmod -R -x+X *
|
|
cd ..
|
|
tar cvf - html | bzip2 > $2/html.tar.bz2
|
|
}
|
|
|
|
function write_changelog() {
|
|
mv salt.changes salt.changes.previous
|
|
TIME=$(date -u +'%a %b %d %T %Z %Y')
|
|
MAIL=$1
|
|
SEP="-------------------------------------------------------------------"
|
|
cat <<EOF > salt.changes
|
|
$SEP
|
|
$TIME - $MAIL
|
|
|
|
- Updated html.tar.bz2 documentation tarball.
|
|
|
|
EOF
|
|
cat salt.changes.previous >> salt.changes
|
|
rm salt.changes.previous
|
|
}
|
|
|
|
if [ -z "$1" ]; then
|
|
echo "Usage: $0 <your e-mail> [--without-sphinx]"
|
|
exit 1;
|
|
fi
|
|
|
|
check_env $2;
|
|
|
|
START=$(pwd)
|
|
V_ENV="sphinx_doc_gen"
|
|
V_TMP=$(mktemp -d)
|
|
|
|
for f in "salt.spec" "salt*tar.gz"; do
|
|
cp -v $f $V_TMP
|
|
done
|
|
|
|
cd $V_TMP;
|
|
build_virtenv $V_ENV $2;
|
|
|
|
SRC_DIR="salt-$(cat salt.spec | grep ^Version: | cut -d: -f2 | sed -e 's/[[:blank:]]//g')";
|
|
quilt_setup $SRC_DIR
|
|
build_docs doc $V_TMP
|
|
|
|
cd $START
|
|
mv $V_TMP/html.tar.bz2 $START
|
|
rm -rf $V_TMP
|
|
|
|
echo "Done"
|
|
echo "---------------"
|