From e94ddce3bc7f6f87cf6a799c25a0253e5152f038 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 18 May 2023 23:58:33 +0000 Subject: [PATCH 1/2] Remove unused packages --- bootstrap.sh | 10 ++-------- podman/redox-base-containerfile | 6 ------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 319b259..45dfe25 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 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" + packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libtool m4 pkgconf po4a syslinux meson python python-mako make xdg-utils zip unzip llvm clang perl" if [ "$1" == "qemu" ]; then packages="$packages qemu" elif [ "$1" == "virtualbox" ]; then @@ -242,19 +242,13 @@ ubuntu() libfuse-dev \ libgmp-dev \ libhtml-parser-perl \ - libpng-dev \ libtool \ - libjpeg-dev \ - libvorbis-dev \ - libsdl2-ttf-dev \ - libosmesa6-dev \ m4 \ nasm \ pkg-config \ po4a \ syslinux-utils \ texinfo \ - libsdl1.2-dev \ ninja-build \ meson \ python3-mako \ @@ -312,7 +306,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 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) + 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 libtool m4 nasm po4a syslinux texinfo 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 63ddf04..c4326d6 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -21,12 +21,7 @@ RUN apt-get update \ libfuse-dev \ libgmp-dev \ libhtml-parser-perl \ - libpng-dev \ libtool \ - libjpeg-dev \ - libvorbis-dev \ - libsdl2-ttf-dev \ - libosmesa6-dev \ libfontconfig1-dev \ m4 \ nasm \ @@ -34,7 +29,6 @@ RUN apt-get update \ po4a \ syslinux-utils \ texinfo \ - libsdl1.2-dev \ ninja-build \ meson \ python3-mako \ From 9e6c078a9755f6c06768a558c5da72af9f96c2f7 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Fri, 19 May 2023 07:29:29 +0000 Subject: [PATCH 2/2] Add doxygen package --- bootstrap.sh | 7 ++++--- podman/redox-base-containerfile | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 45dfe25..a2fdd6c 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 autoconf curl file expat gmp libtool m4 pkgconf po4a syslinux meson python python-mako make xdg-utils zip unzip llvm clang perl" + packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libtool m4 pkgconf po4a syslinux meson python python-mako make xdg-utils zip unzip llvm clang perl doxygen" if [ "$1" == "qemu" ]; then packages="$packages qemu" elif [ "$1" == "virtualbox" ]; then @@ -259,7 +259,8 @@ ubuntu() unzip \ llvm \ clang \ - perl + perl \ + doxygen if [ "$1" == "qemu" ]; then if [ -z "$(which qemu-system-x86_64)" ]; then echo "Installing QEMU..." @@ -306,7 +307,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 perl-HTML-Parser libtool m4 nasm po4a syslinux texinfo 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) + 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 libtool m4 nasm po4a syslinux texinfo 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 doxygen ; 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 c4326d6..d5d80f9 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -42,7 +42,8 @@ RUN apt-get update \ unzip \ llvm \ clang \ - perl + perl \ + doxygen # _UID_ must be replaced with the user's uid on host # podman root is mapped to your user id on host during build,