From 47aa0b40109a9381e0d8ac359348829edb0f15ed Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Fri, 26 May 2023 03:09:21 -0700 Subject: [PATCH 1/3] update cookbook SHA, correct bootstrap and containerfile libraries --- bootstrap.sh | 7 +++++-- cookbook | 2 +- podman/redox-base-containerfile | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index a06497f..658a62f 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 libpng m4 pkgconf po4a syslinux meson python python-mako make xdg-utils zip unzip llvm clang perl doxygen" + packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libtool libpng libjpeg-turbo sdl12-compat 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 @@ -242,6 +242,9 @@ ubuntu() libfuse-dev \ libgmp-dev \ libpng-dev \ + libjpeg-dev \ + libsdl1.2-dev \ + libsdl2-ttf-dev \ libhtml-parser-perl \ libtool \ m4 \ @@ -308,7 +311,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 libpng-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) + PKGS=$(for pkg in file autoconf vim bison flex genisoimage gperf glibc-devel.i686 expat expat-devel fuse-devel fuse3-devel gmp-devel libpng-devel perl perl-HTML-Parser libtool libjpeg-turbo-devel SDL2_ttf-devel sdl12-compat=devel 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/cookbook b/cookbook index 883ed58..2a83ae3 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 883ed58ee353dcbd8b948e1293c91393e8f559ef +Subproject commit 2a83ae3ad98cf17b1e0158ffba4df93af860846d diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index eb3c7d4..6bfa691 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -23,7 +23,9 @@ RUN apt-get update \ libhtml-parser-perl \ libtool \ libfontconfig1-dev \ - libpng-dev + libpng-dev \ + libsdl2-ttf-dev \ + libsdl1.2-dev \ m4 \ nasm \ pkg-config \ From f4ac3742d5498982f331cdc9ef9ef64a8ec637de Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Fri, 26 May 2023 18:01:36 -0700 Subject: [PATCH 2/3] correct typo in Fedora libraries --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 658a62f..30be853 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -311,7 +311,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 libpng-devel perl perl-HTML-Parser libtool libjpeg-turbo-devel SDL2_ttf-devel sdl12-compat=devel 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) + PKGS=$(for pkg in file autoconf vim bison flex genisoimage gperf glibc-devel.i686 expat expat-devel fuse-devel fuse3-devel gmp-devel libpng-devel perl perl-HTML-Parser libtool libjpeg-turbo-devel SDL2_ttf-devel sdl12-compat-devel 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 From a970e0620f7e33c93ef17c78fdd30af127a0c564 Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Fri, 26 May 2023 18:11:40 -0700 Subject: [PATCH 3/3] fix error in containerfile --- podman/redox-base-containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 6bfa691..657ce17 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -24,6 +24,7 @@ RUN apt-get update \ libtool \ libfontconfig1-dev \ libpng-dev \ + libjpeg-dev \ libsdl2-ttf-dev \ libsdl1.2-dev \ m4 \