commit: 2efffa45883dedec6e886898a2f54d27ad3876e8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 17:38:30 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> 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 <arthurzam <AT> 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"
