diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 9bc324704..18f178b8e 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -6,6 +6,7 @@ - Monitoring is now done through the Ceph MGR service for Ceph storage. ## Breaking Changes +- `armhf` build of Rook have been removed. Ceph is not supported or tested on `armhf`. arm64 support continues. ### Cluster CRD - Removed the `versionTag` property. The container version to launch in all pods will be the same as the version of the operator container. diff --git a/build/makelib/common.mk b/build/makelib/common.mk index e24af1cac..33cf9ec44 100644 --- a/build/makelib/common.mk +++ b/build/makelib/common.mk @@ -35,17 +35,12 @@ GOHOSTOS := $(shell go env GOHOSTOS) GOHOSTARCH := $(shell go env GOHOSTARCH) HOST_PLATFORM := $(GOHOSTOS)_$(GOHOSTARCH) -ALL_PLATFORMS ?= darwin_amd64 windows_amd64 linux_arm linux_amd64 linux_arm64 +ALL_PLATFORMS ?= darwin_amd64 windows_amd64 linux_amd64 linux_arm64 ifeq ($(PLATFORM),linux_amd64) CROSS_TRIPLE = x86_64-linux-gnu DEBIAN_ARCH = amd64 endif -ifeq ($(PLATFORM),linux_arm) -GOARM=7 -DEBIAN_ARCH = armhf -CROSS_TRIPLE = arm-linux-gnueabihf -endif ifeq ($(PLATFORM),linux_arm64) DEBIAN_ARCH = arm64 CROSS_TRIPLE = aarch64-linux-gnu diff --git a/build/release/README.md b/build/release/README.md index d6816be13..3e7819877 100644 --- a/build/release/README.md +++ b/build/release/README.md @@ -56,7 +56,6 @@ Binaries go to an S3 bucket `rook-release` (and https://release.rook.io) and hav /v0.3.0-2-g770ebbc darwin_amd64/rookctl linux_amd64/rookctl - linux_arm/rookctl linux_arm64/rookctl windows_amd64/rookctl version diff --git a/images/Makefile b/images/Makefile index 8627cd7ac..04e5a8b58 100644 --- a/images/Makefile +++ b/images/Makefile @@ -14,7 +14,7 @@ include image.mk -PLATFORMS ?= linux_amd64 linux_arm linux_arm64 +PLATFORMS ?= linux_amd64 linux_arm64 # ==================================================================================== # Image Targets diff --git a/images/cross/Dockerfile b/images/cross/Dockerfile index bb9791af9..c5ec8dd05 100644 --- a/images/cross/Dockerfile +++ b/images/cross/Dockerfile @@ -47,7 +47,7 @@ ENV PATH /usr/local/go/bin:$PATH # precompile the go standard library for all supported platforms and configurations # the install suffixes match those in golang.mk so please keep them in sync -RUN platforms="darwin_amd64 windows_amd64 linux_arm linux_amd64 linux_arm64" && \ +RUN platforms="darwin_amd64 windows_amd64 linux_amd64 linux_arm64" && \ for p in $platforms; do CGO_ENABLED=0 GOOS=${p%_*} GOARCH=${p##*_} GOARM=7 go install -installsuffix static -a std; done COPY run.sh rsyncd.sh /build/