Skip to content

Commit

Permalink
Make libc6-dev-i386 and syslinux-utils required only on x86 hosts bec…
Browse files Browse the repository at this point in the history
…ause they aren't exist in ubuntu arm repos
  • Loading branch information
uuuvn committed Jun 6, 2023
1 parent 7ce1b6d commit 417c417
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,7 @@ ubuntu()
echo "Updating system..."
sudo "$2" update
echo "Installing required packages..."
sudo "$2" install \
autoconf \
pkgs="autoconf \
autopoint \
bison \
build-essential \
Expand All @@ -324,7 +323,6 @@ ubuntu()
genisoimage \
git \
gperf \
libc6-dev-i386 \
libexpat-dev \
libfuse-dev \
libgmp-dev \
Expand All @@ -341,7 +339,6 @@ ubuntu()
scons \
pkg-config \
po4a \
syslinux-utils \
texinfo \
ninja-build \
meson \
Expand All @@ -354,7 +351,12 @@ ubuntu()
llvm \
clang \
perl \
doxygen
doxygen"
# Not availible for at least ARM hosts
case "$host_arch" in
x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";;
esac
sudo "$2" install $pkgs
if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
Expand Down Expand Up @@ -713,6 +715,7 @@ elif [ "$1" == "-s" ]; then
exit
fi

host_arch=$(uname -m)
emulator="qemu"
defpackman="apt-get"
dependenciesonly=false
Expand Down

0 comments on commit 417c417

Please sign in to comment.