Skip to content

Commit f7607aa

Browse files
author
Staging script
committed
Staging PR 3011
1 parent b844086 commit f7607aa

43 files changed

Lines changed: 106 additions & 110 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/docker/base/debian.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Author: Alexandra Pereira <alexandra.pereira@collabora.com>
77
-#}
88

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

‎config/docker/base/host-tools.jinja2‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ RUN echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries
1313

1414
# Prepare environment for building packages
1515
#RUN sed -i -- 's/# deb-src/deb-src/g' /etc/apt/sources.list
16-
RUN echo "deb-src http://deb.debian.org/debian bookworm main non-free contrib" \
16+
RUN echo "deb-src http://deb.debian.org/debian trixie main non-free contrib" \
1717
>> /etc/apt/sources.list
18-
RUN echo "deb-src http://deb.debian.org/debian-security/ bookworm-security main contrib non-free" \
18+
RUN echo "deb-src http://deb.debian.org/debian-security/ trixie-security main contrib non-free" \
1919
>> /etc/apt/sources.list
2020
RUN apt-get update && apt-get install -y --no-install-recommends \
2121
build-essential \
@@ -33,19 +33,19 @@ WORKDIR /root/patches
3333
# Get patch to enable compression
3434
#ADD https://raw.githubusercontent.com/kernelci/kernelci-core/\
3535
#kernelci.org/\
36-
#config/docker/data/kmod_kci_bookworm.patch \
36+
#config/docker/data/kmod_kci_trixie.patch \
3737
#.
38-
ADD https://raw.githubusercontent.com/kernelci/kernelci-core/main/config/docker/data/kmod_kci_bookworm.patch \
38+
ADD https://raw.githubusercontent.com/kernelci/kernelci-core/main/config/docker/data/kmod_kci_trixie.patch \
3939
.
4040

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

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

98-
# Install gcovr from pip as bookworm's version is too old
99-
# FIXME: revert to installing with apt after switching to trixie
100-
RUN pip3 install gcovr --break-system-packages
101-
10298
# Download and build pahole v1.28
10399
RUN wget -c https://storage.kernelci.org/pahole-1.29.tar.gz && \
104100
tar -xzf pahole-1.29.tar.gz && \

‎config/docker/clang-11-arm.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RUN dpkg --add-architecture armhf
88

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

1212
{%- endblock %}
1313

‎config/docker/clang-11-arm64.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RUN dpkg --add-architecture arm64
88

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

1212
{%- endblock %}
1313

‎config/docker/clang-11-armv5.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RUN dpkg --add-architecture armel
88

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

1212
{%- endblock %}
1313

‎config/docker/clang-11-riscv64.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{ super() }}
66

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

1010
{%- endblock %}
1111

‎config/docker/clang-11-x86.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RUN dpkg --add-architecture amd64
88

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

1212
{%- endblock %}
1313

‎config/docker/clang-12.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block packages %}
44
{{ super() }}
55
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
6-
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-12 main' \
6+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-12 main' \
77
>> /etc/apt/sources.list.d/clang.list
88

99
RUN apt-get update && apt-get install --no-install-recommends -y \

‎config/docker/clang-13.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block packages %}
44
{{ super() }}
55
RUN wget -q -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
6-
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-13 main' \
6+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-13 main' \
77
>> /etc/apt/sources.list.d/clang.list
88

99
RUN apt-get update && apt-get install --no-install-recommends -y \

‎config/docker/clang-14-arm.jinja2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RUN dpkg --add-architecture armhf
88

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

1212
{%- endblock %}
1313

0 commit comments

Comments
 (0)