diff options
| author | Ruben Beltran del Rio <jj@r.bdr.sh> | 2026-03-23 20:52:55 +0100 |
|---|---|---|
| committer | Rubén Beltrán del Río <jj@r.bdr.sh> | 2026-04-05 21:21:51 +0200 |
| commit | d9245d341ed1f258a3dd1073cdfa656115c5b26d (patch) | |
| tree | 17145053f56cd7a3c99377583b8b3a738931422d /build-containers/trixie | |
| parent | 462d1458c0058ba9d41d6dc7538f6004b3de3c3e (diff) | |
Adapt rest of packaging to use mesonmeson
Diffstat (limited to 'build-containers/trixie')
| -rw-r--r-- | build-containers/trixie/Containerfile | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/build-containers/trixie/Containerfile b/build-containers/trixie/Containerfile index 904de18..46c2111 100644 --- a/build-containers/trixie/Containerfile +++ b/build-containers/trixie/Containerfile @@ -3,12 +3,16 @@ FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y \ - make \ - clang \ - lld \ + debhelper-compat \ + equivs \ + meson \ + desktop-file-utils \ + appstream-util \ curl \ + ca-certificates \ tar \ gzip \ + file \ gettext \ libgtk-4-dev \ libadwaita-1-dev \ @@ -20,7 +24,24 @@ RUN apt-get update && apt-get install -y \ # Install rust toolchain RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" +ENV RUSTUP_TOOLCHAIN=stable -# Install cargo-deb -RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \ - && cargo binstall cargo-deb --no-confirm +RUN apt-get install -y --no-install-recommends equivs && \ + mkdir -p /tmp/equivs && cd /tmp/equivs && \ + cat > rust-rustup.control <<'EOF' +Section: misc +Priority: optional +Standards-Version: 4.7.4 +Package: rust-rustup +Version: 1.92.0 +Provides: rustc (= 1.92.0), cargo (= 1.92.0) +Description: Dummy package claiming rustc/cargo are provided by rustup. + This package exists solely to satisfy dpkg Build-Depends checks to + create the binary package from the source package. +EOF + +RUN cd /tmp/equivs && \ + equivs-build rust-rustup.control && \ + dpkg -i rust-rustup_1.92.0_all.deb && \ + rm -rf /tmp/equivs && \ + apt-get remove -y equivs && apt-get autoremove -y && apt-get clean |