From 736a869be42c4527125254d8ff1a8d99c086ab72 Mon Sep 17 00:00:00 2001 From: Mikhail Krinkin Date: Fri, 17 Jan 2025 14:14:41 +0000 Subject: [PATCH] Drop ppc64le architecture from Docker build scripts We don't build images for ppc64le anyways, so it's very unlikely that this functionality is being used. Signed-off-by: Mikhail Krinkin --- docker/linux/common_fun.sh | 13 ------------- docker/linux/ubuntu/Dockerfile | 2 -- docker/linux/ubuntu/fun.sh | 3 --- 3 files changed, 18 deletions(-) diff --git a/docker/linux/common_fun.sh b/docker/linux/common_fun.sh index e024e332..58fedfc3 100644 --- a/docker/linux/common_fun.sh +++ b/docker/linux/common_fun.sh @@ -6,10 +6,6 @@ ARCH="$(uname -m)" DEB_ARCH=amd64 case $ARCH in - 'ppc64le' ) - LLVM_DISTRO="$LLVM_DISTRO_PPC64LE" - LLVM_SHA256SUM="$LLVM_SHA256SUM_PPC64LE" - ;; 'aarch64' ) DEB_ARCH=arm64 BAZELISK_SHA256SUM="$BAZELISK_SHA256SUM_ARM64" @@ -130,12 +126,3 @@ setup_tcpdump () { chmod 750 /usr/sbin/tcpdump setcap cap_net_raw,cap_net_admin=eip /usr/sbin/tcpdump } - -## PPCLE64 FUN -install_ppc64le_bazel () { - BAZEL_LATEST="$(curl https://oplab9.parqtec.unicamp.br/pub/ppc64el/bazel/ubuntu_16.04/latest/ 2>&1 \ - | sed -n 's/.*href="\([^"]*\).*/\1/p' | grep '^bazel' | head -n 1)" - curl -fSL "https://oplab9.parqtec.unicamp.br/pub/ppc64el/bazel/ubuntu_16.04/latest/${BAZEL_LATEST}" \ - -o /usr/local/bin/bazel - chmod +x /usr/local/bin/bazel -} diff --git a/docker/linux/ubuntu/Dockerfile b/docker/linux/ubuntu/Dockerfile index a679a78a..3287c8b6 100644 --- a/docker/linux/ubuntu/Dockerfile +++ b/docker/linux/ubuntu/Dockerfile @@ -16,11 +16,9 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools- LIBSTDCXX_EXPECTED_VERSION=13.1 \ LLVM_DISTRO=x86_64-linux-gnu-ubuntu-18.04 \ LLVM_DISTRO_ARM64=aarch64-linux-gnu \ - LLVM_DISTRO_PPC64LE=powerpc64le-linux-ubuntu-18.04 \ LLVM_DOWNLOAD_PREFIX=https://github.com/llvm/llvm-project/releases/download/llvmorg- \ LLVM_SHA256SUM=2b8a69798e8dddeb57a186ecac217a35ea45607cb2b3cf30014431cff4340ad1 \ LLVM_SHA256SUM_ARM64=b750ba3120e6153fc5b316092f19b52cf3eb64e19e5f44bd1b962cb54a20cf0a \ - LLVM_SHA256SUM_PPC64LE=7fc9f07ff0fcf191df93fe4adc1da555e43f62fe1d3ddafb15c943f72b1bda17 \ LLVM_VERSION=16.0.0 \ ZULU_INSTALL_DEB=https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb ENV LANG=$LANG diff --git a/docker/linux/ubuntu/fun.sh b/docker/linux/ubuntu/fun.sh index e4770e89..53f163a8 100755 --- a/docker/linux/ubuntu/fun.sh +++ b/docker/linux/ubuntu/fun.sh @@ -171,9 +171,6 @@ mobile_install () { } install () { - if [[ "$ARCH" == "ppc64le" ]]; then - install_ppc64le_bazel - fi add_apt_key "${APT_KEY_DOCKER}" add_apt_k8s_key "${APT_KEY_K8S}" add_apt_repos "${APT_REPOS[@]}"