From 6ee72f31388697d1adeaf74da00713f81a170338d16623f8baf89d6e40b1a832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 16 Aug 2011 17:08:20 +0000 Subject: [PATCH] Accepting request 79033 from home:saschpe:branches:Base:System - Run spec-cleaner on spec file - Don't start irqbalance by default, testing confirmed that it does not make any difference on machines with less than 32 cores nowadays (GKH's comment) OBS-URL: https://build.opensuse.org/request/show/79033 OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=10 --- irq_balancer | 2 +- irqbalance.changes | 8 ++++++ irqbalance.spec | 68 +++++++++++++++++++--------------------------- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/irq_balancer b/irq_balancer index 96f699e..707b964 100644 --- a/irq_balancer +++ b/irq_balancer @@ -10,7 +10,7 @@ # Provides: irqbalance # Required-Start: $remote_fs # Should-Start: -# Required-Stop: $remote_fs +# Required-Stop: $remote_fs # Should-Stop: # Default-Start: 1 2 3 5 # Default-Stop: 0 6 diff --git a/irqbalance.changes b/irqbalance.changes index f9d8948..17f01c6 100644 --- a/irqbalance.changes +++ b/irqbalance.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 16 08:40:22 UTC 2011 - saschpe@suse.de + +- Run spec-cleaner on spec file +- Don't start irqbalance by default, testing confirmed that it does + not make any difference on machines with less than 32 cores + nowadays (GKH's comment) + ------------------------------------------------------------------- Tue Jun 7 14:13:36 UTC 2011 - aj@suse.de diff --git a/irqbalance.spec b/irqbalance.spec index ed67a2b..48a0b19 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -15,43 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: irqbalance -License: GPLv2+ -Group: System/Daemons -AutoReqProv: on -PreReq: %insserv_prereq Version: 0.56_svn201010021305 -Release: 7 +Release: 0 +License: GPLv2+ Summary: Balance IRQs on SMP Machines +Url: http://www.irqbalance.org +Group: System/Daemons Source: %{name}-%{version}.tar.bz2 Source1: irqbalance.pod Source2: irq_balancer Source3: sysconfig.irqbalance Source4: irqbalance.service -Url: http://www.irqbalance.org -PreReq: coreutils fillup -BuildRoot: %{_tmppath}/%{name}-%{version}-build # xorg-x11-util-devel is for gccmakedep -BuildRequires: glib2-devel -%if 0%{suse_version} >= 1130 +BuildRequires: pkgconfig(glib-2.0) +PreReq: coreutils +PreReq: fillup +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1130 BuildRequires: libcap-ng-devel -%endif +%endif +# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: irqbalance-fix-Makefile +# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: irqbalance-0.55-as-needed.patch %description irqbalance dynamically switches the CPUs for IRQs to prevent cpu0 from being used for all IRQs. - - -Authors: --------- - Arjan van de Ven - %prep %setup -q %patch0 -p1 @@ -60,35 +52,31 @@ Authors: %build ./autogen.sh %configure -make LDFLAGS="-Wl,-z,relro,-z,now" CFLAGS="$RPM_OPT_FLAGS -fPIE -pie" +make LDFLAGS="-Wl,-z,relro,-z,now" CFLAGS="%{optflags} -fPIE -pie" cp %{SOURCE1} . cp %{SOURCE3} . pod2man --release=0.5.5 --center=irqbalance irqbalance.pod irqbalance.1 gzip irqbalance.1 %install -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -mkdir -p $RPM_BUILD_ROOT/etc/init.d -install -m 0755 irqbalance $RPM_BUILD_ROOT/%{_sbindir} -install -m 0755 $RPM_SOURCE_DIR/irq_balancer $RPM_BUILD_ROOT/etc/init.d -ln -s /etc/init.d/irq_balancer $RPM_BUILD_ROOT/%{_sbindir}/rcirq_balancer -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -install -m 0644 irqbalance.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1 -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/ -install -m 0644 sysconfig.irqbalance $RPM_BUILD_ROOT/var/adm/fillup-templates/ -mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/ -install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/ +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/ +mkdir -p %{buildroot}/lib/systemd/system/ +install -D -p -m 0644 %{SOURCE4} %{buildroot}/lib/systemd/system/ -%clean -rm -rf $RPM_BUILD_ROOT +%post +%fillup_only %preun %stop_on_removal irq_balancer -%post -%insserv_force_if_yast irq_balancer -%{fillup_only} - %postun %restart_on_update irq_balancer %insserv_cleanup @@ -96,10 +84,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_sbindir}/irqbalance -/etc/init.d/irq_balancer +%{_sysconfdir}/init.d/irq_balancer /lib/systemd/system/irqbalance.service %{_sbindir}/rcirq_balancer %{_mandir}/man1/irqbalance.1.gz -/var/adm/fillup-templates/sysconfig.irqbalance +%{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance %changelog