[gentoo-commits] repo/gentoo:master commit in: dev-util/gitlab-runner/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     91fd60414ae34ed8d3318c6d0ce28350246f2f7f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 27 19:25:20 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 16:43:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fd6041

dev-util/gitlab-runner: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29840
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/gitlab-runner/files/build-for-arm64.patch | 48 ----------------------
 1 file changed, 48 deletions(-)

diff --git a/dev-util/gitlab-runner/files/build-for-arm64.patch b/dev-util/gitlab-runner/files/build-for-arm64.patch
deleted file mode 100644
index c150b5bc3918..000000000000
--- a/dev-util/gitlab-runner/files/build-for-arm64.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2fc7d1d71c298fe736d4b8679f684942cd23d102 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 21 Jun 2022 23:35:28 +0100
-Subject: [PATCH] Makefile.build.mk: allow building for arm64 without
- overriding ARCH
-
-Bug: https://bugs.gentoo.org/852962
-Thanks-to: William Hubbs <williamh@gentoo.org>
----
- Makefile.build.mk | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.build.mk b/Makefile.build.mk
-index 977db1e0e9..f6f31647f9 100644
---- a/Makefile.build.mk
-+++ b/Makefile.build.mk
-@@ -35,7 +35,7 @@ runner-bin-fips-docker:
- 	@docker rm -f gitlab-runner-fips
- 
- runner-bin-host: OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
--runner-bin-host: ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/386/)
-+runner-bin-host: ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/386/)
- runner-bin-host:
- 	# Building $(NAME) in version $(VERSION) for host platform
- 	$(MAKE) runner-bin BUILD_PLATFORMS="-osarch=$(OS)/$(ARCH)"
-@@ -56,15 +56,15 @@ runner-and-helper-docker-host: runner-and-helper-deb-host
- 	$(MAKE) release_docker_images
- 	$(MAKE) release_helper_docker_images
- 
--runner-and-helper-deb-host: ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/386/)
-+runner-and-helper-deb-host: ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/386/)
- runner-and-helper-deb-host: export BUILD_ARCHS := -arch '$(ARCH)'
--runner-and-helper-deb-host: PACKAGE_ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/i686/)
-+runner-and-helper-deb-host: PACKAGE_ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/i686/)
- runner-and-helper-deb-host: runner-and-helper-bin-host package-deps package-prepare
- 	$(MAKE) package-deb-arch ARCH=$(ARCH) PACKAGE_ARCH=$(PACKAGE_ARCH)
- 
--runner-and-helper-rpm-host: ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/386/)
-+runner-and-helper-rpm-host: ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/386/)
- runner-and-helper-rpm-host: export BUILD_ARCHS := -arch '$(ARCH)'
--runner-and-helper-rpm-host: PACKAGE_ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/i686/)
-+runner-and-helper-rpm-host: PACKAGE_ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/i686/)
- runner-and-helper-rpm-host: runner-and-helper-bin-host package-deps package-prepare
- 	$(MAKE) package-rpm-arch ARCH=$(ARCH) PACKAGE_ARCH=$(PACKAGE_ARCH)
- 
--- 
-GitLab
-