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

Merge branch 'master' into 'master'

Browse source 
Add packages

See merge request redox-os/redox!1334
This commit is contained in:
Jeremy Soller 2023-05-11 17:07:57 +00:00
commit 93e81d1023
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bootstrap.sh
View file

@ -195,7 +195,7 @@ freebsd()
archLinux() archLinux()
{ {
echo "Detected Arch Linux" echo "Detected Arch Linux"
packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a" 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"
if [ "$1" == "qemu" ]; then if [ "$1" == "qemu" ]; then
packages="$packages qemu" packages="$packages qemu"
elif [ "$1" == "virtualbox" ]; then elif [ "$1" == "virtualbox" ]; then
@ -257,7 +257,17 @@ ubuntu()
libsdl1.2-dev \ libsdl1.2-dev \
ninja-build \ ninja-build \
meson \ meson \
python3-mako python3-mako \
python3 \
make \
xdg-utils \
zip \
unzip \
llvm \
clang \
perl \
lua \
luajit
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..."
@ -304,7 +314,7 @@ fedora()
fi fi
fi fi
# Use rpm -q <package> to check if it's already installed # Use rpm -q <package> to check if it's already installed
PKGS=$(for pkg in file autoconf vim bison flex genisoimage gperf glibc-devel.i686 expat expat-devel fuse-devel fuse3-devel gmp-devel perl-HTML-Parser libpng-devel libtool libjpeg-turbo-devel libvorbis-devel SDL2_ttf-devel mesa-libOSMesa-devel m4 nasm po4a syslinux texinfo sdl12-compat-devel ninja-build meson python3-mako make gcc gcc-c++ openssl patch automake perl-Pod-Html perl-FindBin gperf curl gettext-devel perl-Pod-Xhtml pkgconf-pkg-config cmake; do rpm -q $pkg > /dev/null || echo $pkg; done) PKGS=$(for pkg in file autoconf vim bison flex genisoimage gperf glibc-devel.i686 expat expat-devel fuse-devel fuse3-devel gmp-devel perl perl-HTML-Parser libpng-devel libtool libjpeg-turbo-devel libvorbis-devel SDL2_ttf-devel mesa-libOSMesa-devel m4 nasm po4a syslinux texinfo sdl12-compat-devel ninja-build meson python3-mako make gcc gcc-c++ openssl patch automake perl-Pod-Html perl-FindBin gperf curl gettext-devel perl-Pod-Xhtml pkgconf-pkg-config cmake llvm zip unzip lua luajit make clang ; do rpm -q $pkg > /dev/null || echo $pkg; done)
# If the list of packages is not empty, install missing # If the list of packages is not empty, install missing
COUNT=$(echo $PKGS | wc -w) COUNT=$(echo $PKGS | wc -w)
if [ $COUNT -ne 0 ]; then if [ $COUNT -ne 0 ]; then

12
podman/redox-base-containerfile
View file

@ -40,7 +40,17 @@ RUN apt-get update \
python3-mako \ python3-mako \
xxd \ xxd \
rsync \ rsync \
wget wget \
python3 \
make \
xdg-utils \
zip \
unzip \
llvm \
clang \
perl \
lua \
luajit
# _UID_ must be replaced with the user's uid on host # _UID_ must be replaced with the user's uid on host
# podman root is mapped to your user id on host during build, # podman root is mapped to your user id on host during build,