diff options
author | David Spencer <idlemoor@slackbuilds.org> | 2016-11-17 17:41:26 +0000 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-11-19 07:31:28 +0700 |
commit | 206336c0bcbffbdd89d55453feb6bf29dcb62243 (patch) | |
tree | 09f9a267edbe6cadb5b8dacdaf53bf220b4e7d42 /system/salt/salt.SlackBuild | |
parent | 2d76c763409a2a6bb74a308faca8384ebabdc2e3 (diff) | |
download | slackbuilds-206336c0bcbffbdd89d55453feb6bf29dcb62243.tar.gz |
system/salt: Updated for version 2016.3.4.
Thanks to bjwebb.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'system/salt/salt.SlackBuild')
-rw-r--r-- | system/salt/salt.SlackBuild | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/system/salt/salt.SlackBuild b/system/salt/salt.SlackBuild index b64fd66a36..375a7645ec 100644 --- a/system/salt/salt.SlackBuild +++ b/system/salt/salt.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=salt -VERSION=${VERSION:-2016.3.2} +VERSION=${VERSION:-2016.3.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -74,8 +74,15 @@ python setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mkdir -p $PKG/etc/$PRGNAM +cp -a conf/* $PKG/etc/$PRGNAM + +mkdir -p $PKG/etc/rc.d +cp -a $CWD/rc.* $PKG/etc/rc.d + mv $PKG/usr/share/man $PKG/usr/man rmdir --ignore-fail-on-non-empty $PKG/usr/share +cp -a doc/man/salt.1 $PKG/usr/man/man1/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done @@ -86,6 +93,13 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG + +for i in $( find etc/$PRGNAM -type f ) ; do + mv $i $i.new + echo "config $i.new" >> $PKG/install/doinst.sh +done + /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |