diff options
| -rw-r--r-- | abs/extra/sysstat/PKGBUILD | 41 | ||||
| -rw-r--r-- | abs/extra/sysstat/lib64-fix.patch | 25 | ||||
| -rw-r--r-- | abs/extra/sysstat/sysstat.service | 11 |
3 files changed, 48 insertions, 29 deletions
diff --git a/abs/extra/sysstat/PKGBUILD b/abs/extra/sysstat/PKGBUILD index 0c7867a..bf22090 100644 --- a/abs/extra/sysstat/PKGBUILD +++ b/abs/extra/sysstat/PKGBUILD @@ -1,43 +1,48 @@ -# $Id: PKGBUILD 77464 2012-10-10 16:04:46Z spupykin $ +# $Id$ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.1.2 +pkgver=11.7.3 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" license=('GPL') depends=('lm_sensors') +makedepends=('systemd') optdepends=('tk: to use isag' 'gnuplot: to use isag') -options=(zipman) +options=('zipman') backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') -source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat - sysstat.service) -md5sums=('c40626b96cc2b4cf303cbcf1efc96eba' - '3ce41ebf7330aba01e70b38658afed1f' - '12ba479c606620193e8b7c6e982d5088') +source=("http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${pkgver}.tar.xz" + 'lib64-fix.patch') +sha512sums=('c752ebba4d25a30147e68d0cb44d93020bb9b44823812c99550f6b34b42fc6f015c28ef0e6609a1e33ae6e4de566ae2d0e8a4711e412a4298baf5721dd15d27f' + '46ec3eebb12232d30cddba60f16a57cd8d625513cf002d9e501797a6660f9da9cb4116ec81d0c292644fb6d91eb05c7be458da667260b238bcfef532a020b114') + +prepare() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + patch -p1 < "${srcdir}"/lib64-fix.patch + autoreconf +} build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/"${pkgname}"-"${pkgver}" conf_dir=/etc/conf.d ./configure --prefix=/usr \ --enable-yesterday \ --mandir=/usr/share/man \ --enable-install-isag \ + --enable-install-cron \ + --enable-copy-only \ --disable-man-group make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat - install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat - install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat - chown -R root:root $pkgdir - install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + mkdir -p "${pkgdir}"/usr/lib/systemd/system + make DESTDIR="${pkgdir}" install + chown -R root:root "${pkgdir}" + rm -rf "${pkgdir}"/etc/rc* } diff --git a/abs/extra/sysstat/lib64-fix.patch b/abs/extra/sysstat/lib64-fix.patch new file mode 100644 index 0000000..10984f7 --- /dev/null +++ b/abs/extra/sysstat/lib64-fix.patch @@ -0,0 +1,25 @@ +diff -wbBur sysstat-11.1.3.org/configure.in sysstat-11.1.3/configure.in +--- sysstat-11.1.3.org/configure.in 2015-02-13 17:05:44.000000000 +0300 ++++ sysstat-11.1.3/configure.in 2015-02-16 13:25:26.201405593 +0300 +@@ -209,21 +209,6 @@ + fi + + SADC_DIR=$AuxPrefix/lib +-if test -d $AuxPrefix/lib64; then +- # Verify that this OS is really 64 bit +- BITS=$(getconf LONG_BIT 2>/dev/null) +- if test $? = 0; then +- if test $BITS = 64; then +- SADC_DIR=$AuxPrefix/lib64 +- fi +- else +- # Fallback: look for lm (long mode) flag to know if CPU is 64 bit +- grep " lm " /proc/cpuinfo >/dev/null 2>&1 +- if test $? = 0; then +- SADC_DIR=$AuxPrefix/lib64 +- fi +- fi +-fi + + AC_MSG_CHECKING(sadc directory) + AC_ARG_VAR([sa_lib_dir],[sadc directory]) diff --git a/abs/extra/sysstat/sysstat.service b/abs/extra/sysstat/sysstat.service deleted file mode 100644 index 2ff2365..0000000 --- a/abs/extra/sysstat/sysstat.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description= Resets System Activity Logs -After=syslog.target - -[Service] -Type=oneshot -ExecStart=/usr/lib/sa/sa1 --boot -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target |