From cf5adc0ace6e30f775a6cd2882274eca2d3cc1fe Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Fri, 28 Jul 2023 16:40:13 +0800 Subject: [PATCH] Use irqbalance-1.9.0-environment-file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tao Liu Signed-off-by: Timothée Ravier --- irqbalance-1.8.0-env-file-path.patch | 13 --------- ...nce-1.9.0-environment-file-sysconfig.patch | 26 +++++++++++++++++ irqbalance.spec | 28 +++++++++---------- 3 files changed, 40 insertions(+), 27 deletions(-) delete mode 100644 irqbalance-1.8.0-env-file-path.patch create mode 100644 irqbalance-1.9.0-environment-file-sysconfig.patch diff --git a/irqbalance-1.8.0-env-file-path.patch b/irqbalance-1.8.0-env-file-path.patch deleted file mode 100644 index 1c9e326..0000000 --- a/irqbalance-1.8.0-env-file-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/misc/irqbalance.service b/misc/irqbalance.service -index 0f79c3e..18c7e9b 100644 ---- a/misc/irqbalance.service -+++ b/misc/irqbalance.service -@@ -7,7 +7,7 @@ ConditionCPUs=>1 - - [Service] - EnvironmentFile=-/usr/lib/irqbalance/defaults.env --EnvironmentFile=-/path/to/irqbalance.env -+EnvironmentFile=-/etc/sysconfig/irqbalance - ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS - ReadOnlyPaths=/ - ReadWritePaths=/proc/irq diff --git a/irqbalance-1.9.0-environment-file-sysconfig.patch b/irqbalance-1.9.0-environment-file-sysconfig.patch new file mode 100644 index 0000000..1cc15e5 --- /dev/null +++ b/irqbalance-1.9.0-environment-file-sysconfig.patch @@ -0,0 +1,26 @@ +From 9d3070150d151bfd5535c3da43313511659d882e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= +Date: Mon, 1 Aug 2022 15:52:24 +0200 +Subject: [PATCH] misc/irqbalance.service: Use sysconfig for EnvironmentFile + +--- + misc/irqbalance.service | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/misc/irqbalance.service b/misc/irqbalance.service +index 0f79c3e..9bc63b6 100644 +--- a/misc/irqbalance.service ++++ b/misc/irqbalance.service +@@ -6,8 +6,7 @@ ConditionVirtualization=!container + ConditionCPUs=>1 + + [Service] +-EnvironmentFile=-/usr/lib/irqbalance/defaults.env +-EnvironmentFile=-/path/to/irqbalance.env ++EnvironmentFile=-/etc/sysconfig/irqbalance + ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS + ReadOnlyPaths=/ + ReadWritePaths=/proc/irq +-- +2.37.1 + diff --git a/irqbalance.spec b/irqbalance.spec index b5afce3..ff7a315 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -21,20 +21,20 @@ Requires: numactl-libs ExcludeArch: s390 s390x -Patch1: irqbalance-1.8.0-env-file-path.patch -Patch2: 0001-optimize-getting-cpu-number.patch -Patch3: 0002-allow-AF_NETLINK-in-the-systemd-service-restrictions.patch -Patch4: 0003-thermal-Fix-the-warning-message.patch -Patch5: 0004-procinterrupts-Fix-IRQ-name-parsing-on-certain-arm64.patch -Patch6: 0005-irqbalance-fix-memory-leak-in-irq-hotplug-path.patch -Patch7: 0006-ui-do-not-force-black-background.patch -Patch8: 0007-thermal-Fix-log-message-for-perf-and-efficiency.patch -Patch9: 0008-fix-CPU-number-condition-in-service-file.patch -Patch10: 0009-Issue-259-select-NL_SKIP-NL_STOP-based-on-error.patch -Patch11: 0010-Revert-Fix-CPU-number-condition-in-service-file.patch -Patch12: 0011-Fix-signedness-of-error-handling.patch -Patch13: 0012-Fix-it-so-we-actually-stop-when-we-hit-an-interrupt-.patch -Patch14: 0013-procinterrupts-fix-initialisation-of-regex_t-struct.patch +Patch1: 0001-optimize-getting-cpu-number.patch +Patch2: 0002-allow-AF_NETLINK-in-the-systemd-service-restrictions.patch +Patch3: 0003-thermal-Fix-the-warning-message.patch +Patch4: 0004-procinterrupts-Fix-IRQ-name-parsing-on-certain-arm64.patch +Patch5: 0005-irqbalance-fix-memory-leak-in-irq-hotplug-path.patch +Patch6: 0006-ui-do-not-force-black-background.patch +Patch7: 0007-thermal-Fix-log-message-for-perf-and-efficiency.patch +Patch8: 0008-fix-CPU-number-condition-in-service-file.patch +Patch9: 0009-Issue-259-select-NL_SKIP-NL_STOP-based-on-error.patch +Patch10: 0010-Revert-Fix-CPU-number-condition-in-service-file.patch +Patch11: 0011-Fix-signedness-of-error-handling.patch +Patch12: 0012-Fix-it-so-we-actually-stop-when-we-hit-an-interrupt-.patch +Patch13: 0013-procinterrupts-fix-initialisation-of-regex_t-struct.patch +Patch14: irqbalance-1.9.0-environment-file-sysconfig.patch Patch15: 0001-activate_mapping-fflush-the-buffered-data-to-smp_aff.patch Patch16: 0002-Revert-activate_mapping-fflush-the-buffered-data-to-.patch Patch17: 0003-activate_mapping-avoid-use-after-free-when-affinity-.patch