From c1fb4bb726c1595d6bea9de4f7a2e08d8da8af40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 2 Mar 2022 19:04:30 +0100 Subject: [PATCH] snap: Don't build cloud-hypevisor on ppc64le MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit snapcraft build is failing due to: `` utils.mk:130: "WARNING: powerpc64le-unknown-linux-musl target is unavailable" ``` It seems to happen as powerpc64-unknown-linux-musl is a target that although there's support for it, it's not exactly built or automatically tested, at least according to: https://doc.rust-lang.org/rustc/platform-support.html Fixes: #3803 Signed-off-by: Fabiano FidĂȘncio --- snap/snapcraft.yaml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 173c0f7b73..a5dbd29632 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -320,20 +320,23 @@ parts: plugin: nil after: [godeps] override-build: | - sudo apt-get -y update - sudo apt-get -y install ca-certificates curl gnupg lsb-release - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --batch --yes --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - sudo apt-get -y update - sudo apt-get -y install docker-ce docker-ce-cli containerd.io - sudo systemctl start docker.socket + arch=$(uname -m) + if [ "{$arch}" == "aarch64" ] || [ "${arch}" == "x64_64" ]; then + sudo apt-get -y update + sudo apt-get -y install ca-certificates curl gnupg lsb-release + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --batch --yes --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + sudo apt-get -y update + sudo apt-get -y install docker-ce docker-ce-cli containerd.io + sudo systemctl start docker.socket - export GOPATH=${SNAPCRAFT_STAGE}/gopath - kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME} - cd ${kata_dir} - sudo -E NO_TTY=true make cloud-hypervisor-tarball - tar xvJpf build/kata-static-cloud-hypervisor.tar.xz -C /tmp/ - install -D /tmp/opt/kata/bin/cloud-hypervisor ${SNAPCRAFT_PART_INSTALL}/usr/bin/cloud-hypervisor + export GOPATH=${SNAPCRAFT_STAGE}/gopath + kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME} + cd ${kata_dir} + sudo -E NO_TTY=true make cloud-hypervisor-tarball + tar xvJpf build/kata-static-cloud-hypervisor.tar.xz -C /tmp/ + install -D /tmp/opt/kata/bin/cloud-hypervisor ${SNAPCRAFT_PART_INSTALL}/usr/bin/cloud-hypervisor + fi apps: runtime: