From 1c51df41715a7acc54bafc4abe3d65f33efb0a6e Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 14 Nov 2017 13:24:55 -0500 Subject: [PATCH] update to latest upstream --- .gitignore | 1 + irqbalance-1.0.4-env-file-path.patch | 10 +++++----- irqbalance-1.2.0-aarch64-fix.patch | 13 ------------- irqbalance.spec | 8 ++++---- sources | 1 + 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 irqbalance-1.2.0-aarch64-fix.patch diff --git a/.gitignore b/.gitignore index c92d752..4c5d560 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ irqbalance-0.56.tbz2 /v1.0.9.tar.gz /irqbalance-1.1.0.tar.gz /irqbalance-1.2.0.tar.gz +/irqbalance-1.3.0.tar.gz diff --git a/irqbalance-1.0.4-env-file-path.patch b/irqbalance-1.0.4-env-file-path.patch index 6a24e26..450d755 100644 --- a/irqbalance-1.0.4-env-file-path.patch +++ b/irqbalance-1.0.4-env-file-path.patch @@ -1,8 +1,8 @@ -diff -up irqbalance-1.0.4/misc/irqbalance.service.orig irqbalance-1.0.4/misc/irqbalance.service ---- irqbalance-1.0.4/misc/irqbalance.service.orig 2012-08-29 16:24:42.011844627 +0200 -+++ irqbalance-1.0.4/misc/irqbalance.service 2012-08-29 16:24:59.817845765 +0200 -@@ -3,7 +3,7 @@ Description=irqbalance daemon - After=syslog.target +diff -up ./misc/irqbalance.service.path ./misc/irqbalance.service +--- ./misc/irqbalance.service.path 2017-11-14 13:09:56.011146473 -0500 ++++ ./misc/irqbalance.service 2017-11-14 13:10:13.480075654 -0500 +@@ -4,7 +4,7 @@ After=syslog.target + ConditionVirtualization=!container [Service] -EnvironmentFile=/path/to/irqbalance.env diff --git a/irqbalance-1.2.0-aarch64-fix.patch b/irqbalance-1.2.0-aarch64-fix.patch deleted file mode 100644 index 9545562..0000000 --- a/irqbalance-1.2.0-aarch64-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up irqbalance-1.2.0/procinterrupts.c.orig irqbalance-1.2.0/procinterrupts.c ---- irqbalance-1.2.0/procinterrupts.c.orig 2017-01-13 08:19:20.737858470 +0100 -+++ irqbalance-1.2.0/procinterrupts.c 2017-01-13 08:19:51.297986428 +0100 -@@ -148,6 +148,9 @@ GList* collect_full_irq_list() - char *line = NULL; - size_t size = 0; - char *irq_name, *irq_mod, *savedptr, *last_token, *p; -+#ifdef AARCH64 -+ char *tmp; -+#endif - - file = fopen("/proc/interrupts", "r"); - if (!file) diff --git a/irqbalance.spec b/irqbalance.spec index b1da81f..735b91b 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -1,6 +1,6 @@ Name: irqbalance -Version: 1.2.0 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Epoch: 2 Summary: IRQ balancing daemon @@ -24,7 +24,6 @@ Requires: numactl-libs ExcludeArch: s390 s390x Patch1: irqbalance-1.0.4-env-file-path.patch -Patch2: irqbalance-1.2.0-aarch64-fix.patch %description irqbalance is a daemon that evenly distributes IRQ load across @@ -33,7 +32,6 @@ multiple CPUs for enhanced performance. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build ./autogen.sh @@ -71,6 +69,8 @@ fi /sbin/chkconfig --del irqbalance >/dev/null 2>&1 || : %changelog +* Tue Nov 14 2017 Neil Horman - 2:1.3.0-1 +- Update to latest upstream * Wed Aug 02 2017 Fedora Release Engineering - 2:1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 465e5d6..41b01d0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (irqbalance-1.2.0.tar.gz) = 02510d0d4dc069570b5f98f3b8191384593a6ed9a88c65c87f5a4261f375c291d95c401b01c03ef9d80834925dd124a088f56ac90c5f290815e26337d4f61c1b +SHA512 (irqbalance-1.3.0.tar.gz) = 6328d3e419689192a9dce99ccfd803aaf3ad0e766498e63da1c8c5fbbd7ef669b94fa4102b841fa7aca3729ca595f72c05a0ae4373922fb340b6832648de12c4