Merge branch 'master' into 'master'
Remove Lua packages See merge request redox-os/redox!1336
This commit is contained in:
		
						commit
						f169c355a6
					
				
					 2 changed files with 3 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -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..."
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue