From a3d5e0710e6bbed82c1725722f817530047a9855 Mon Sep 17 00:00:00 2001 From: Raj Chaudhuri Date: Sun, 5 May 2024 10:52:45 +0530 Subject: [PATCH] Removed ppc64le and s390x arch support A crucial dependency does not support them any more --- reweave/CHANGELOG.md | 1 + reweave/Makefile | 2 + reweave/build/Dockerfile | 13 ++- reweave/build/Makefile | 18 ++-- reweave/scans/badge.json | 2 +- reweave/scans/report.md | 156 ++++++++++++++-------------- website/index.md | 2 +- website/install/plugin/plugin-v2.md | 4 +- 8 files changed, 104 insertions(+), 94 deletions(-) diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md index 027111213..9ac3c4705 100644 --- a/reweave/CHANGELOG.md +++ b/reweave/CHANGELOG.md @@ -11,6 +11,7 @@ All changes made to the weave net codebase during the reweave effort will be doc * Upgraded golang.org/x/sys to v0.18.0 * Upgraded golang.org/x/crypto to v0.21.0 * Ran `go mod tidy` and `go mod vendor` +* Removed support for ppc64le and s90x architectures, because libpcap-0.8 in the debian buster repository does not provide binaries for those architectures any more ## 2.8.6 diff --git a/reweave/Makefile b/reweave/Makefile index 605381931..11a66db03 100644 --- a/reweave/Makefile +++ b/reweave/Makefile @@ -24,6 +24,7 @@ build: build-images build-plugin .PHONY: publish-images publish-images: submodule REGISTRY_USER=${REGISTRY_USER} IMAGE_VERSION=${IMAGE_VERSION} \ + PLATFORMS="linux/amd64,linux/arm,linux/arm64" \ ALPINE_BASEIMAGE=$(ALPINE_BASEIMAGE) \ PUBLISH=true \ tools/build-images.sh @@ -31,6 +32,7 @@ publish-images: submodule .PHONY: publish-plugin publish-plugin: REGISTRY_USER=${REGISTRY_USER} IMAGE_VERSION=${IMAGE_VERSION} \ + PLATFORMS="amd64,arm,arm64" \ PUBLISH=true \ tools/build-plugin.sh diff --git a/reweave/build/Dockerfile b/reweave/build/Dockerfile index 945969e6a..66f008e98 100644 --- a/reweave/build/Dockerfile +++ b/reweave/build/Dockerfile @@ -14,12 +14,19 @@ ENV GOARM 7 # The names of the architectures that we fetch cross-compilers for # from the Debian packages. +# Disabling support for ppc64el and s390x architectures, as the +# debian buster repository does not host binaries for libpcap-0.8 +# on those architectures any more. +# ENV DEB_CROSSPLATFORMS \ +# amd64 \ +# armhf \ +# arm64 \ +# ppc64el \ +# s390x ENV DEB_CROSSPLATFORMS \ amd64 \ armhf \ - arm64 \ - ppc64el \ - s390x + arm64 # Install the build-essential and crossbuild-essential-ARCH packages RUN <