From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E824158013 for ; Fri, 15 Dec 2023 02:33:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B3B82BC01A; Fri, 15 Dec 2023 02:33:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 630EA2BC01A for ; Fri, 15 Dec 2023 02:33:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67F8933D3CF for ; Fri, 15 Dec 2023 02:33:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B641FACA for ; Fri, 15 Dec 2023 02:33:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1702607530.c74e7cf4220c1f0d398f2e60f33b1cf8e83d521a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/irqbalance/files/, sys-apps/irqbalance/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/irqbalance/files/irqbalance-1.9.3-systemd-journal-noise.patch sys-apps/irqbalance/irqbalance-1.9.3-r1.ebuild X-VCS-Directories: sys-apps/irqbalance/files/ sys-apps/irqbalance/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c74e7cf4220c1f0d398f2e60f33b1cf8e83d521a X-VCS-Branch: master Date: Fri, 15 Dec 2023 02:33:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 753f6541-6b68-4ff5-beaa-0f27dd86dec8 X-Archives-Hash: f25b5743dddeb33c8fb6009b389661c6 commit: c74e7cf4220c1f0d398f2e60f33b1cf8e83d521a Author: Sam James gentoo org> AuthorDate: Fri Dec 15 02:31:45 2023 +0000 Commit: Sam James gentoo 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 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 +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 +}