diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-03-07 17:57:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-07 17:57:54 +0000 |
| commit | bc75b42f7650c33ffdb61e5e29b0b96cb9111932 (patch) | |
| tree | 867908c0cf83e6015a5b1544cfdc4e17f1c13753 /dev-util/gitlab-runner | |
| parent | b3fef92e618039dc93153a93176184a49606c74a (diff) | |
gentoo auto-resync : 07:03:2023 - 17:57:54
Diffstat (limited to 'dev-util/gitlab-runner')
| -rw-r--r-- | dev-util/gitlab-runner/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/gitlab-runner/files/build-for-arm64.patch | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest index 033ed1ac80b9..07a2333d654e 100644 --- a/dev-util/gitlab-runner/Manifest +++ b/dev-util/gitlab-runner/Manifest @@ -1,4 +1,3 @@ -AUX build-for-arm64.patch 2514 BLAKE2B 40c61eea09ae57e91867e6040cc6d3577b63cc3feb74b04aab3a526e529d3fa9c4eaec70172a0824d0eeed3ee641a7e63456741c925c52dc4ae609c63a4feee4 SHA512 2110dd3c21e1de1f60fd6decb7f1b437c74d67be8bc2dfb441ee9e2f1a4404cc2b1d21f1ecefe6b0e5a3246f29c92f3c2a63427876b8902c189ebe9589aef886 AUX gitlab-runner.confd 688 BLAKE2B 1e99cdca8949a1a085e126c9aa2f23cf15d081087d022ca7a8628ffebd07a645abf3d01a0a3af156fb95c8865e75c2a1c986dec8bc63d47180210d66b184cbcf SHA512 63e846e7f5d5799c3e5b0ec6103dd82d00efd6dd1aa6007da4c7a8c513e3b135d7790fab19e2a3db4d2511cd42236da74dd307c45fe81bbf7d4779b9e1beaaeb AUX gitlab-runner.initd 1174 BLAKE2B 53b897abb3bc358839843faf56b52d99412c2a08e2e69e1b8258bab907a0da10dedeafd95e6c4e505fd7e8e4d2344dc07b1e693a130fe0d6a3730bf619ee2e75 SHA512 eae2668c5a98a9e111573a2ea193266252e46e073fafd2c101d3a93e65cb9705f78ceab173ca4d3e1c806443345e7f66b7b97c8b644188cf9f86dc4c087d401f AUX gitlab-runner.service 419 BLAKE2B f1a9217eb97d03036eac67569ec6ce6ed91dc2182b20357cf8d17ee0eee01b8d094854b1c76942e0515c2a5923f4d3a1ed044c60b89d8a29c354955f9f666160 SHA512 10cbe1cc0a0b7bb9decde5780bc20caf73892759532df5fc42a7c3b55e141b26957a2986656ac1eb79ce15fd95ee01a184893c22d0dd1ce9117932d0e55ae1b4 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 - |