diff --git a/config/core/build-configs.yaml b/config/core/build-configs.yaml index 169aae3c10..32f2e04aa7 100644 --- a/config/core/build-configs.yaml +++ b/config/core/build-configs.yaml @@ -715,12 +715,6 @@ build_environments: cc_version: 17 arch_params: *clang_15_arch_params - rustc-1.73: - cc: clang - cc_version: 17 - arch_params: - x86_64: *x86_64_params - rustc-1.74: cc: clang cc_version: 17 diff --git a/config/docker/rustc-1.73-x86.jinja2 b/config/docker/rustc-1.73-x86.jinja2 deleted file mode 100644 index 9dbd723010..0000000000 --- a/config/docker/rustc-1.73-x86.jinja2 +++ /dev/null @@ -1,9 +0,0 @@ -{%- set sub_arch = 'amd64' %} -{% extends 'rustc-1.73.jinja2' %} - -{% block packages %} -{{ super() }} - -RUN dpkg --add-architecture amd64 - -{%- endblock %} diff --git a/config/docker/rustc-1.73.jinja2 b/config/docker/rustc-1.73.jinja2 deleted file mode 100644 index e7433f1c0f..0000000000 --- a/config/docker/rustc-1.73.jinja2 +++ /dev/null @@ -1,43 +0,0 @@ -{% extends 'clang-17.jinja2' %} - -{% block packages %} -{{ super() }} - -ARG RUST_VER=1.73.0 -ARG BINDGEN_VER=0.65.1 - -ARG RUST_TRIPLE=rust-${RUST_VER}-x86_64-unknown-linux-gnu - -ENV CARGO_HOME=/home/kernelci/.cargo -ENV PATH=/usr/${RUST_TRIPLE}/bin:${CARGO_HOME}/bin:${PATH} - -ARG SHA256SUM=aa4cf0b7e66a9f5b7c623d4b340bb1ac2864a5f2c2b981f39f796245dc84f2cb - -# fetch, verify the toolchain -RUN wget https://static.rust-lang.org/dist/${RUST_TRIPLE}.tar.gz && \ - echo "${SHA256SUM} ${RUST_TRIPLE}.tar.gz" | sha256sum --check --quiet - -# install & cleanup tmp files -RUN tar -xf ${RUST_TRIPLE}.tar.gz -C /tmp/ && \ - /tmp/${RUST_TRIPLE}/install.sh --prefix=/usr/${RUST_TRIPLE} \ - --components=rustc,cargo,rust-std-x86_64-unknown-linux-gnu && \ - rm -rf /tmp/${RUST_TRIPLE} && \ - rm /${RUST_TRIPLE}* - -# This image is based on clang-*jinja2 which only has clang installed, but rustc -# defaults to linker "cc" which usually points to the GNU/GCC stack. Pointing cc -# to clang ensures both cargo and kernel build rustc invocations use llvm/clang. -RUN update-alternatives --install /usr/bin/cc cc $(which clang) 30 && \ - update-alternatives --set cc $(which clang) - -RUN git clone --recurse-submodules --branch $RUST_VER \ - https://github.com/rust-lang/rust \ - $(rustc --print sysroot)/lib/rustlib/src/rust - -RUN cargo install --locked --version ${BINDGEN_VER} bindgen-cli - -# kernel build generates some rust code and tries to format it, if rustfmt is -# missing it will print non-fatal error noise -RUN cargo install rustfmt - -{%- endblock %}