vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T2422: arm: Docker: Ignore x86/x64 only grub packages on ARM builds

Browse Source 
Because of newly added dependencies to the packages grub2, grub-pc and grub2-common the container is not buildable for ARM and ARM64.
These packages are only available on intel platforms and needs to be ignored on everything else.
This commit is contained in:
Runar Borge 2020-05-03 13:05:44 +02:00
parent 06249c492d
commit a095df1bb3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/Dockerfile
View File

@ -85,12 +85,13 @@ RUN apt-get update && apt-get install -y \
gosu \
po4a \
openssh-client \
jq \
grub2
jq
# Syslinux is only supported on x86 and x64 systems
# Syslinux and Grub2 is only supported on x86 and x64 systems
RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
apt-get update && apt-get install -y syslinux; \
apt-get update && apt-get install -y \
syslinux \
grub2; \
fi
# Package needed for mdns-repeater
@ -311,12 +312,15 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
fi
# Packages needed for building vmware and GCE images
RUN apt-get update && apt-get install -y \
# This is only supported on i386 and amd64 platforms
RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
apt-get update && apt-get install -y \
kpartx \
parted \
udev \
grub-pc \
grub2-common
grub2-common; \
fi
# Packages needed for vyos-cloud-init
RUN apt-get update && apt-get install -y \