From 091e04f8edb87144d6703789a95d815116034c40 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Thu, 2 Nov 2017 10:59:30 -0700 Subject: [PATCH] Use `amd64` instread of `x86_64` when building architecture (#1194) In Makefile.release `shell uname -m` was used to find the current architecture. On amd64 systems this might be reported as `x86_64` depending on the Linux. However, in order to have manifest docker images we need to stick with golang's architecture tag of `amd64`. This fix changes instead so that the correct architecture conforming to golang (`amd64`) could be build. Signed-off-by: Yong Tang --- Makefile.release | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile.release b/Makefile.release index 1d62b590d..e624cf66b 100644 --- a/Makefile.release +++ b/Makefile.release @@ -35,12 +35,11 @@ # Github. ifeq (, $(shell which gh-release)) - $(error "No gh-release in $$PATH, install with `go get progrium/gh-release`") + $(error "No gh-release in $$PATH, install with `go get github.com/progrium/gh-release`") endif NAME:=coredns VERSION:=$(shell grep 'coreVersion' coremain/version.go | awk '{ print $$3 }' | tr -d '"') -ARCH:=$(shell uname -m) GITHUB:=coredns DOCKER:=coredns DOCKER_IMAGE_NAME:=$(DOCKER)/$(NAME) @@ -68,24 +67,24 @@ build: @echo Cleaning old builds rm -rf build && mkdir build @echo Building: linux $(VERSION) - mkdir -p build/linux/$(ARCH) && $(MAKE) coredns BINARY=build/linux/$(ARCH)/$(NAME) SYSTEM="GOOS=linux" CHECKS="" + mkdir -p build/linux/amd64 && $(MAKE) coredns BINARY=build/linux/amd64/$(NAME) SYSTEM="GOOS=linux GOARCH=amd64" CHECKS="" @echo Building: darwin $(VERSION) - mkdir -p build/darwin/$(ARCH) && $(MAKE) coredns BINARY=build/darwin/$(ARCH)/$(NAME) SYSTEM="GOOS=darwin" CHECKS="" + mkdir -p build/darwin/amd64 && $(MAKE) coredns BINARY=build/darwin/amd64/$(NAME) SYSTEM="GOOS=darwin GOARCH=amd64" CHECKS="" @echo Building: arm $(VERSION) - mkdir -p build/linux/arm && $(MAKE) coredns BINARY=build/linux/arm/$(NAME) SYSTEM="GOOS=linux GOARCH=arm" CHECKS="" + mkdir -p build/linux/arm && $(MAKE) coredns BINARY=build/linux/arm/$(NAME) SYSTEM="GOOS=linux GOARCH=arm" CHECKS="" @echo Building: arm64 $(VERSION) - mkdir -p build/linux/arm64 && $(MAKE) coredns BINARY=build/linux/arm64/$(NAME) SYSTEM="GOOS=linux GOARCH=arm64" CHECKS="" + mkdir -p build/linux/arm64 && $(MAKE) coredns BINARY=build/linux/arm64/$(NAME) SYSTEM="GOOS=linux GOARCH=arm64" CHECKS="" @echo Building: ppc64 $(VERSION) - mkdir -p build/linux/ppc64 && $(MAKE) coredns BINARY=build/linux/ppc64/$(NAME) SYSTEM="GOOS=linux GOARCH=ppc64le" CHECKS="" + mkdir -p build/linux/ppc64 && $(MAKE) coredns BINARY=build/linux/ppc64/$(NAME) SYSTEM="GOOS=linux GOARCH=ppc64le" CHECKS="" @echo Building: s390x $(VERSION) - mkdir -p build/linux/s390 && $(MAKE) coredns BINARY=build/linux/s390/$(NAME) SYSTEM="GOOS=linux GOARCH=s390x" CHECKS="" + mkdir -p build/linux/s390 && $(MAKE) coredns BINARY=build/linux/s390/$(NAME) SYSTEM="GOOS=linux GOARCH=s390x" CHECKS="" .PHONY: tar tar: @echo Cleaning old releases rm -rf release && mkdir release - tar -zcf release/$(NAME)_$(VERSION)_linux_$(ARCH).tgz -C build/linux/$(ARCH) $(NAME) - tar -zcf release/$(NAME)_$(VERSION)_darwin_$(ARCH).tgz -C build/darwin/$(ARCH) $(NAME) + tar -zcf release/$(NAME)_$(VERSION)_linux_amd64.tgz -C build/linux/amd64 $(NAME) + tar -zcf release/$(NAME)_$(VERSION)_darwin_amd64.tgz -C build/darwin/amd64 $(NAME) tar -zcf release/$(NAME)_$(VERSION)_linux_armv6l.tgz -C build/linux/arm $(NAME) tar -zcf release/$(NAME)_$(VERSION)_linux_armv8l.tgz -C build/linux/arm64 $(NAME) tar -zcf release/$(NAME)_$(VERSION)_linux_ppc64le.tgz -C build/linux/ppc64 $(NAME)