From fc203819ea9cced7dbda91ba81e89b428c2cb5f3 Mon Sep 17 00:00:00 2001 From: Marvin Giessing Date: Wed, 20 Apr 2022 21:32:44 +0200 Subject: [PATCH 1/4] Added support for ppc64le Signed-off-by: Marvin Giessing --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7b6b8e90cb..34b3fea36f 100644 --- a/Makefile +++ b/Makefile @@ -26,13 +26,16 @@ else ifeq ($(arch), arm64) # arm64 BASE_DOCKER_SHA=${arm64} else ifeq ($(arch), aarch64) - # arm64 - BASE_DOCKER_SHA=${arm64} + # arm64 + BASE_DOCKER_SHA=${arm64} +else ifeq ($(arch), ppc64le) + # ppc64le + BASE_DOCKER_SHA=${ppc64le} else - echo >&2 "only support amd64 or arm64 arch" && exit 1 + echo >&2 "only support amd64, arm64 or ppc64le arch" && exit 1 endif -DOCKER_ARCHS ?= amd64 arm64 -# Generate two target: docker-xxx-amd64, docker-xxx-arm64. +DOCKER_ARCHS ?= amd64 arm64 ppc64le +# Generate two target: docker-xxx-amd64, docker-xxx-arm64, docker-xxx-ppc64le. # Run make docker-xxx -n to see the result with dry run. BUILD_DOCKER_ARCHS = $(addprefix docker-build-,$(DOCKER_ARCHS)) TEST_DOCKER_ARCHS = $(addprefix docker-test-,$(DOCKER_ARCHS)) @@ -157,7 +160,7 @@ ifeq ($(GIT_BRANCH), main) crossbuild: | $(PROMU) @echo ">> crossbuilding all binaries" # we only care about below two for the main branch - $(PROMU) crossbuild -v -p linux/amd64 -p linux/arm64 + $(PROMU) crossbuild -v -p linux/amd64 -p linux/arm64 -p linux/ppc64le else crossbuild: | $(PROMU) @echo ">> crossbuilding all binaries" From 1f6396a43bdfcf83d5df686d6ef573e0b0a30954 Mon Sep 17 00:00:00 2001 From: Marvin Giessing Date: Wed, 20 Apr 2022 21:55:25 +0200 Subject: [PATCH 2/4] Updated Changelog Signed-off-by: Marvin Giessing --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eec84630ad..302653cf8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#5220](https://github.com/thanos-io/thanos/pull/5220) Query Frontend: Add `--query-frontend.forward-header` flag, forward headers to downstream querier. - [#5250](https://github.com/thanos-io/thanos/pull/5250/files) Querier: Expose Query and QueryRange APIs through GRPC. +- [#5290](https://github.com/thanos-io/thanos/pull/5290) Add support for ppc64le ### Changed From 9ef6836ed48a83db710fb92091fa6c828cb086df Mon Sep 17 00:00:00 2001 From: Marvin Giessing Date: Wed, 20 Apr 2022 22:07:50 +0200 Subject: [PATCH 3/4] Updated promu & protoc Signed-off-by: Marvin Giessing --- .promu.yml | 1 + scripts/installprotoc.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.promu.yml b/.promu.yml index a49dee9db4..2c3e728362 100644 --- a/.promu.yml +++ b/.promu.yml @@ -20,3 +20,4 @@ crossbuild: - linux/arm64 - windows/amd64 - freebsd/amd64 + - linux/ppc64le diff --git a/scripts/installprotoc.sh b/scripts/installprotoc.sh index ffee6c351e..d6124ab55c 100755 --- a/scripts/installprotoc.sh +++ b/scripts/installprotoc.sh @@ -21,6 +21,7 @@ is_supported_platform() { linux/amd64) found=0 ;; linux/i386) found=0 ;; linux/arm64) found=0 ;; + linux/ppc64le) found=0 ;; esac return $found } @@ -37,6 +38,7 @@ adjust_arch() { amd64) ARCH=x86_64 ;; i386) ARCH=x86_32 ;; arm64) ARCH=aarch_64 ;; + ppc64le) ARCH=ppcle_64 ;; esac true } From 3094793c53673a9f8313f2b8cf0a8ecdd2e6d2ff Mon Sep 17 00:00:00 2001 From: Marvin Giessing Date: Thu, 21 Apr 2022 12:35:52 +0200 Subject: [PATCH 4/4] Updated Makefile comment Signed-off-by: Marvin Giessing --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 34b3fea36f..1a9cbaeffd 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ else echo >&2 "only support amd64, arm64 or ppc64le arch" && exit 1 endif DOCKER_ARCHS ?= amd64 arm64 ppc64le -# Generate two target: docker-xxx-amd64, docker-xxx-arm64, docker-xxx-ppc64le. +# Generate three targets: docker-xxx-amd64, docker-xxx-arm64, docker-xxx-ppc64le. # Run make docker-xxx -n to see the result with dry run. BUILD_DOCKER_ARCHS = $(addprefix docker-build-,$(DOCKER_ARCHS)) TEST_DOCKER_ARCHS = $(addprefix docker-test-,$(DOCKER_ARCHS))