commit: c156590aba1fb89a4fd90839eb59619761b50388
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 18:09:02 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=c156590a
app-containers/buildah: 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>
app-containers/buildah/buildah-1.37.5.ebuild | 26 ++--------------------
app-containers/buildah/buildah-1.38.0.ebuild | 26 ++--------------------
app-containers/buildah/buildah-1.38.1.ebuild | 26 ++--------------------
app-containers/buildah/buildah-9999.ebuild | 26 ++--------------------
.../files/buildah-1.37.5-disable-seccomp.patch | 5 +++++
.../files/buildah-1.37.5-disable-tests.patch | 8 +++++++
.../files/buildah-1.38.0-disable-tests.patch | 8 +++++++
7 files changed, 29 insertions(+), 96 deletions(-)
diff --git a/app-containers/buildah/buildah-1.37.5.ebuild
b/app-containers/buildah/buildah-1.37.5.ebuild
index d1b02cc1d9f8..1a26408b8155 100644
--- a/app-containers/buildah/buildah-1.37.5.ebuild
+++ b/app-containers/buildah/buildah-1.37.5.ebuild
@@ -70,16 +70,7 @@ src_prepare() {
$(usex apparmor 'echo apparmor' echo)
EOF
- use seccomp || {
- cat <<-'EOF' > "${T}/disable_seccomp.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -5 +5 @@
- -SECURITYTAGS ?= seccomp $(APPARMORTAG)
- +SECURITYTAGS ?= $(APPARMORTAG)
- EOF
- eapply "${T}/disable_seccomp.patch" || die
- }
+ use seccomp || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch"
cat <<-EOF > hack/systemd_tag.sh || die
#!/usr/bin/env bash
@@ -92,20 +83,7 @@ src_prepare() {
$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
EOF
- use test || {
- cat <<-'EOF' > "${T}/disable_tests.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -54 +54 @@
- -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
- +all: bin/buildah docs
- @@ -123 +123 @@
- -docs: install.tools ## build the docs on the host
- +docs: ## build the docs on the host
- EOF
- eapply "${T}/disable_tests.patch" || die
- }
-
+ use test || eapply "${FILESDIR}/${PN}-1.37.5-disable-tests.patch"
}
src_compile() {
diff --git a/app-containers/buildah/buildah-1.38.0.ebuild
b/app-containers/buildah/buildah-1.38.0.ebuild
index 9ec7c2ddf698..4bb018ff5a38 100644
--- a/app-containers/buildah/buildah-1.38.0.ebuild
+++ b/app-containers/buildah/buildah-1.38.0.ebuild
@@ -70,16 +70,7 @@ src_prepare() {
$(usex apparmor 'echo apparmor' echo)
EOF
- use seccomp || {
- cat <<-'EOF' > "${T}/disable_seccomp.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -5 +5 @@
- -SECURITYTAGS ?= seccomp $(APPARMORTAG)
- +SECURITYTAGS ?= $(APPARMORTAG)
- EOF
- eapply "${T}/disable_seccomp.patch" || die
- }
+ use seccomp || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch"
cat <<-EOF > hack/systemd_tag.sh || die
#!/usr/bin/env bash
@@ -92,20 +83,7 @@ src_prepare() {
$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
EOF
- use test || {
- cat <<-'EOF' > "${T}/disable_tests.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -56 +56 @@
- -all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial
docs
- +all: bin/buildah docs
- @@ -122 +122 @@
- -docs: install.tools ## build the docs on the host
- +docs: ## build the docs on the host
- EOF
- eapply "${T}/disable_tests.patch" || die
- }
-
+ use test || eapply "${FILESDIR}/${PN}-1.38.0-disable-tests.patch"
}
src_compile() {
diff --git a/app-containers/buildah/buildah-1.38.1.ebuild
b/app-containers/buildah/buildah-1.38.1.ebuild
index df68d03e4ee4..cfc7fb8a64b1 100644
--- a/app-containers/buildah/buildah-1.38.1.ebuild
+++ b/app-containers/buildah/buildah-1.38.1.ebuild
@@ -70,16 +70,7 @@ src_prepare() {
$(usex apparmor 'echo apparmor' echo)
EOF
- use seccomp || {
- cat <<-'EOF' > "${T}/disable_seccomp.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -5 +5 @@
- -SECURITYTAGS ?= seccomp $(APPARMORTAG)
- +SECURITYTAGS ?= $(APPARMORTAG)
- EOF
- eapply "${T}/disable_seccomp.patch" || die
- }
+ use seccomp || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch"
cat <<-EOF > hack/systemd_tag.sh || die
#!/usr/bin/env bash
@@ -92,20 +83,7 @@ src_prepare() {
$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
EOF
- use test || {
- cat <<-'EOF' > "${T}/disable_tests.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -56 +56 @@
- -all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial
docs
- +all: bin/buildah docs
- @@ -122 +122 @@
- -docs: install.tools ## build the docs on the host
- +docs: ## build the docs on the host
- EOF
- eapply "${T}/disable_tests.patch" || die
- }
-
+ use test || eapply "${FILESDIR}/${PN}-1.38.0-disable-tests.patch"
}
src_compile() {
diff --git a/app-containers/buildah/buildah-9999.ebuild
b/app-containers/buildah/buildah-9999.ebuild
index 846ea4c76856..454cd9192f73 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -70,16 +70,7 @@ src_prepare() {
$(usex apparmor 'echo apparmor' echo)
EOF
- use seccomp || {
- cat <<-'EOF' > "${T}/disable_seccomp.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -5 +5 @@
- -SECURITYTAGS ?= seccomp $(APPARMORTAG)
- +SECURITYTAGS ?= $(APPARMORTAG)
- EOF
- eapply "${T}/disable_seccomp.patch" || die
- }
+ use seccomp || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch"
cat <<-EOF > hack/systemd_tag.sh || die
#!/usr/bin/env bash
@@ -92,20 +83,7 @@ src_prepare() {
$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
EOF
- use test || {
- cat <<-'EOF' > "${T}/disable_tests.patch"
- --- a/Makefile
- +++ b/Makefile
- @@ -56 +56 @@
- -all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial
docs
- +all: bin/buildah docs
- @@ -122 +122 @@
- -docs: install.tools ## build the docs on the host
- +docs: ## build the docs on the host
- EOF
- eapply "${T}/disable_tests.patch" || die
- }
-
+ use test || eapply "${FILESDIR}/${PN}-1.38.0-disable-tests.patch"
}
src_compile() {
diff --git a/app-containers/buildah/files/buildah-1.37.5-disable-seccomp.patch
b/app-containers/buildah/files/buildah-1.37.5-disable-seccomp.patch
new file mode 100644
index 000000000000..eaac7c8ed251
--- /dev/null
+++ b/app-containers/buildah/files/buildah-1.37.5-disable-seccomp.patch
@@ -0,0 +1,5 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5 +5 @@
+-SECURITYTAGS ?= seccomp $(APPARMORTAG)
++SECURITYTAGS ?= $(APPARMORTAG)
diff --git a/app-containers/buildah/files/buildah-1.37.5-disable-tests.patch
b/app-containers/buildah/files/buildah-1.37.5-disable-tests.patch
new file mode 100644
index 000000000000..1827f4859cb5
--- /dev/null
+++ b/app-containers/buildah/files/buildah-1.37.5-disable-tests.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -54 +54 @@
+-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
++all: bin/buildah docs
+@@ -123 +123 @@
+-docs: install.tools ## build the docs on the host
++docs: ## build the docs on the host
diff --git a/app-containers/buildah/files/buildah-1.38.0-disable-tests.patch
b/app-containers/buildah/files/buildah-1.38.0-disable-tests.patch
new file mode 100644
index 000000000000..a3a73f01d9cd
--- /dev/null
+++ b/app-containers/buildah/files/buildah-1.38.0-disable-tests.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56 +56 @@
+-all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial docs
++all: bin/buildah docs
+@@ -122 +122 @@
+-docs: install.tools ## build the docs on the host
++docs: ## build the docs on the host
