From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id B07CE1582EF for ; Fri, 28 Feb 2025 17:56:28 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 916C9343113 for ; Fri, 28 Feb 2025 17:56:28 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B4B9F1102D0; Fri, 28 Feb 2025 17:56:24 +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 bobolink.gentoo.org (Postfix) with ESMTPS id AAB081102D0 for ; Fri, 28 Feb 2025 17:56:24 +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 5703C342FA8 for ; Fri, 28 Feb 2025 17:56:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6604116DF for ; Fri, 28 Feb 2025 17:56:22 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1740765375.2efffa45883dedec6e886898a2f54d27ad3876e8.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus-podman-exporter/files/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: app-metrics/prometheus-podman-exporter/files/prometheus-podman-exporter-1.10.1-gentoo-systemd.patch app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild X-VCS-Directories: app-metrics/prometheus-podman-exporter/ app-metrics/prometheus-podman-exporter/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 2efffa45883dedec6e886898a2f54d27ad3876e8 X-VCS-Branch: master Date: Fri, 28 Feb 2025 17:56:22 +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: 9c7c38ae-6d15-4c3b-a6b8-dcccf2a08788 X-Archives-Hash: 95cbe5dac6a6b3d78f59128447c1697f commit: 2efffa45883dedec6e886898a2f54d27ad3876e8 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 28 17:38:30 2025 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Feb 28 17:56:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2efffa45 app-metrics/prometheus-podman-exporter: move patch from inline to files/ [QA] This was weird solution, with nothing to gain from inline patch in the ebuild. No variable substitution, no conditional, nothing. It was even the same file across versions. Signed-off-by: Arthur Zamarin gentoo.org> ...eus-podman-exporter-1.10.1-gentoo-systemd.patch | 22 +++++++++++++++ .../prometheus-podman-exporter-1.10.1.ebuild | 32 ++-------------------- .../prometheus-podman-exporter-1.11.0.ebuild | 32 ++-------------------- .../prometheus-podman-exporter-1.12.0.ebuild | 32 ++-------------------- .../prometheus-podman-exporter-9999.ebuild | 32 ++-------------------- 5 files changed, 30 insertions(+), 120 deletions(-) diff --git a/app-metrics/prometheus-podman-exporter/files/prometheus-podman-exporter-1.10.1-gentoo-systemd.patch b/app-metrics/prometheus-podman-exporter/files/prometheus-podman-exporter-1.10.1-gentoo-systemd.patch new file mode 100644 index 000000000000..b4006da393a4 --- /dev/null +++ b/app-metrics/prometheus-podman-exporter/files/prometheus-podman-exporter-1.10.1-gentoo-systemd.patch @@ -0,0 +1,22 @@ +--- a/contrib/systemd/system/prometheus-podman-exporter.service ++++ b/contrib/systemd/system/prometheus-podman-exporter.service +@@ -2,7 +2,7 @@ + Description=Prometheus exporter for podman (v4) machine + [Service] + Restart=on-failure +-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter ++EnvironmentFile=-/etc/default/prometheus-podman-exporter + ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS + ExecReload=/bin/kill -HUP $MAINPID + TimeoutStopSec=20s +--- a/contrib/systemd/user/prometheus-podman-exporter.service ++++ b/contrib/systemd/user/prometheus-podman-exporter.service +@@ -2,7 +2,7 @@ + Description=Prometheus exporter for podman (v4) machine + [Service] + Restart=on-failure +-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter ++EnvironmentFile=-/etc/default/prometheus-podman-exporter + EnvironmentFile=-%h/.config/prometheus-podman-exporter + ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS + ExecReload=/bin/kill -HUP $MAINPID diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild index 4452311819fe..990b86c7e0df 100644 --- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild +++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,37 +28,9 @@ IUSE="btrfs systemd" RESTRICT="test" PATCHES=( - "${T}/gentoo-specific-systemd-service.patch" + "${FILESDIR}/${PN}-1.10.1-gentoo-systemd.patch" ) -src_prepare() { - cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch" - --- a/contrib/systemd/system/prometheus-podman-exporter.service - +++ b/contrib/systemd/system/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - TimeoutStopSec=20s - --- a/contrib/systemd/user/prometheus-podman-exporter.service - +++ b/contrib/systemd/user/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - EnvironmentFile=-%h/.config/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - EOF - default -} - src_compile() { export BUILDTAGS="exclude_graphdriver_devicemapper" use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion" diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild index 4452311819fe..990b86c7e0df 100644 --- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild +++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,37 +28,9 @@ IUSE="btrfs systemd" RESTRICT="test" PATCHES=( - "${T}/gentoo-specific-systemd-service.patch" + "${FILESDIR}/${PN}-1.10.1-gentoo-systemd.patch" ) -src_prepare() { - cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch" - --- a/contrib/systemd/system/prometheus-podman-exporter.service - +++ b/contrib/systemd/system/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - TimeoutStopSec=20s - --- a/contrib/systemd/user/prometheus-podman-exporter.service - +++ b/contrib/systemd/user/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - EnvironmentFile=-%h/.config/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - EOF - default -} - src_compile() { export BUILDTAGS="exclude_graphdriver_devicemapper" use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion" diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild index 4452311819fe..990b86c7e0df 100644 --- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild +++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,37 +28,9 @@ IUSE="btrfs systemd" RESTRICT="test" PATCHES=( - "${T}/gentoo-specific-systemd-service.patch" + "${FILESDIR}/${PN}-1.10.1-gentoo-systemd.patch" ) -src_prepare() { - cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch" - --- a/contrib/systemd/system/prometheus-podman-exporter.service - +++ b/contrib/systemd/system/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - TimeoutStopSec=20s - --- a/contrib/systemd/user/prometheus-podman-exporter.service - +++ b/contrib/systemd/user/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - EnvironmentFile=-%h/.config/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - EOF - default -} - src_compile() { export BUILDTAGS="exclude_graphdriver_devicemapper" use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion" diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild index 4452311819fe..990b86c7e0df 100644 --- a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild +++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,37 +28,9 @@ IUSE="btrfs systemd" RESTRICT="test" PATCHES=( - "${T}/gentoo-specific-systemd-service.patch" + "${FILESDIR}/${PN}-1.10.1-gentoo-systemd.patch" ) -src_prepare() { - cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch" - --- a/contrib/systemd/system/prometheus-podman-exporter.service - +++ b/contrib/systemd/system/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - TimeoutStopSec=20s - --- a/contrib/systemd/user/prometheus-podman-exporter.service - +++ b/contrib/systemd/user/prometheus-podman-exporter.service - @@ -2,7 +2,7 @@ - Description=Prometheus exporter for podman (v4) machine - [Service] - Restart=on-failure - -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter - +EnvironmentFile=-/etc/default/prometheus-podman-exporter - EnvironmentFile=-%h/.config/prometheus-podman-exporter - ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS - ExecReload=/bin/kill -HUP $MAINPID - EOF - default -} - src_compile() { export BUILDTAGS="exclude_graphdriver_devicemapper" use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"