From 43037d65de637e5960b95b37d8ed6a9edab57ebb Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 22 Apr 2022 11:12:35 +0200 Subject: [PATCH 1/6] riotdocker-base: bump to 2022.04 (Jammy Jellyfish) --- riotdocker-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotdocker-base/Dockerfile b/riotdocker-base/Dockerfile index 5d7e5146..75401897 100644 --- a/riotdocker-base/Dockerfile +++ b/riotdocker-base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:jammy LABEL maintainer="Kaspar Schleiser " From 4e29c81595e34b4d0d8e7cd96e708ad45307ffeb Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 22 Apr 2022 11:17:23 +0200 Subject: [PATCH 2/6] static-test-tools: use coccinelle from ubuntu repo --- static-test-tools/Dockerfile | 11 ++--------- .../files/coccinelle_1.0.8~19.04npalix1_amd64.deb | 3 --- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb diff --git a/static-test-tools/Dockerfile b/static-test-tools/Dockerfile index d2aac8d3..d13cd4be 100644 --- a/static-test-tools/Dockerfile +++ b/static-test-tools/Dockerfile @@ -8,16 +8,12 @@ ENV DEBIAN_FRONTEND noninteractive ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 -# copy some included packages -RUN mkdir /pkgs -ARG COCCINELLE_DEB="coccinelle_1.0.8~19.04npalix1_amd64.deb" -COPY files/${COCCINELLE_DEB} /pkgs/${COCCINELLE_DEB} - RUN \ echo 'Update the package index files to latest available versions' >&2 && \ apt-get update && \ echo 'Installing static test tools' >&2 && \ apt-get -y --no-install-recommends install \ + coccinelle \ cppcheck \ doxygen \ graphviz \ @@ -28,11 +24,8 @@ RUN \ vera++ \ wget \ && \ - echo 'Installing local packages' >&2 && \ - apt-get install -y --no-install-recommends /pkgs/*.deb \ - && \ echo 'Cleaning up installation files' >&2 && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /pkgs + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install required Python packages COPY requirements.txt /tmp/requirements.txt diff --git a/static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb b/static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb deleted file mode 100644 index e8537604..00000000 --- a/static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72d929e93039deec2d04847f3e6b69916e66c1b8256816ad7dd01fca13db34b7 -size 5343420 From ec7c90a8192328be38d3f37385d05a4a0fc22965 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 22 Apr 2022 13:35:30 +0200 Subject: [PATCH 3/6] riotbuild: install python2 instead of python --- riotbuild/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index e4a9131e..70578e4e 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -75,7 +75,7 @@ RUN \ ninja-build \ parallel \ protobuf-compiler \ - python \ + python2 \ python3-setuptools \ python3-wheel \ p7zip \ From 0312debd2ac653a07674d26780ce75733cbd2c55 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 22 Apr 2022 22:18:58 +0200 Subject: [PATCH 4/6] riotbuild: bump llvm to 14 --- riotbuild/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index 70578e4e..75392e2c 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -49,7 +49,7 @@ COPY files/libsocketcan2_0.0.11-1_i386.deb /pkgs/libsocketcan2_0.0.11-1_i386.deb # allow the cleanup to actually save space. # Total size without cleaning is approximately 1.525 GB (2016-03-08) # After adding the cleanup commands the size is approximately 1.497 GB -ARG LLVM_VERSION=10 +ARG LLVM_VERSION=14 RUN \ dpkg --add-architecture i386 >&2 && \ echo 'Update the package index files to latest available versions' >&2 && \ From f0c576c2b0e47a05df1eab13a29e27ce03d042ff Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 16 Jun 2022 13:53:31 +0200 Subject: [PATCH 5/6] riotbuild: bump numpy to 1.22.4 --- riotbuild/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index 75392e2c..ef06cbe9 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -298,7 +298,7 @@ ENV PATH $PATH:/opt/riot-toolchain/msp430-elf/${RIOT_TOOLCHAIN_GCCPKGVER}/bin # install required python packages from file # numpy must be already installed before installing some other requirements (emlearn) -RUN pip3 install --no-cache-dir numpy==1.17.4 +RUN pip3 install --no-cache-dir numpy==1.22.4 COPY requirements.txt /tmp/requirements.txt RUN echo 'Installing python3 packages' >&2 \ && pip3 install --no-cache-dir pybind11 \ From 116a48d81f11c902ef401faa72b22e552af98223 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Wed, 7 Sep 2022 22:19:33 +0200 Subject: [PATCH 6/6] riotbuild: install cython3 (scikit build dependency) --- riotbuild/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index ef06cbe9..d932de8d 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -64,6 +64,7 @@ RUN \ ccache \ cmake \ curl \ + cython3 \ gcc-multilib \ gdb \ g++-multilib \