From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1694136-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(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 7B6821581F3
for <garchives@archives.gentoo.org>; Tue, 26 Nov 2024 03:27:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BAAE4E0819;
Tue, 26 Nov 2024 03:27:03 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 99BAFE07EF
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Nov 2024 03:27:03 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BB300343030
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Nov 2024 03:27:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A2DF18B9
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Nov 2024 03:27:01 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1732591617.7e550bd827594a8c21265794c751f874944ec1d3.zmedico@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-containers/buildah/files/dont-call-as-directly-upstream-pr-5436.patch app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
X-VCS-Directories: app-containers/buildah/files/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 7e550bd827594a8c21265794c751f874944ec1d3
X-VCS-Branch: master
Date: Tue, 26 Nov 2024 03:27:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2530ba89-f519-404e-9d71-c516fd3131ad
X-Archives-Hash: 5c27cd8e86314da421ff9ba2df54f6dd
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
-
-