#934946 irqbalance: cleanup debian/rules for downstream distros

Package:
irqbalance
Source:
irqbalance
Description:
Daemon to balance interrupts for SMP systems
Submitter:
Dmitry Bogatov
Date:
2022-07-04 20:18:07 UTC
Severity:
wishlist
Tags:
#934946#5
Date:
2019-08-17 02:48:55 UTC
From:
To:
Package: irqbalance
Version: 1.5.0-4
Severity: wishlist
Tags: patch

From 20847346b88d621a2c4e86c07ed929ce0496b460 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@debian.org>
Date: Fri, 16 Aug 2019 10:08:08 +0000
Subject: [PATCH] Move code to link with libsystemd into separate file

This change makes `debian/rules' simplier and cleaner, and
makes live of downstream distributions easier.
---
 debian/config/systemd.mk | 3 +++
 debian/rules             | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 debian/config/systemd.mk

diff --git a/debian/config/systemd.mk b/debian/config/systemd.mk
new file mode 100644
index 0000000..d291743
--- /dev/null
+++ b/debian/config/systemd.mk
@@ -0,0 +1,3 @@
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	confflags += --with-systemd
+endif
diff --git a/debian/rules b/debian/rules
index 37a1513..d5c3a2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+include debian/config/systemd.mk

 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

@@ -11,11 +12,7 @@ TMP     = $(CURDIR)/debian/$(PACKAGE)
 	dh $@ --with autoreconf,runit

 override_dh_auto_configure:
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-	dh_auto_configure -- --with-systemd
-else
-	dh_auto_configure
-endif
+	dh_auto_configure -- $(confflags)

 override_dh_install:
 	dh_install

#934946#10
Date:
2019-08-19 08:57:28 UTC
From:
To:
Dmitry Bogatov wrote on 17/08/2019:

I am fine with merging your patch, but I'd like to better understand how
it eases downstream distributions. Is it that distributions wanting a
different set of confflags only need to add a file in d/config and an
include line to d/rules, which is very little invasive? Or is there
anything else? What's the practical case you have in mind?

Thanks!

Paride

#934946#15
Date:
2019-08-20 16:04:37 UTC
From:
To:
[2019-08-19 10:57] Paride Legovini <pl@ninthfloor.org>

Yes, this. The point is to reduce probablities of git-merge conflicts.
And if they occur, resolving merge conflict in hunk of 'include's is
much simplier than is hunk, containing non-trivial code.

I also considered using

	include debian/config/*.mk

but decided against it, because it is likely to cause delete/modify
conflicts.

#934946#18
Date:
2019-12-12 13:24:56 UTC
From:
To:
Hello,

Bug #934946 in irqbalance reported by you has been fixed in the
Git repository and is awaiting an upload. You can see the commit
message below and you can check the diff of the fix at:

https://salsa.debian.org/debian/irqbalance/commit/75d2ea771fa8f16d97ee90849725c41814fc6ff9
------------------------------------------------------------------------
cleanup debian/rules for downstream distros

Closes: #934946
Thanks: Dmitry Bogatov
------------------------------------------------------------------------

(this message was generated automatically)
-- 
Greetings

https://bugs.debian.org/934946

#934946#25
Date:
2022-07-04 20:15:40 UTC
From:
To: