From 3635efa0cc3362769557ca9217feb3792b95b63c Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:01:50 -0500 Subject: [PATCH] simplify deps, clean up rust --- Dockerfile | 12 +----------- Dockerfile.aarch64 | 1 + README.md | 1 + readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a94b2bf..c243f1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,10 +60,6 @@ RUN \ bzip2 \ cmake \ clang \ - clang-tools \ - libclang1 \ - clang-format \ - clangd \ diffutils \ doxygen \ g++ \ @@ -81,13 +77,6 @@ RUN \ libtool \ libv4l-dev \ libwayland-dev \ - libllvm-ocaml-dev \ - libllvm12 \ - llvm \ - llvm-dev \ - llvm-runtime \ - lldb \ - lld \ libx11-dev \ libx11-xcb-dev \ libxcb-dri3-dev \ @@ -787,6 +776,7 @@ RUN \ RUN \ echo "**** arrange files ****" && \ + /usr/local/lib/rustlib/uninstall.sh && ldconfig && \ mkdir -p \ /buildout/usr/local/bin \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 46a0841..18f8800 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -476,6 +476,7 @@ RUN \ RUN \ echo "**** arrange files ****" && \ + /usr/local/lib/rustlib/uninstall.sh && ldconfig && \ mkdir -p \ /buildout/usr/local/bin \ diff --git a/README.md b/README.md index b75072b..6b3a92d 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.02.24:** - Enable cuda-llvm, clean up rustc. * **01.02.24:** - Bump Mesa to v24. * **21.01.24:** - Add alsa support. * **18.01.24:** - Let the wrapper pass the ffmpeg exit code to docker run. Bump various libs. diff --git a/readme-vars.yml b/readme-vars.yml index a28a10c..e00b060 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -177,6 +177,7 @@ full_custom_readme: | ## Versions + * **08.02.24:** - Enable cuda-llvm, clean up rustc. * **01.02.24:** - Bump Mesa to v24. * **21.01.24:** - Add alsa support. * **18.01.24:** - Let the wrapper pass the ffmpeg exit code to docker run. Bump various libs.