From 21eedcb922cd1c570166f3f5dfeb4558deb8968382ddf485f6258d5fb9201ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 22 Oct 2013 00:01:38 +0000 Subject: [PATCH 1/5] Accepting request 204044 from home:posophe:branches:Base:System Some improvements OBS-URL: https://build.opensuse.org/request/show/204044 OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=31 --- irq_balancer | 129 --------------------------------------- irqbalance-1.0.4.tar.bz2 | 3 - irqbalance-1.0.7.tar.bz2 | 3 + irqbalance.changes | 10 +++ irqbalance.spec | 31 ++-------- 5 files changed, 17 insertions(+), 159 deletions(-) delete mode 100644 irq_balancer delete mode 100644 irqbalance-1.0.4.tar.bz2 create mode 100644 irqbalance-1.0.7.tar.bz2 diff --git a/irq_balancer b/irq_balancer deleted file mode 100644 index 707b964..0000000 --- a/irq_balancer +++ /dev/null @@ -1,129 +0,0 @@ -#! /bin/sh -# Copyright (c) 1995-2002 SuSE Linux AG, Nuernberg, Germany. -# All rights reserved. -# -# /etc/init.d/irqbalance -# and its symbolic link -# /(usr/)sbin/rcirqbalance -# -### BEGIN INIT INFO -# Provides: irqbalance -# Required-Start: $remote_fs -# Should-Start: -# Required-Stop: $remote_fs -# Should-Stop: -# Default-Start: 1 2 3 5 -# Default-Stop: 0 6 -# Short-Description: irqbalance daemon providing irq balancing on MP-machines -# Description: Start irqbalance to allow interrrupt balancing over multiple CPUs -# usually all irqs are handled by cpu0, this daemon dynamcally -# uses all cpus for the irqs -# -# -# -### END INIT INFO - -# Check for missing binaries (stale symlinks should not happen) -IRQBALANCE_BIN=/usr/sbin/irqbalance -test -x $IRQBALANCE_BIN || exit 5 -PROC=$(grep -c '^processor' /proc/cpuinfo) - -# -# Checks if the irq balancer should be started at all on that system. -# Returns 0 if the balancer should be started, 1 otherwise. -should_start_irqbalance() -{ - # don't start on 1 core systems - # still check the number of processors here althought the irq - # balancer terminates automatically if number_cpus == 0 - # simply to provide a better user output ('unused' vs. 'done') - if [ $PROC -le 1 ] ; then - return 1 - fi - - # don't start on IA64 SGI SN2 systems (bnc#441505) - if [ "$(uname -m)" = ia64 ] && [ -f /proc/sgi_sn/system_serial_number ] ; then - logger -t irq_balancer "Not starting irqbalance because we're running on a SGI SN2 system" - return 1 - fi - - # start on any other case - return 0 -} - - -. /etc/rc.status -. /etc/sysconfig/irqbalance - -if [ -n "$IRQBALANCE_BANNED_CPUS" ] ; then - export IRQBALANCE_BANNED_CPUS -fi - -if [ "$IRQBALANCE_ONESHOT" != "auto" ] ; then - export IRQBALANCE_ONESHOT -fi - -if [ -n "$IRQBALANCE_BANNED_INTERRUPTS" ] ; then - export IRQBALANCE_BANNED_INTERRUPTS -fi - -# Reset status of this service -rc_reset - -case "$1" in - start) - echo -n "Starting irqbalance " - - if should_start_irqbalance ; then - startproc $IRQBALANCE_BIN - # Remember status and be verbose - rc_status -v - else - # unused - rc_status -u - fi - ;; - stop) - echo -n "Shutting down irqbalance " - killproc -TERM $IRQBALANCE_BIN - - # Remember status and be verbose - rc_status -v - ;; - try-restart) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; - restart) - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - force-reload|reload) - echo -n "Reload service irqbalance " - if [ $PHYS -gt 1 ] || [ $PROC -gt 1 -a $PHYS -eq 0 ] ; then - ## if it supports it: - killproc -HUP $IRQBALANCE_BIN - #touch /var/run/irqbalance.pid - rc_status -v - else - rc_status -u - fi - ;; - status) - echo -n "Checking for service irqbalance " - checkproc $IRQBALANCE_BIN - rc_status -v - ;; - probe) - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -esac -rc_exit diff --git a/irqbalance-1.0.4.tar.bz2 b/irqbalance-1.0.4.tar.bz2 deleted file mode 100644 index 39cc7f2..0000000 --- a/irqbalance-1.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15725edf4a6f20258620cbd05ebf02d0c25aadd5ffa4871ef8507c9215021c43 -size 286985 diff --git a/irqbalance-1.0.7.tar.bz2 b/irqbalance-1.0.7.tar.bz2 new file mode 100644 index 0000000..9e39707 --- /dev/null +++ b/irqbalance-1.0.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fed1bb405654be8eda40961667bbe75033667600d828b34419c25a1282e81127 +size 292154 diff --git a/irqbalance.changes b/irqbalance.changes index 01302f4..e87a8a2 100644 --- a/irqbalance.changes +++ b/irqbalance.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Oct 20 16:21:41 UTC 2013 - p.drouand@gmail.com + +- Update to version 1.0.7 + + No changelog available +- Drop sysvinit support as no target systems use it anymore +- Remove syslog.target in irqbalance.service + Please see http://lists.opensuse.org/archive/opensuse-packaging/2013-05/msg00102.html +- Change Group for valid one + ------------------------------------------------------------------- Thu Mar 28 10:12:53 UTC 2013 - mmeister@suse.com diff --git a/irqbalance.spec b/irqbalance.spec index e6bb918..1821432 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -17,30 +17,25 @@ Name: irqbalance -Version: 1.0.4 +Version: 1.0.7 Release: 0 Summary: Balance IRQs on SMP Machines License: GPL-2.0+ -Group: System/Daemons +Group: System/Environment/Daemons Url: http://code.google.com/p/irqbalance Source: http://irqbalance.googlecode.com/files/%{name}-%{version}.tar.bz2 -Source2: irq_balancer Source3: sysconfig.irqbalance BuildRequires: libnuma-devel BuildRequires: libtool BuildRequires: pkgconfig(glib-2.0) Requires(pre): coreutils Requires(pre): fillup -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 x86_64 ppc64 ppc %sparc %if 0%{?suse_version} >= 1130 BuildRequires: libcap-ng-devel %endif -%if 0%{?suse_version} > 1140 BuildRequires: systemd %{?systemd_requires} -%define has_systemd 1 -%endif %description irqbalance dynamically switches the CPUs for IRQs to prevent cpu0 from @@ -58,51 +53,33 @@ gzip irqbalance.1 %install mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_sysconfdir}/init.d install -m 0755 irqbalance %{buildroot}%{_sbindir} -install -m 0755 $RPM_SOURCE_DIR/irq_balancer %{buildroot}%{_sysconfdir}/init.d -ln -s /etc/init.d/irq_balancer %{buildroot}%{_sbindir}/rcirq_balancer mkdir -p %{buildroot}%{_mandir}/man1 install -m 0644 irqbalance.1.gz %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/ install -m 0644 sysconfig.irqbalance %{buildroot}%{_localstatedir}/adm/fillup-templates/ -%if 0%{?has_systemd} sed -ie "s|EnvironmentFile=.*|EnvironmentFile=/etc/sysconfig/irqbalance|g" misc/irqbalance.service +# Remove syslog.target in systemd service file; not provided by systemd anymore +sed -ie "s|After=syslog.target||g" misc/irqbalance.service install -D -m 0644 misc/irqbalance.service %{buildroot}%{_unitdir}/irqbalance.service -%endif %pre -%if 0%{?has_systemd} %service_add_pre irqbalance.service -%endif %post %fillup_only -%if 0%{?has_systemd} %service_add_post irqbalance.service -%endif %preun -%stop_on_removal irq_balancer -%if 0%{?has_systemd} %service_del_preun irqbalance.service -%endif %postun -%restart_on_update irq_balancer -%insserv_cleanup -%if 0%{?has_systemd} %service_del_postun irqbalance.service -%endif %files %defattr(-,root,root,-) %{_sbindir}/irqbalance -%{_sysconfdir}/init.d/irq_balancer -%if 0%{?has_systemd} %{_unitdir}/irqbalance.service -%endif -%{_sbindir}/rcirq_balancer %{_mandir}/man1/irqbalance.1.gz %{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance From 70febd23f985507ab9720c493500e7043ca604c895ef6ff96f8056d66f228cde Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 12 Dec 2013 12:32:59 +0000 Subject: [PATCH 2/5] Accepting request 210558 from openSUSE:Factory:PowerLE - enable ppc64le OBS-URL: https://build.opensuse.org/request/show/210558 OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=32 --- irqbalance.changes | 5 +++++ irqbalance.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/irqbalance.changes b/irqbalance.changes index e87a8a2..8048dee 100644 --- a/irqbalance.changes +++ b/irqbalance.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 11 13:50:43 UTC 2013 - dvaleev@suse.com + +- enable ppc64le + ------------------------------------------------------------------- Sun Oct 20 16:21:41 UTC 2013 - p.drouand@gmail.com diff --git a/irqbalance.spec b/irqbalance.spec index 1821432..d4c3263 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -30,7 +30,7 @@ BuildRequires: libtool BuildRequires: pkgconfig(glib-2.0) Requires(pre): coreutils Requires(pre): fillup -ExclusiveArch: ia64 x86_64 ppc64 ppc %sparc +ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %sparc %if 0%{?suse_version} >= 1130 BuildRequires: libcap-ng-devel %endif From c7fc77eb2c3344f103258de4e42964f47bc64cb593b72bf4005f34a1ab1f7319 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 13 Dec 2013 21:57:09 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=33 --- irqbalance.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/irqbalance.spec b/irqbalance.spec index d4c3263..1a514bc 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -62,6 +62,7 @@ sed -ie "s|EnvironmentFile=.*|EnvironmentFile=/etc/sysconfig/irqbalance|g" misc/ # Remove syslog.target in systemd service file; not provided by systemd anymore sed -ie "s|After=syslog.target||g" misc/irqbalance.service install -D -m 0644 misc/irqbalance.service %{buildroot}%{_unitdir}/irqbalance.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcirq_balancer %pre %service_add_pre irqbalance.service @@ -79,6 +80,7 @@ install -D -m 0644 misc/irqbalance.service %{buildroot}%{_unitdir}/irqbalance.se %files %defattr(-,root,root,-) %{_sbindir}/irqbalance +%{_sbindir}/rcirq_balancer %{_unitdir}/irqbalance.service %{_mandir}/man1/irqbalance.1.gz %{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance From b516192ae73b43ef0499d5f5137d8ae03e23b1aa3e5c16358739a2a885362633 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 13 Dec 2013 21:57:29 +0000 Subject: [PATCH 4/5] - Keep rcirq_balancer, make it symlink to /sbin/service OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=34 --- irqbalance.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/irqbalance.changes b/irqbalance.changes index 8048dee..67d3f53 100644 --- a/irqbalance.changes +++ b/irqbalance.changes @@ -9,6 +9,7 @@ Sun Oct 20 16:21:41 UTC 2013 - p.drouand@gmail.com - Update to version 1.0.7 + No changelog available - Drop sysvinit support as no target systems use it anymore +- Keep rcirq_balancer, make it symlink to /sbin/service - Remove syslog.target in irqbalance.service Please see http://lists.opensuse.org/archive/opensuse-packaging/2013-05/msg00102.html - Change Group for valid one From 529777fe83ef3ce22ef3b1bca591a5a3277e585501df1e270e85f5e9ff747ed8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 13 Dec 2013 21:58:11 +0000 Subject: [PATCH 5/5] - Keep rcirq_balancer, make it symlink to /usr/sbin/service OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=35 --- irqbalance.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irqbalance.changes b/irqbalance.changes index 67d3f53..7cacc75 100644 --- a/irqbalance.changes +++ b/irqbalance.changes @@ -9,7 +9,7 @@ Sun Oct 20 16:21:41 UTC 2013 - p.drouand@gmail.com - Update to version 1.0.7 + No changelog available - Drop sysvinit support as no target systems use it anymore -- Keep rcirq_balancer, make it symlink to /sbin/service +- Keep rcirq_balancer, make it symlink to /usr/sbin/service - Remove syslog.target in irqbalance.service Please see http://lists.opensuse.org/archive/opensuse-packaging/2013-05/msg00102.html - Change Group for valid one