Sat May 18 02:12:59 PDT 2013

4 files changed, 4 insertions, 63 deletions

diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index ca20cdcb3..3d242f810 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -3,33 +3,26 @@
 
 pkgname=irqbalance
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="IRQ balancing daemon for SMP systems"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/irqbalance"
 license=('GPL')
 depends=(glib2 numactl libcap-ng)
 makedepends=(pkgconfig)
-backup=(etc/conf.d/irqbalance)
 source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
-        irqbalance.conf.d
-        irqbalance.rc.d
         irqbalance.service)
 md5sums=('b6403fa067c96adce448a48c9993654d'
-         '336c1ee99818f9ecda1687e34c69fd6b'
-         'fb82fc5d267d39110baf720d81282a7c'
-         '9e82dc471128117982a8dd0c4bd5f246')
+         'a97ad17dc7df98b81acb500b27f931e5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make install DESTDIR="$pkgdir"
-  install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance
-  install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance
   install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service
 }
diff --git a/extra/irqbalance/irqbalance.conf.d b/extra/irqbalance/irqbalance.conf.d
deleted file mode 100644
index ef1bdfd75..000000000
--- a/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/extra/irqbalance/irqbalance.rc.d b/extra/irqbalance/irqbalance.rc.d
deleted file mode 100644
index 987c26b51..000000000
--- a/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/extra/irqbalance/irqbalance.service b/extra/irqbalance/irqbalance.service
index 372ac0aa4..c9fced094 100644
--- a/extra/irqbalance/irqbalance.service
+++ b/extra/irqbalance/irqbalance.service
@@ -2,7 +2,7 @@
 Description=CPU Interrupt Request Balancer
 
 [Service]
-ExecStart=/usr/sbin/irqbalance --foreground
+ExecStart=/usr/bin/irqbalance --foreground
 
 [Install]
 WantedBy=multi-user.target