diff options
| author | B. Watson <yalhcru@gmail.com> | 2017-03-21 14:07:57 -0400 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2017-03-25 13:29:04 +0000 |
| commit | 6c0a1a7d2a4b40ab9f6efaa3c7f1f4789ef30e35 (patch) | |
| tree | ae65d619a3f7ca88e578c0d5cef803099612a4fb | |
| parent | 417c85ad3c54228fdb6009f1fef7663469c47bd8 (diff) | |
system/set_rlimits: Allow VERSION override, i486=>i586.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | system/set_rlimits/set_rlimits.SlackBuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/system/set_rlimits/set_rlimits.SlackBuild b/system/set_rlimits/set_rlimits.SlackBuild index e6f9ead42304e..9eca567c64783 100644 --- a/system/set_rlimits/set_rlimits.SlackBuild +++ b/system/set_rlimits/set_rlimits.SlackBuild @@ -5,14 +5,14 @@ # Modified by the SlackBuilds Project -PKGNAME=set_rlimits -VERSION=1.3.0 +PRGNAM=set_rlimits +VERSION=${VERSION:-1.3.0} 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 @@ -20,11 +20,11 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PKGNAME +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" @@ -42,9 +42,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PKGNAME-$VERSION -tar xvf $CWD/$PKGNAME-$VERSION.tgz -cd $PKGNAME-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tgz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,13 +68,13 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find . -type f -exec gzip -9 {} \; for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION -cp -a AUTHORS COPYING Changelog README $PKG/usr/doc/$PKGNAME-$VERSION -cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING Changelog README $PKG/usr/doc/$PRGNAM-$VERSION +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 -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |