diff options
| author | neofright <rockbox_dev123@fastmail.com> | 2024-12-05 21:57:09 +0000 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2024-12-06 07:55:21 -0500 |
| commit | f895167345d238d9fa0080136da583c874b02a53 (patch) | |
| tree | 30fbb1a28035e91c14cf5895dba4ff6598614a71 | |
| parent | 80c9d71556503d09d33a15f3a784eaa900fe48ff (diff) | |
| download | rockbox-f895167345.tar.gz rockbox-f895167345.zip | |
Update Dockerfile for Debian 12
Change-Id: Iefbcb6f0c6869826b9ceec479eeb2c86b5d0bdcf
| -rwxr-xr-x | tools/configure | 2 | ||||
| -rw-r--r-- | tools/docker_rbclient/Dockerfile | 38 |
2 files changed, 18 insertions, 22 deletions
diff --git a/tools/configure b/tools/configure index d37a62903c..0a25d48bc3 100755 --- a/tools/configure +++ b/tools/configure @@ -435,7 +435,7 @@ simcc () { # generic ${sdl_config} checker sdlccopts=$($sdl --cflags) if $sdl --static-libs > /dev/null 2>&1 ; then - sdlldopts=$($sdl --static-libs) + sdlldopts=$(CC="$CC" $sdl --static-libs) else echo "Your ${sdl_config} does not know about static libs, falling back to shared library" sdlldopts=$($sdl --libs) diff --git a/tools/docker_rbclient/Dockerfile b/tools/docker_rbclient/Dockerfile index ede5455db8..83348c6ebf 100644 --- a/tools/docker_rbclient/Dockerfile +++ b/tools/docker_rbclient/Dockerfile @@ -1,12 +1,12 @@ -FROM debian:9 +FROM debian:12 WORKDIR /home/rb ENV HOME /home/rb -ENV MAKEFLAGS -j12 +ENV MAKEFLAGS -j$(nproc) -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -y \ build-essential \ git \ perl \ @@ -15,6 +15,8 @@ RUN apt-get update && \ flex \ bison \ bzip2 \ + gettext \ + gtk-doc-tools \ gzip \ zip \ patch \ @@ -24,9 +26,9 @@ RUN apt-get update && \ autoconf \ libmpc-dev \ gawk \ - python \ - python-lzo \ - python-setuptools \ + python3 \ + python3-lzo \ + python3-setuptools \ mtd-utils \ xorriso \ wget \ @@ -38,29 +40,23 @@ RUN apt-get update && \ tex4ht \ texlive-fonts-recommended \ lmodern \ - latex-xcolor \ texlive-base \ libsdl1.2-dev \ - libsdl1.2debian + libsdl1.2debian \ + libsdl2-dev RUN cd /home/rb && git clone git://git.rockbox.org/rockbox -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="s" -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="m" -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="a" -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="i" -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="x" -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="y" +RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="m a i x y" -# compile sometimes fails; place this last to avoid duplicate work -RUN cd /home/rb/rockbox && ./tools/rockboxdev.sh --target="r" +ENV PATH="/tmp/local/bin:$PATH" RUN cd /home/rb/rockbox && \ - wget "http://git.rockbox.org/?p=www.git;a=blob_plain;f=buildserver/rbclient.pl;hb=HEAD" -O rbclient.pl && \ + wget "https://git.rockbox.org/cgit/www.git/plain/buildserver/rbclient.pl" -O rbclient.pl && \ chmod +x rbclient.pl -COPY runclient_modified.sh /home/rb/rockbox/runclient.sh - -RUN cd /home/rb/rockbox && chmod +x runclient.sh +RUN cd /home/rb/rockbox && \ + wget "https://git.rockbox.org/cgit/www.git/plain/buildserver/runclient.sh" -O runclient.sh && \ + chmod +x runclient.sh CMD cd /home/rb/rockbox && ./runclient.sh $USER $PASS $NAME |