Merge branch 'master' into 'master'

Remove Lua packages

See merge request redox-os/redox!1336
This commit is contained in:
Jeremy Soller 2023-05-11 22:31:26 +00:00
commit f169c355a6
2 changed files with 3 additions and 7 deletions

View file

@ -195,7 +195,7 @@ freebsd()
archLinux()
{
echo "Detected Arch Linux"
packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libpng libtool libjpeg-turbo libvorbis sdla2_ttf m4 pkgconf po4a syslinux sdl12-compat meson python python-mako make xdg-utils zip unzip llvm clang perl lua luajit"
packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libpng libtool libjpeg-turbo libvorbis sdla2_ttf m4 pkgconf po4a syslinux sdl12-compat meson python python-mako make xdg-utils zip unzip llvm clang perl"
if [ "$1" == "qemu" ]; then
packages="$packages qemu"
elif [ "$1" == "virtualbox" ]; then
@ -265,9 +265,7 @@ ubuntu()
unzip \
llvm \
clang \
perl \
lua \
luajit
perl
if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."

View file

@ -48,9 +48,7 @@ RUN apt-get update \
unzip \
llvm \
clang \
perl \
lua \
luajit
perl
# _UID_ must be replaced with the user's uid on host
# podman root is mapped to your user id on host during build,