[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/

[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/

[Zac Medico]

commit:     7e550bd827594a8c21265794c751f874944ec1d3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 03:25:40 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 03:26:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e550bd8

app-containers/buildah: Delete unused patches

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .../dont-call-as-directly-upstream-pr-5436.patch   | 32 ----------------------
 .../files/softcode-strip-upstream-pr-5446.patch    | 29 --------------------
 2 files changed, 61 deletions(-)

diff --git a/app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch b/app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch
deleted file mode 100644
index 0fc376b1d68b..000000000000
--- a/app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c1b43b57bb20f8796002e1d6f93bbdbc02e28f20 Mon Sep 17 00:00:00 2001
-From: Rahil Bhimjiani <me@rahil.rocks>
-Date: Wed, 27 Mar 2024 14:27:09 +0530
-Subject: [PATCH] Makefile - instead of calling `as` directly, use it from env
- var
-
-Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
----
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f1ab6b8bf4..7d27a41530 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,6 +16,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)"
- BUILDAH := buildah
- SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
- SELINUXTYPE=container_runtime_exec_t
-+AS ?= as
- 
- GO := go
- GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -79,7 +80,7 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint_amd64.gz
- 	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
- 	test -z "${SELINUXOPT}" || chcon --verbose -t $(SELINUXTYPE) $@
- 
--ifneq ($(shell as --version | grep x86_64),)
-+ifneq ($(shell $(AS) --version | grep x86_64),)
- internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
- 	gzip -k9nf $^
- 

diff --git a/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch b/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
deleted file mode 100644
index 0ca0a6602a7d..000000000000
--- a/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 2cd31a0698bea846366e8e153619a108484a1a2a
-Author: Rahil Bhimjiani <me@rahil.rocks>
-Date:   Mon Apr 1 09:25:21 2024 +0530
-
-    Makefile: softcode `strip`, use it from env var
-    
-    Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
-
-diff --git a/Makefile b/Makefile
-index 7d27a4153..3a955c85a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,6 +17,7 @@ BUILDAH := buildah
- SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
- SELINUXTYPE=container_runtime_exec_t
- AS ?= as
-+STRIP ?= strip
- 
- GO := go
- GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -87,7 +88,7 @@ internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
- internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
- 	$(AS) -o $(patsubst %.s,%.o,$^) $^
- 	$(LD) -o $@ $(patsubst %.s,%.o,$^)
--	strip $@
-+	$(STRIP) $@
- endif
- 
-