From 5c13bd2bdcbe2fa232e6e4fa32502b053a272a4f Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 7 Feb 2024 11:10:17 +0100 Subject: [PATCH] Fix arm64 build for os tools Signed-off-by: Itxaka --- tools-image/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile index b70d207..5d02460 100644 --- a/tools-image/Dockerfile +++ b/tools-image/Dockerfile @@ -9,7 +9,12 @@ FROM quay.io/kairos/enki:${ENKI_VERSION} as enki FROM fedora:$FEDORA_VERSION as default RUN dnf -y update ## ISO+ Arm image + Netboot + cloud images Build depedencies -RUN dnf in -y bc qemu-tools jq genisoimage docker git curl gdisk kpartx sudo xfsprogs parted e2fsprogs curl util-linux udev rsync grub2 dosfstools mtools xorriso lvm2 zstd sbsigntools grub2-efi-x64 squashfs-tools openssl systemd-ukify systemd-boot +RUN dnf in -y bc qemu-tools jq genisoimage docker git curl gdisk kpartx sudo xfsprogs parted e2fsprogs curl util-linux udev rsync grub2 dosfstools mtools xorriso lvm2 zstd sbsigntools squashfs-tools openssl systemd-ukify systemd-boot +# Install grub2-efi-x64 only on x86 arches +RUN if [ "$(uname -m)" == "x86_64" ]; then dnf install -y grub2-efi-x64; fi +# Install grub2-efi-arm64 only on arm64 arches +RUN if [ "$(uname -m)" == "aarch64" ]; then dnf install -y grub2-efi-aa64; fi + COPY --from=luet /usr/bin/luet /usr/bin/luet ENV LUET_NOLOCK=true ENV TMPDIR=/tmp