summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-03-19 10:00:29 +0100
committerCorentin LABBE <clabbe@baylibre.com>2019-03-21 11:22:28 +0100
commitf18959ec2357e7b1c54bca47d3a2d0f0a7c53579 (patch)
tree89ac19b79e4866e1964ec20e91d569d1a2eb027d
parent86b4e7b155fd3e18d52ba022b34106a21469108a (diff)
lava-slave: fix build failure due to pxe on non-amd64
The package grub-efi-amd64-bin is only availlable on amd64. Installing it on arm64 lead to a build failure. This patch permits to install it even on arm64
-rw-r--r--lava-slave/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index bd89f7a..b3ae057 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -35,7 +35,9 @@ RUN apt-get update
RUN apt-get -y install lavacli
# PXE stuff
-RUN apt-get -y install grub-efi-amd64-bin
+RUN if [ $(uname -m) != amd64 ]; then dpkg --add-architecture amd64 && apt-get update; fi
+RUN apt-get -y install grub-efi-amd64-bin:amd64
+RUN if [ $(uname -m) != amd64 ]; then dpkg --remove architecture amd64 && apt-get update; fi
RUN cd /var/lib/lava/dispatcher/tmp && grub-mknetdir --net-directory=.
COPY grub.cfg /var/lib/lava/dispatcher/tmp/boot/grub/