commit: 060a1fcbcc3b23bdc42f4b28c0fd99cd144171a4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 18:13:04 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 18:14:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060a1fcb
app-containers/podman: 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>
.../podman/files/podman-5.2.5-togglable-seccomp.patch | 10 ++++++++++
app-containers/podman/podman-5.2.5.ebuild | 15 +--------------
app-containers/podman/podman-5.3.0.ebuild | 15 +--------------
app-containers/podman/podman-5.3.2.ebuild | 15 +--------------
app-containers/podman/podman-9999.ebuild | 15 +--------------
5 files changed, 14 insertions(+), 56 deletions(-)
diff --git a/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch
b/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch
new file mode 100644
index 000000000000..dcfe44956865
--- /dev/null
+++ b/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,6 @@ BUILDTAGS ?= \
+ $(shell hack/systemd_tag.sh) \
+ $(shell hack/libsubid_tag.sh) \
+ exclude_graphdriver_devicemapper \
+- seccomp
+ # allow downstreams to easily add build tags while keeping our defaults
+ BUILDTAGS += ${EXTRA_BUILDTAGS}
+ # N/B: This value is managed by Renovate, manual changes are
diff --git a/app-containers/podman/podman-5.2.5.ebuild
b/app-containers/podman/podman-5.2.5.ebuild
index 91caafc19598..091242e4a4b7 100644
--- a/app-containers/podman/podman-5.2.5.ebuild
+++ b/app-containers/podman/podman-5.2.5.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${T}"/togglable-seccomp.patch
+ "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch
)
CONFIG_CHECK="
@@ -65,19 +65,6 @@ pkg_setup() {
}
src_prepare() {
- cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,6 @@ BUILDTAGS ?= \
- $(shell hack/systemd_tag.sh) \
- $(shell hack/libsubid_tag.sh) \
- exclude_graphdriver_devicemapper \
-- seccomp
- # allow downstreams to easily add build tags while keeping our defaults
- BUILDTAGS += ${EXTRA_BUILDTAGS}
- # N/B: This value is managed by Renovate, manual changes are
-EOF
-
default
# assure necessary files are present
diff --git a/app-containers/podman/podman-5.3.0.ebuild
b/app-containers/podman/podman-5.3.0.ebuild
index 365a368d763d..0d75458d62d6 100644
--- a/app-containers/podman/podman-5.3.0.ebuild
+++ b/app-containers/podman/podman-5.3.0.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${T}"/togglable-seccomp.patch
+ "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch
)
CONFIG_CHECK="
@@ -65,19 +65,6 @@ pkg_setup() {
}
src_prepare() {
- cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,6 @@ BUILDTAGS ?= \
- $(shell hack/systemd_tag.sh) \
- $(shell hack/libsubid_tag.sh) \
- exclude_graphdriver_devicemapper \
-- seccomp
- # allow downstreams to easily add build tags while keeping our defaults
- BUILDTAGS += ${EXTRA_BUILDTAGS}
- # N/B: This value is managed by Renovate, manual changes are
-EOF
-
default
# assure necessary files are present
diff --git a/app-containers/podman/podman-5.3.2.ebuild
b/app-containers/podman/podman-5.3.2.ebuild
index 38cbb5a51f5d..72735a9d4f1a 100644
--- a/app-containers/podman/podman-5.3.2.ebuild
+++ b/app-containers/podman/podman-5.3.2.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${T}"/togglable-seccomp.patch
+ "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch
)
CONFIG_CHECK="
@@ -65,19 +65,6 @@ pkg_setup() {
}
src_prepare() {
- cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,6 @@ BUILDTAGS ?= \
- $(shell hack/systemd_tag.sh) \
- $(shell hack/libsubid_tag.sh) \
- exclude_graphdriver_devicemapper \
-- seccomp
- # allow downstreams to easily add build tags while keeping our defaults
- BUILDTAGS += ${EXTRA_BUILDTAGS}
- # N/B: This value is managed by Renovate, manual changes are
-EOF
-
default
# assure necessary files are present
diff --git a/app-containers/podman/podman-9999.ebuild
b/app-containers/podman/podman-9999.ebuild
index 1deb45b19629..d1269c14931f 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${T}"/togglable-seccomp.patch
+ "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch
)
CONFIG_CHECK="
@@ -65,19 +65,6 @@ pkg_setup() {
}
src_prepare() {
- cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,6 @@ BUILDTAGS ?= \
- $(shell hack/systemd_tag.sh) \
- $(shell hack/libsubid_tag.sh) \
- exclude_graphdriver_devicemapper \
-- seccomp
- # allow downstreams to easily add build tags while keeping our defaults
- BUILDTAGS += ${EXTRA_BUILDTAGS}
- # N/B: This value is managed by Renovate, manual changes are
-EOF
-
default
# assure necessary files are present
