Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
kciarch: [ 'arc', 'arm', 'armv5', 'arm64', 'x86', 'mips', 'riscv64' ]
kcicmd: [ 'clang-15 kselftest kernelci',
'clang-17 kselftest kernelci',
'gcc-12 kselftest kernelci'
'gcc-14 kselftest kernelci'
]
exclude:
- kciarch: 'arc'
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kcicmd: [ 'gcc-12 kunit kernelci --arch x86',
kcicmd: [ 'gcc-14 kunit kernelci --arch x86',
'rustc-1.74 kselftest kernelci --arch x86',
'rustc-1.75 kselftest kernelci --arch x86',
'kernelci',
Expand Down
2 changes: 1 addition & 1 deletion config/docker/base/debian.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Author: Alexandra Pereira <alexandra.pereira@collabora.com>
-#}

FROM mirror.gcr.io/debian:bookworm
FROM mirror.gcr.io/debian:trixie
MAINTAINER "KernelCI TSC" <kernelci-tsc@groups.io>
ENV DEBIAN_FRONTEND=noninteractive

Expand Down
16 changes: 6 additions & 10 deletions config/docker/base/host-tools.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ RUN echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries

# Prepare environment for building packages
#RUN sed -i -- 's/# deb-src/deb-src/g' /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian bookworm main non-free contrib" \
RUN echo "deb-src http://deb.debian.org/debian trixie main non-free contrib" \
>> /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian-security/ bookworm-security main contrib non-free" \
RUN echo "deb-src http://deb.debian.org/debian-security/ trixie-security main contrib non-free" \
>> /etc/apt/sources.list
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
Expand All @@ -33,19 +33,19 @@ WORKDIR /root/patches
# Get patch to enable compression
#ADD https://raw.githubusercontent.com/kernelci/kernelci-core/\
#kernelci.org/\
#config/docker/data/kmod_kci_bookworm.patch \
#config/docker/data/kmod_kci_trixie.patch \
#.
ADD https://raw.githubusercontent.com/kernelci/kernelci-core/main/config/docker/data/kmod_kci_bookworm.patch \
ADD https://raw.githubusercontent.com/kernelci/kernelci-core/main/config/docker/data/kmod_kci_trixie.patch \
.

RUN apt-get source kmod
WORKDIR /root/patches/kmod-30+20221128
RUN patch -p1 < ../kmod_kci_bookworm.patch
RUN patch -p1 < ../kmod_kci_trixie.patch
RUN mk-build-deps -ir \
-t "apt-get -o Debug::pkgProblemResolver=yes -y --no-install-recommends"
RUN debuild -b -uc -us

FROM mirror.gcr.io/debian:bookworm
FROM mirror.gcr.io/debian:trixie
MAINTAINER "KernelCI TSC" <kernelci-tsc@groups.io>
ENV DEBIAN_FRONTEND=noninteractive
{%- endblock %}
Expand Down Expand Up @@ -95,10 +95,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
# Install dtschema for dtbs_check
RUN pip3 install dtschema --break-system-packages

# Install gcovr from pip as bookworm's version is too old
# FIXME: revert to installing with apt after switching to trixie
RUN pip3 install gcovr --break-system-packages

# Download and build pahole v1.28
RUN wget -c https://storage.kernelci.org/pahole-1.29.tar.gz && \
tar -xzf pahole-1.29.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion config/docker/clang-11-arm.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armhf

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armhf
libgcc-14-dev:armhf

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-11-arm64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture arm64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:arm64
libgcc-14-dev:arm64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-11-armv5.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armel

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armel
libgcc-14-dev:armel

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-11-riscv64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ super() }}

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev-riscv64-cross
libgcc-14-dev-riscv64-cross

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-11-x86.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture amd64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:amd64
libgcc-14-dev:amd64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-12.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block packages %}
{{ super() }}
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-12 main' \
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-12 main' \
>> /etc/apt/sources.list.d/clang.list

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
2 changes: 1 addition & 1 deletion config/docker/clang-13.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block packages %}
{{ super() }}
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-13 main' \
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-13 main' \
>> /etc/apt/sources.list.d/clang.list

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
2 changes: 1 addition & 1 deletion config/docker/clang-14-arm.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armhf

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armhf
libgcc-14-dev:armhf

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-14-arm64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture arm64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:arm64
libgcc-14-dev:arm64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-14-armv5.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armel

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armel
libgcc-14-dev:armel

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-14-riscv64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ super() }}

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev-riscv64-cross
libgcc-14-dev-riscv64-cross

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-14-x86.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture amd64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:amd64
libgcc-14-dev:amd64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-14.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block packages %}
{{ super() }}
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-14 main' \
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-14 main' \
>> /etc/apt/sources.list.d/clang.list

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
2 changes: 1 addition & 1 deletion config/docker/clang-15-arm.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armhf

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armhf
libgcc-14-dev:armhf

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-15-arm64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture arm64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:arm64
libgcc-14-dev:arm64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-15-armv5.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armel

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armel
libgcc-14-dev:armel

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-15-riscv64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ super() }}

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev-riscv64-cross
libgcc-14-dev-riscv64-cross

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-15-x86.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture amd64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:amd64
libgcc-14-dev:amd64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-15.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block packages %}
{{ super() }}
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-15 main' \
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-15 main' \
>> /etc/apt/sources.list.d/clang.list

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
2 changes: 1 addition & 1 deletion config/docker/clang-16-arm.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armhf

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armhf
libgcc-14-dev:armhf

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-16-arm64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture arm64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:arm64
libgcc-14-dev:arm64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-16-armv5.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armel

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armel
libgcc-14-dev:armel

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-16-riscv64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ super() }}

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev-riscv64-cross
libgcc-14-dev-riscv64-cross

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-16-x86.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture amd64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:amd64
libgcc-14-dev:amd64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-16.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block packages %}
{{ super() }}
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-16 main' \
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-16 main' \
>> /etc/apt/sources.list.d/clang.list

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
2 changes: 1 addition & 1 deletion config/docker/clang-17-arm.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armhf

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armhf
libgcc-14-dev:armhf

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-17-arm64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture arm64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:arm64
libgcc-14-dev:arm64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-17-armv5.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture armel

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:armel
libgcc-14-dev:armel

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-17-riscv64.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ super() }}

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev-riscv64-cross
libgcc-14-dev-riscv64-cross

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-17-x86.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RUN dpkg --add-architecture amd64

RUN apt-get update && apt-get install --no-install-recommends -y \
libgcc-12-dev:amd64
libgcc-14-dev:amd64

{%- endblock %}

2 changes: 1 addition & 1 deletion config/docker/clang-17.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block packages %}
{{ super() }}
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-17 main' \
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-17 main' \
>> /etc/apt/sources.list.d/clang.list

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
6 changes: 3 additions & 3 deletions config/docker/dt-validation.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
ENV PIP_BREAK_SYSTEM_PACKAGES=1

RUN apt-get update && apt-get install --no-install-recommends -y \
gcc-12 \
gcc-12-plugin-dev \
gcc-14 \
gcc-14-plugin-dev \
git \
python3-dev \
python3-pip \
Expand All @@ -20,7 +20,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
swig

RUN update-alternatives --install \
/usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/gcc-12 500
/usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/gcc-14 500

RUN pip3 install \
git+https://github.com/devicetree-org/dt-schema.git@master
Expand Down
File renamed without changes.
Loading