From ddfcd296311cd1a56d5bffe314e6f9911a6be7fc491f0e2bf963360e779c8282 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 17 Mar 2015 15:27:20 +0000 Subject: [PATCH] Accepting request 291095 from home:pluskalm:branches:Base:System - Clenup spec file with spec-cleaner - Remove bug-893478_warn-once.patch - Update to 1.0.9 * PCI quirk support * System Logging compatibility * isolcpus inheritance * Misc. Bugfixes OBS-URL: https://build.opensuse.org/request/show/291095 OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=47 --- bug-893478_warn-once.patch | 44 -------------------------------------- irqbalance.changes | 11 ++++++++++ irqbalance.spec | 18 +++++++--------- v1.0.8.tar.gz | 3 --- v1.0.9.tar.gz | 3 +++ 5 files changed, 22 insertions(+), 57 deletions(-) delete mode 100644 bug-893478_warn-once.patch delete mode 100644 v1.0.8.tar.gz create mode 100644 v1.0.9.tar.gz diff --git a/bug-893478_warn-once.patch b/bug-893478_warn-once.patch deleted file mode 100644 index 37dcd55..0000000 --- a/bug-893478_warn-once.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Takashi Iwai -Only warn once for affinity hint subset empty irqs - -bnc#893478 - -Signed-off-by: Thomas Renninger ---- - activate.c | 13 ++++++++----- - types.h | 1 + - 2 files changed, 9 insertions(+), 5 deletions(-) - ---- a/activate.c -+++ b/activate.c -@@ -84,11 +84,14 @@ static void activate_mapping(struct irq_info *info, void *data __attribute__((un - if ((info->hint_policy == HINT_POLICY_SUBSET) && - (!cpus_empty(info->affinity_hint))) { - cpus_and(applied_mask, applied_mask, info->affinity_hint); -- if (!cpus_intersects(applied_mask, unbanned_cpus)) -- log(TO_ALL, LOG_WARNING, -- "irq %d affinity_hint subset empty\n", -- info->irq); -- else -+ if (!cpus_intersects(applied_mask, unbanned_cpus)) { -+ if (!info->warned) { -+ info->warned = 1; -+ log(TO_ALL, LOG_WARNING, -+ "irq %d affinity_hint subset empty\n", -+ info->irq); -+ } -+ } else - valid_mask = 1; - } else { - valid_mask = 1; - ---- a/types.h -+++ b/types.h -@@ -69,6 +69,7 @@ struct irq_info { - uint64_t load; - int moved; - struct topo_obj *assigned_obj; -+ unsigned int warned; - }; - - #endif diff --git a/irqbalance.changes b/irqbalance.changes index 03d7566..95fa335 100644 --- a/irqbalance.changes +++ b/irqbalance.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 16 20:21:29 UTC 2015 - mpluskal@suse.com + +- Clenup spec file with spec-cleaner +- Remove bug-893478_warn-once.patch +- Update to 1.0.9 + * PCI quirk support + * System Logging compatibility + * isolcpus inheritance + * Misc. Bugfixes + ------------------------------------------------------------------- Fri Jan 23 10:36:21 UTC 2015 - p.drouand@gmail.com diff --git a/irqbalance.spec b/irqbalance.spec index 91ed1f4..93c8b7e 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -1,7 +1,7 @@ # # spec file for package irqbalance # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: irqbalance -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: Balance IRQs on SMP Machines License: GPL-2.0+ @@ -25,15 +25,14 @@ Group: System/Daemons Url: https://github.com/Irqbalance/irqbalance Source: https://github.com/Irqbalance/irqbalance/archive/v%{version}.tar.gz Source3: sysconfig.irqbalance -Patch0: bug-893478_warn-once.patch +BuildRequires: libcap-ng-devel BuildRequires: libnuma-devel BuildRequires: libtool +BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(glib-2.0) Requires(pre): coreutils Requires(pre): fillup -ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %sparc -BuildRequires: libcap-ng-devel -BuildRequires: systemd +ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %{sparc} %{?systemd_requires} %description @@ -42,12 +41,11 @@ being used for all IRQs. %prep %setup -q -%patch0 -p1 %build NOCONFIGURE=1 ./autogen.sh %configure -make LDFLAGS="-Wl,-z,relro,-z,now" CFLAGS="%{optflags} -fPIE -pie" +make %{?_smp_mflags} LDFLAGS="-Wl,-z,relro,-z,now" CFLAGS="%{optflags} -fPIE -pie" cp %{SOURCE3} . gzip irqbalance.1 @@ -58,11 +56,11 @@ 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/ -sed -ie "s|EnvironmentFile=.*|EnvironmentFile=/etc/sysconfig/irqbalance|g" misc/irqbalance.service +sed -ie "s|EnvironmentFile=.*|EnvironmentFile=%{_sysconfdir}/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 -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcirqbalance +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcirqbalance %pre %service_add_pre irqbalance.service diff --git a/v1.0.8.tar.gz b/v1.0.8.tar.gz deleted file mode 100644 index 43b2c2c..0000000 --- a/v1.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9329941b9d6b9edcba045534dbe33a1b681fa8339c94e08d9fd8aad52a7e0d65 -size 41946 diff --git a/v1.0.9.tar.gz b/v1.0.9.tar.gz new file mode 100644 index 0000000..da9503f --- /dev/null +++ b/v1.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1b8115948bb9f0bc36b9d7143ee8be751a294bc189d311408e753acc37169c3 +size 44661