From df84ac7f13d640edbae39033639acb11ecbac02b Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 6 Sep 2024 11:29:19 +0100 Subject: [PATCH] podvm_binaries: Add fedora cross-build support Add fedora-like OS support for cross-build-extras --- .../podvm/Dockerfile.podvm_binaries.fedora | 2 ++ .../podvm/hack/cross-build-extras.sh | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/cloud-api-adaptor/podvm/Dockerfile.podvm_binaries.fedora b/src/cloud-api-adaptor/podvm/Dockerfile.podvm_binaries.fedora index 3da7fe08f..51881fa72 100644 --- a/src/cloud-api-adaptor/podvm/Dockerfile.podvm_binaries.fedora +++ b/src/cloud-api-adaptor/podvm/Dockerfile.podvm_binaries.fedora @@ -46,6 +46,8 @@ ENV IMAGE_CHECKSUM="none" COPY . /src WORKDIR /src/cloud-api-adaptor/podvm +# Installs add-ons for foreign target, if required +RUN ./hack/cross-build-extras.sh RUN LIBC=gnu make binaries diff --git a/src/cloud-api-adaptor/podvm/hack/cross-build-extras.sh b/src/cloud-api-adaptor/podvm/hack/cross-build-extras.sh index f0093ff36..26f73ceb3 100755 --- a/src/cloud-api-adaptor/podvm/hack/cross-build-extras.sh +++ b/src/cloud-api-adaptor/podvm/hack/cross-build-extras.sh @@ -17,5 +17,12 @@ libc=$([[ $ARCH =~ s390x ]] && echo "gnu" || echo "musl") rustTarget="$ARCH-unknown-linux-$libc" rustup target add "$rustTarget" -apt install -y "qemu-system-$ARCH" -apt install -y "gcc-$ARCH-linux-$libc" + +source /etc/os-release || source /usr/lib/os-release +if [[ ${ID_LIKE:-} == *"debian"* ]]; then + apt install -y "qemu-system-$ARCH" + apt install -y "gcc-$ARCH-linux-$libc" +elif [[ "${ID_LIKE:-}" =~ "fedora" ]]; then + dnf install -y "qemu-system-$ARCH" + dnf install -y "gcc-$ARCH-linux-$libc" +fi