From 827ee06fd7c53ba01f45df8bc14e4e2f02408110 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 11 May 2023 17:07:57 +0000 Subject: [PATCH] Add packages --- bootstrap.sh | 16 +++++++++++++--- podman/redox-base-containerfile | 12 +++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 5f156ce..d70721f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -195,7 +195,7 @@ freebsd() archLinux() { 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 packages="$packages qemu" elif [ "$1" == "virtualbox" ]; then @@ -257,7 +257,17 @@ ubuntu() libsdl1.2-dev \ ninja-build \ meson \ - python3-mako + python3-mako \ + python3 \ + make \ + xdg-utils \ + zip \ + unzip \ + llvm \ + clang \ + perl \ + lua \ + luajit if [ "$1" == "qemu" ]; then if [ -z "$(which qemu-system-x86_64)" ]; then echo "Installing QEMU..." @@ -304,7 +314,7 @@ fedora() fi fi # Use rpm -q 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 COUNT=$(echo $PKGS | wc -w) if [ $COUNT -ne 0 ]; then diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index d8ab161..acfeef5 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -40,7 +40,17 @@ RUN apt-get update \ python3-mako \ xxd \ 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 # podman root is mapped to your user id on host during build,