commit: 23c14ef8c96c49228be5605e24e464d4490cc116 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Tue Jun 21 23:11:37 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Jun 21 23:14:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c14ef8
dev-util/gitlab-runner: add patch for arm64 Bug: https://bugs.gentoo.org/852962 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> dev-util/gitlab-runner/files/build-for-arm64.patch | 48 ++++++++++++++++++++++ .../gitlab-runner/gitlab-runner-14.10.1-r1.ebuild | 5 +++ .../gitlab-runner/gitlab-runner-15.0.0-r1.ebuild | 5 +++ dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild | 5 +++ 4 files changed, 63 insertions(+) diff --git a/dev-util/gitlab-runner/files/build-for-arm64.patch b/dev-util/gitlab-runner/files/build-for-arm64.patch new file mode 100644 index 000000000000..c150b5bc3918 --- /dev/null +++ b/dev-util/gitlab-runner/files/build-for-arm64.patch @@ -0,0 +1,48 @@ +From 2fc7d1d71c298fe736d4b8679f684942cd23d102 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +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 <[email protected]> +--- + 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 + diff --git a/dev-util/gitlab-runner/gitlab-runner-14.10.1-r1.ebuild b/dev-util/gitlab-runner/gitlab-runner-14.10.1-r1.ebuild index 176609496e49..6761ca661422 100644 --- a/dev-util/gitlab-runner/gitlab-runner-14.10.1-r1.ebuild +++ b/dev-util/gitlab-runner/gitlab-runner-14.10.1-r1.ebuild @@ -24,6 +24,11 @@ BDEPEND="dev-go/gox" DOCS=( docs CHANGELOG.md README.md config.toml.example ) +PATCHES=( + # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498 + "${FILESDIR}"/build-for-arm64.patch + ) + S="${WORKDIR}/${PN}-v${PV}" src_compile() { diff --git a/dev-util/gitlab-runner/gitlab-runner-15.0.0-r1.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.0.0-r1.ebuild index 36a78be3b1cb..046e21d8e4bb 100644 --- a/dev-util/gitlab-runner/gitlab-runner-15.0.0-r1.ebuild +++ b/dev-util/gitlab-runner/gitlab-runner-15.0.0-r1.ebuild @@ -24,6 +24,11 @@ BDEPEND="dev-go/gox" DOCS=( docs CHANGELOG.md README.md config.toml.example ) +PATCHES=( + # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498 + "${FILESDIR}"/build-for-arm64.patch + ) + S="${WORKDIR}/${PN}-v${PV}" src_compile() { diff --git a/dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild index df4a8331c7a6..fcce7a120b1e 100644 --- a/dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild +++ b/dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild @@ -24,6 +24,11 @@ BDEPEND="dev-go/gox" DOCS=( docs CHANGELOG.md README.md config.toml.example ) +PATCHES=( + # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498 + "${FILESDIR}"/build-for-arm64.patch + ) + S="${WORKDIR}/${PN}-v${PV}" src_compile() {
