Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 852962
Collapse All | Expand All

(-)a/Makefile.build.mk (-5 / +5 lines)
Lines 35-41 runner-bin-fips-docker: Link Here
35
	@docker rm -f gitlab-runner-fips
35
	@docker rm -f gitlab-runner-fips
36
36
37
runner-bin-host: OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
37
runner-bin-host: OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
38
runner-bin-host: ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/386/)
38
runner-bin-host: ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/386/)
39
runner-bin-host:
39
runner-bin-host:
40
	# Building $(NAME) in version $(VERSION) for host platform
40
	# Building $(NAME) in version $(VERSION) for host platform
41
	$(MAKE) runner-bin BUILD_PLATFORMS="-osarch=$(OS)/$(ARCH)"
41
	$(MAKE) runner-bin BUILD_PLATFORMS="-osarch=$(OS)/$(ARCH)"
Lines 56-70 runner-and-helper-docker-host: runner-and-helper-deb-host Link Here
56
	$(MAKE) release_docker_images
56
	$(MAKE) release_docker_images
57
	$(MAKE) release_helper_docker_images
57
	$(MAKE) release_helper_docker_images
58
58
59
runner-and-helper-deb-host: ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/386/)
59
runner-and-helper-deb-host: ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/386/)
60
runner-and-helper-deb-host: export BUILD_ARCHS := -arch '$(ARCH)'
60
runner-and-helper-deb-host: export BUILD_ARCHS := -arch '$(ARCH)'
61
runner-and-helper-deb-host: PACKAGE_ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/i686/)
61
runner-and-helper-deb-host: PACKAGE_ARCH := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/ | sed s/i386/i686/)
62
runner-and-helper-deb-host: runner-and-helper-bin-host package-deps package-prepare
62
runner-and-helper-deb-host: runner-and-helper-bin-host package-deps package-prepare
63
	$(MAKE) package-deb-arch ARCH=$(ARCH) PACKAGE_ARCH=$(PACKAGE_ARCH)
63
	$(MAKE) package-deb-arch ARCH=$(ARCH) PACKAGE_ARCH=$(PACKAGE_ARCH)
64
64
65
runner-and-helper-rpm-host: ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/386/)
65
runner-and-helper-rpm-host: ARCH := $(shell uname -m | sed s/aarch64/arm64/ | s/x86_64/amd64/ | sed s/i386/386/)
66
runner-and-helper-rpm-host: export BUILD_ARCHS := -arch '$(ARCH)'
66
runner-and-helper-rpm-host: export BUILD_ARCHS := -arch '$(ARCH)'
67
runner-and-helper-rpm-host: PACKAGE_ARCH := $(shell uname -m | sed s/x86_64/amd64/ | sed s/i386/i686/)
67
runner-and-helper-rpm-host: PACKAGE_ARCH := $(shell uname -m | sed s/aarch64/arm64/ | s/x86_64/amd64/ | sed s/i386/i686/)
68
runner-and-helper-rpm-host: runner-and-helper-bin-host package-deps package-prepare
68
runner-and-helper-rpm-host: runner-and-helper-bin-host package-deps package-prepare
69
	$(MAKE) package-rpm-arch ARCH=$(ARCH) PACKAGE_ARCH=$(PACKAGE_ARCH)
69
	$(MAKE) package-rpm-arch ARCH=$(ARCH) PACKAGE_ARCH=$(PACKAGE_ARCH)
70
70

Return to bug 852962