diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-07-23 05:38:07 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-07-23 05:46:00 +0700 |
| commit | 0b22050a9385d30a370b13c61affe8bbe6def946 (patch) | |
| tree | 96b402c848dc886ddddc682984c147f22afc9237 | |
| parent | c7daa4ef36d9b97c73287915356b04f575ce9248 (diff) | |
| download | slackbuilds-0b22050a9385d30a370b13c61affe8bbe6def946.tar.gz | |
system/atop: Fix build script.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/atop/atop.SlackBuild | 13 | ||||
| -rw-r--r-- | system/atop/doinst.sh | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild index 3c8ca4356f..ddf0eaf0d0 100644 --- a/system/atop/atop.SlackBuild +++ b/system/atop/atop.SlackBuild @@ -14,12 +14,12 @@ PRGNAM=atop VERSION=${VERSION:-2.2} SRCVER=$(echo ${VERSION}-3) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} 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 @@ -30,8 +30,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" @@ -63,14 +63,15 @@ make CFLAGS="$SLKCFLAGS" # Install the binary sgid utmp in order to allow accounting install -D -o root -g utmp -m 2751 atop $PKG/usr/bin/atop +install -m 0755 atopacctd $PKG/usr/bin/atopacctd install -D -m 0755 atop.init $PKG/etc/rc.d/rc.atop.new -mkdir -p $PKG/etc/{logrotate.d,cron.daily} +mkdir -p $PKG/etc/{logrotate.d,atop} install -m 0644 psaccs_atop $PKG/etc/logrotate.d/psaccs_atop.new install -m 0644 psaccu_atop $PKG/etc/logrotate.d/psaccu_atop.new install -m 0644 $CWD/psacct.logrotate $PKG/etc/logrotate.d/psacct.new -install -m 0755 atop.daily $PKG/etc/cron.daily/atop.new +install -m 0755 atop.daily $PKG/etc/atop/atop.daily mkdir -p $PKG/var/log/atop touch $PKG/var/log/atop/dummy_{before,after} diff --git a/system/atop/doinst.sh b/system/atop/doinst.sh index 134b712414..d634387854 100644 --- a/system/atop/doinst.sh +++ b/system/atop/doinst.sh @@ -19,7 +19,6 @@ if [ -e etc/rc.d/rc.atop ]; then fi config etc/rc.d/rc.atop.new -config etc/cron.daily/atop.new config etc/logrotate.d/psacct.new config etc/logrotate.d/psaccs_atop.new config etc/logrotate.d/psaccu_atop.new |