From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B693315802F for ; Tue, 7 Mar 2023 16:43:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 839ADE0877; Tue, 7 Mar 2023 16:43:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 57162E0875 for ; Tue, 7 Mar 2023 16:43:57 +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 5A6153413FA for ; Tue, 7 Mar 2023 16:43:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D79808DF for ; Tue, 7 Mar 2023 16:43:53 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1678207422.91fd60414ae34ed8d3318c6d0ce28350246f2f7f.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/gitlab-runner/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/gitlab-runner/files/build-for-arm64.patch X-VCS-Directories: dev-util/gitlab-runner/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 91fd60414ae34ed8d3318c6d0ce28350246f2f7f X-VCS-Branch: master Date: Tue, 7 Mar 2023 16:43:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ce85284-866a-47a1-91e4-c55748d409a0 X-Archives-Hash: 01ada84fd1c5df041d72e17deaa96a8d commit: 91fd60414ae34ed8d3318c6d0ce28350246f2f7f Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Feb 27 19:25:20 2023 +0000 Commit: Conrad Kostecki gentoo 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 levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29840 Signed-off-by: Conrad Kostecki 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 -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 ---- - 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 -