From 04e18c0a85934ddcab865fa7cb699ca7725b2e9c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 16 Apr 2014 19:15:30 +0000 Subject: irqbalance: update to 1.0.7. refs #961 --- abs/extra/irqbalance/Makefile.irqbalance | 13 --------- abs/extra/irqbalance/PKGBUILD | 31 +++++++++------------ abs/extra/irqbalance/finish | 15 ----------- abs/extra/irqbalance/irqbalance.conf.d | 6 ----- abs/extra/irqbalance/irqbalance.install | 10 ------- abs/extra/irqbalance/irqbalance.rc.d | 46 -------------------------------- abs/extra/irqbalance/irqbalance.service | 8 ++++++ abs/extra/irqbalance/run | 25 ----------------- 8 files changed, 21 insertions(+), 133 deletions(-) delete mode 100644 abs/extra/irqbalance/Makefile.irqbalance delete mode 100644 abs/extra/irqbalance/finish delete mode 100644 abs/extra/irqbalance/irqbalance.conf.d delete mode 100644 abs/extra/irqbalance/irqbalance.install delete mode 100644 abs/extra/irqbalance/irqbalance.rc.d create mode 100644 abs/extra/irqbalance/irqbalance.service delete mode 100644 abs/extra/irqbalance/run diff --git a/abs/extra/irqbalance/Makefile.irqbalance b/abs/extra/irqbalance/Makefile.irqbalance deleted file mode 100644 index fe08dc0..0000000 --- a/abs/extra/irqbalance/Makefile.irqbalance +++ /dev/null @@ -1,13 +0,0 @@ -CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2 -Wall -W $(shell pkg-config --cflags glib-2.0) -LDFLAGS := $(shell pkg-config --libs glib-2.0) - -OBJS = bitmap.o irqbalance.o cputree.o procinterrupts.o irqlist.o \ - placement.o activate.o network.o powermode.o numa.o classify.o - -all: irqbalance - -irqbalance: $(OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - -clean: - rm -f irqbalance *~ *.o diff --git a/abs/extra/irqbalance/PKGBUILD b/abs/extra/irqbalance/PKGBUILD index 13db8d0..125f2b4 100644 --- a/abs/extra/irqbalance/PKGBUILD +++ b/abs/extra/irqbalance/PKGBUILD @@ -2,33 +2,28 @@ # Contributor: Martin Striz pkgname=irqbalance -pkgver=0.56 -pkgrel=1 +pkgver=1.0.7 +pkgrel=2 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64') -url="http://www.irqbalance.org/" +url="https://github.com/Irqbalance/irqbalance" license=('GPL') -depends=(glib2) +depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) -backup=(etc/conf.d/irqbalance) -source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tbz2 - irqbalance.conf.d - irqbalance.rc.d) -md5sums=('cd0c4d3b2bb84778a04fc594ad83949a' - '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c') +source=(https://github.com/Irqbalance/irqbalance/archive/v${pkgver}.tar.gz + irqbalance.service) +md5sums=('2a7090abab6bba15d632c24f5554e7ae' + 'a97ad17dc7df98b81acb500b27f931e5') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./autogen.sh - ./configure + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { - cd $srcdir/$pkgname-$pkgver - install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance - install -D -m644 irqbalance.1 $pkgdir/usr/share/man/man1/irqbalance.1 - install -D -m644 ../irqbalance.conf.d $pkgdir/etc/conf.d/irqbalance - install -D -m755 ../irqbalance.rc.d $pkgdir/etc/rc.d/irqbalance + cd "$srcdir/$pkgname-$pkgver" + make install DESTDIR="$pkgdir" + install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service } diff --git a/abs/extra/irqbalance/finish b/abs/extra/irqbalance/finish deleted file mode 100644 index ccd9278..0000000 --- a/abs/extra/irqbalance/finish +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` - - stat_runit "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi diff --git a/abs/extra/irqbalance/irqbalance.conf.d b/abs/extra/irqbalance/irqbalance.conf.d deleted file mode 100644 index ef1bdfd..0000000 --- a/abs/extra/irqbalance/irqbalance.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Settings for irqbalance daemon -# - -# one shot mode - set to 1 if you have Pentium 4 with HT -ONESHOT=0 diff --git a/abs/extra/irqbalance/irqbalance.install b/abs/extra/irqbalance/irqbalance.install deleted file mode 100644 index d4e15f1..0000000 --- a/abs/extra/irqbalance/irqbalance.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install () { - add_service.sh irqbalance - -} - -pre_remove () { - remove_service.sh irqbalance - -} - diff --git a/abs/extra/irqbalance/irqbalance.rc.d b/abs/extra/irqbalance/irqbalance.rc.d deleted file mode 100644 index 987c26b..0000000 --- a/abs/extra/irqbalance/irqbalance.rc.d +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="--oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` -case "$1" in - start) - stat_busy "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/irqbalance/irqbalance.service b/abs/extra/irqbalance/irqbalance.service new file mode 100644 index 0000000..c9fced0 --- /dev/null +++ b/abs/extra/irqbalance/irqbalance.service @@ -0,0 +1,8 @@ +[Unit] +Description=CPU Interrupt Request Balancer + +[Service] +ExecStart=/usr/bin/irqbalance --foreground + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/irqbalance/run b/abs/extra/irqbalance/run deleted file mode 100644 index f0d18f7..0000000 --- a/abs/extra/irqbalance/run +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` - - stat_runit "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi -- cgit v0.12