vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make libc6-dev-i386 and syslinux-utils required only on x86 hosts because they aren't exist in ubuntu arm repos

Browse source
This commit is contained in:
uuuvn 2023-06-05 17:09:04 +00:00
parent 7ce1b6d50a
commit 417c417588
No known key found for this signature in database
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrap.sh
View file

@ -311,8 +311,7 @@ ubuntu()
echo "Updating system..." echo "Updating system..."
sudo "$2" update sudo "$2" update
echo "Installing required packages..." echo "Installing required packages..."
sudo "$2" install \ pkgs="autoconf \
autoconf \
autopoint \ autopoint \
bison \ bison \
build-essential \ build-essential \
@ -324,7 +323,6 @@ ubuntu()
genisoimage \ genisoimage \
git \ git \
gperf \ gperf \
libc6-dev-i386 \
libexpat-dev \ libexpat-dev \
libfuse-dev \ libfuse-dev \
libgmp-dev \ libgmp-dev \
@ -341,7 +339,6 @@ ubuntu()
scons \ scons \
pkg-config \ pkg-config \
po4a \ po4a \
syslinux-utils \
texinfo \ texinfo \
ninja-build \ ninja-build \
meson \ meson \
@ -354,7 +351,12 @@ ubuntu()
llvm \ llvm \
clang \ clang \
perl \ 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 [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..." echo "Installing QEMU..."
@ -713,6 +715,7 @@ elif [ "$1" == "-s" ]; then
exit exit
fi fi
host_arch=$(uname -m)
emulator="qemu" emulator="qemu"
defpackman="apt-get" defpackman="apt-get"
dependenciesonly=false dependenciesonly=false