[gentoo-commits] repo/gentoo:master commit in: sys-apps/irqbalance/files/, sys-apps/irqbalance/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/irqbalance/files/, sys-apps/irqbalance/

[Lars Wendler]

commit:     3a3f1112c39d4134a912edfb8a4e94efdbd74a69
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 12:34:14 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 12:34:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3f1112

sys-apps/irqbalance: Fixed USE="-caps" still linking to libcaps

Also revbumped to 1.4.0-r1 with added "tui" USE flag.

Bug: https://bugs.gentoo.org/660782
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../files/irqbalance-1.4.0-configure.patch         | 68 ++++++++++++++++++++++
 sys-apps/irqbalance/irqbalance-1.3.0.ebuild        |  7 ++-
 ...nce-1.4.0.ebuild => irqbalance-1.4.0-r1.ebuild} | 13 +++--
 sys-apps/irqbalance/metadata.xml                   |  1 +
 4 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch b/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
new file mode 100644
index 00000000000..6008e45126c
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
@@ -0,0 +1,68 @@
+From 8ad74cdabac37599d20a985e6a456b1faca92df8 Mon Sep 17 00:00:00 2001
+From: Manuel Mommertz <2kmm@gmx.de>
+Date: Mon, 9 Jul 2018 14:08:35 +0200
+Subject: [PATCH 1/2] configure.ac: Fix --without-caps option
+
+irqbalance links to libcap-ng if it is installed, even when useflag
+caps is disabled. This is an error in the configure-script, which
+checks for the wrong variable to determine if the user used --with/
+--without for libcap-ng.
+
+Downstream bug report: https://bugs.gentoo.org/660782
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f6c60da..19b148a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,7 +65,7 @@ AC_ARG_WITH([libcap-ng],
+   AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
+ 
+ AS_IF(
+-  [test "x$libcap_ng" != "xno"],
++  [test "x$with_libcap_ng" != "xno"],
+   [
+   PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
+     [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
+-- 
+2.18.0
+
+From bc56dbd4eead9ad19ff1d84dc8810123c96503c0 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 9 Jul 2018 14:11:44 +0200
+Subject: [PATCH 2/2] configure.ac: Fix --enable-irqbalance-ui logic
+
+Before this patch --enable-irqbalance-ui disabled compilation/
+installation of the ui because AC_ARG_WITH is used wrong.
+The third arguement to AC_ARG_WITH is _action-if-present_ which means
+that this action gets triggered once the --enable option has been
+submitted to configure on command line no matter if it's enabled or
+disabled.
+See also https://autotools.io/autoconf/arguments.html chapter 3.1
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19b148a..75c234d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,9 +43,9 @@ AM_PROG_CC_C_O
+ AC_ARG_WITH([irqbalance-ui],
+ 	[AC_HELP_STRING([--without-irqbalance-ui],
+ 			[Dont build the irqbalance ui component])],
+-			[with_irqbalanceui=false], [with_irqbalanceui=true])
++			[with_irqbalanceui=$withval], [with_irqbalanceui=yes])
+ 
+-AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xtrue])
++AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xyes])
+ 
+ AC_ARG_WITH([systemd],
+   [ AS_HELP_STRING([--with-systemd],[Add systemd-lib support])]
+-- 
+2.18.0
+

diff --git a/sys-apps/irqbalance/irqbalance-1.3.0.ebuild b/sys-apps/irqbalance/irqbalance-1.3.0.ebuild
index 144745c1bc8..e8685a79161 100644
--- a/sys-apps/irqbalance/irqbalance-1.3.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.3.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-AUTOTOOLS_AUTORECONF=true
 
 inherit autotools systemd linux-info
 
@@ -28,6 +27,10 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-irqbalance )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0-configure.patch"
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~PCI_MSI"
 	linux-info_pkg_setup

diff --git a/sys-apps/irqbalance/irqbalance-1.4.0.ebuild b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
similarity index 88%
rename from sys-apps/irqbalance/irqbalance-1.4.0.ebuild
rename to sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
index a38439a45dc..c3874ddf72d 100644
--- a/sys-apps/irqbalance/irqbalance-1.4.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-AUTOTOOLS_AUTORECONF=true
 
 inherit autotools systemd linux-info
 
@@ -13,13 +12,13 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="caps +numa selinux"
+IUSE="caps +numa selinux tui"
 
 CDEPEND="
 	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode]
 	caps? ( sys-libs/libcap-ng )
 	numa? ( sys-process/numactl )
+	tui? ( sys-libs/ncurses:0=[unicode] )
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -28,6 +27,10 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-irqbalance )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-configure.patch"
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~PCI_MSI"
 	linux-info_pkg_setup
@@ -50,8 +53,8 @@ src_configure() {
 	local myeconfargs=(
 		$(use_with caps libcap-ng)
 		$(use_enable numa)
-		)
-
+		$(use_with tui irqbalance-ui)
+	)
 	econf "${myeconfargs[@]}"
 }
 

diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
index 8aa1af6dd70..d4dedf3afa5 100644
--- a/sys-apps/irqbalance/metadata.xml
+++ b/sys-apps/irqbalance/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="numa">Support balancing IRQs across NUMA nodes</flag>
+	<flag name="tui">Enable build of irqbalance terminal user interface</flag>
 </use>
 <upstream>
 	<remote-id type="google-code">irqbalance</remote-id>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/irqbalance/files/, sys-apps/irqbalance/

[Sam James]

commit:     c74e7cf4220c1f0d398f2e60f33b1cf8e83d521a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 02:31:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 02:32:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74e7cf4

sys-apps/irqbalance: backport fix for systemd journal noise

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../irqbalance-1.9.3-systemd-journal-noise.patch   | 21 ++++++
 sys-apps/irqbalance/irqbalance-1.9.3-r1.ebuild     | 78 ++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/sys-apps/irqbalance/files/irqbalance-1.9.3-systemd-journal-noise.patch b/sys-apps/irqbalance/files/irqbalance-1.9.3-systemd-journal-noise.patch
new file mode 100644
index 000000000000..7cf465f62e7d
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance-1.9.3-systemd-journal-noise.patch
@@ -0,0 +1,21 @@
+https://github.com/Irqbalance/irqbalance/issues/281
+https://github.com/Irqbalance/irqbalance/commit/f3282f4ddc10be44e6c423de6de8db600f748f85
+
+From f3282f4ddc10be44e6c423de6de8db600f748f85 Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman@openssl.org>
+Date: Thu, 30 Nov 2023 16:55:30 -0500
+Subject: [PATCH] filter console only output when using journal mode
+
+Fixes #281
+--- a/irqbalance.h
++++ b/irqbalance.h
+@@ -138,7 +138,8 @@ extern unsigned int log_mask;
+ #ifdef HAVE_LIBSYSTEMD
+ #define log(mask, lvl, fmt, args...) do {					\
+ 	if (journal_logging) {							\
+-		sd_journal_print(lvl, fmt, ##args);				\
++        if (log_mask & mask & TO_SYSLOG) \
++            sd_journal_print(lvl, fmt, ##args);			\
+ 		if (log_mask & mask & TO_CONSOLE)				\
+ 			printf(fmt, ##args);					\
+ 	} else { 								\

diff --git a/sys-apps/irqbalance/irqbalance-1.9.3-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..ddb504106b0a
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.9.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools udev systemd linux-info optfeature
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="caps +numa systemd selinux thermal tui"
+# Hangs
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/glib:2
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+	systemd? ( sys-apps/systemd:= )
+	thermal? ( dev-libs/libnl:3 )
+	tui? ( sys-libs/ncurses:=[unicode(+)] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-systemd-journal-noise.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Follow systemd policies
+	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+	sed \
+		-e 's/ $IRQBALANCE_ARGS//' \
+		-e '/EnvironmentFile/d' \
+		-i misc/irqbalance.service || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		$(use_with systemd)
+		$(use_enable thermal)
+		$(use_with tui irqbalance-ui)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_dounit misc/irqbalance.service
+	udev_dorules misc/90-irqbalance.rules
+}
+
+pkg_postinst() {
+	optfeature "thermal events support (requires USE=thermal)" sys-power/thermald
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/irqbalance/files/, sys-apps/irqbalance/

[Sam James]

commit:     3e1b0adc1eb3618207a8315e90fb53b17d489994
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 04:46:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 04:46:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1b0adc

sys-apps/irqbalance: drop obsolete option from OpenRC conf.d

IRQBALANCE_BANNED_INTERRUPTS was removed upstream. We could implement
it as a shim for upstream's --banirq option but I don't see the point, people
can pass that via the other variable anyway.

Bug: https://github.com/Irqbalance/irqbalance/issues/271
Closes: https://bugs.gentoo.org/917338
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/irqbalance/files/irqbalance.confd-2 | 16 ++++++++++++++++
 sys-apps/irqbalance/irqbalance-1.9.4.ebuild  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/sys-apps/irqbalance/files/irqbalance.confd-2 b/sys-apps/irqbalance/files/irqbalance.confd-2
new file mode 100644
index 000000000000..b55054a11b1d
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance.confd-2
@@ -0,0 +1,16 @@
+# /etc/conf.d/irqbalance: config file for /etc/init.d/irqbalance
+
+# Additional options to pass to irqbalance itself.
+IRQBALANCE_OPTS=""
+
+# These are envvars used by irqbalance itself, so make sure the "export"
+# is retained.  For more info, please see the irqbalance manpage.
+
+# Run irqbalance once and then exit
+#export IRQBALANCE_ONESHOT="0"
+
+# Include debug messages in output
+#export IRQBALANCE_DEBUG="0"
+
+# List of cpus to not include in balancing
+#export IRQBALANCE_BANNED_CPUS=""

diff --git a/sys-apps/irqbalance/irqbalance-1.9.4.ebuild b/sys-apps/irqbalance/irqbalance-1.9.4.ebuild
index a2b48d74b723..0baa39a88aa2 100644
--- a/sys-apps/irqbalance/irqbalance-1.9.4.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.9.4.ebuild
@@ -65,7 +65,7 @@ src_install() {
 	meson_src_install
 
 	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
-	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-2 irqbalance
 	systemd_dounit "${WORKDIR}"/${P}/misc/irqbalance.service
 	udev_dorules "${WORKDIR}"/${P}/misc/90-irqbalance.rules
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/irqbalance/files/, sys-apps/irqbalance/

[Sam James]

commit:     a9c2ee5f7cd89b3bb5c8a409b114ebc21cda0ce7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 12:42:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  3 12:43:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c2ee5f

sys-apps/irqbalance: fix path in init script

Closes: https://bugs.gentoo.org/931133
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/irqbalance/files/irqbalance.init.5        | 22 ++++++++++++++++++++++
 ...nce-1.9.4.ebuild => irqbalance-1.9.4-r1.ebuild} |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/sys-apps/irqbalance/files/irqbalance.init.5 b/sys-apps/irqbalance/files/irqbalance.init.5
new file mode 100644
index 000000000000..511e4fee023a
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance.init.5
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need localmount
+	after bootmisc
+}
+
+command="/usr/bin/irqbalance"
+command_args="${IRQBALANCE_OPTS}"
+
+start_pre() {
+	if grep -q MSI /proc/interrupts 2>/dev/null && \
+	test -z "$(find /sys/devices -type d -name msi_irqs 2>/dev/null)"; then
+		eerror "MSI interrupts found in /proc/interrupts but none found in sysfs."
+		eerror "You need to update your kernel."
+		return 1
+	fi
+
+	checkpath -q -d /run/${SVCNAME}
+}

diff --git a/sys-apps/irqbalance/irqbalance-1.9.4.ebuild b/sys-apps/irqbalance/irqbalance-1.9.4-r1.ebuild
similarity index 96%
rename from sys-apps/irqbalance/irqbalance-1.9.4.ebuild
rename to sys-apps/irqbalance/irqbalance-1.9.4-r1.ebuild
index d15ff251b576..ba4b5355945e 100644
--- a/sys-apps/irqbalance/irqbalance-1.9.4.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.9.4-r1.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newinitd "${FILESDIR}"/irqbalance.init.5 irqbalance
 	newconfd "${FILESDIR}"/irqbalance.confd-2 irqbalance
 	systemd_dounit "${WORKDIR}"/${P}/misc/irqbalance.service
 	udev_dorules "${WORKDIR}"/${P}/misc/90-irqbalance.rules