Skip to content

Commit 34e659e

Browse files
BownairoDFINITYManu
authored andcommitted
Squashed commit of the following:
commit 262826f Author: Eero Kelly <eero.kelly@dfinity.org> Date: Wed Oct 23 15:24:19 2024 +0000 Use 6.11 base images commit 4dae196 Author: Eero Kelly <eero.kelly@dfinity.org> Date: Wed Oct 23 15:24:08 2024 +0000 Try using 6.11 kernel
1 parent cb3cb61 commit 34e659e

File tree

4 files changed

+29
-3
lines changed

4 files changed

+29
-3
lines changed

ic-os/guestos/context/Dockerfile.base

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ RUN cd /tmp/ && \
4141
echo "fbadb376afa7c883f87f70795700a8a200f7fd45412532cc1938a24d41078011 node_exporter-1.8.1.linux-amd64.tar.gz" > node_exporter.sha256 && \
4242
shasum -c node_exporter.sha256
4343

44+
# Download 6.11 kernel and modules
45+
RUN cd /tmp/ && \
46+
curl -L -O http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
47+
curl -L -O http://mirrors.kernel.org/ubuntu/pool/main/l/linux-signed/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
48+
curl -L -O http://mirrors.kernel.org/ubuntu/pool/main/l/linux-meta/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb && \
49+
echo "d4cd2d97fcca81b57bec947b0e8ca004d556afce1d13f5cebe5d677c0445c6a2 linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb" >> kernel.sha256 && \
50+
echo "241811191691c68e0874519ee71bda9de39e23510dee5e5512150db874f5b285 linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb" >> kernel.sha256 && \
51+
echo "5c31c7e0d996ebc0928c5e1ad3b80fea047b56dfbbdaa759f7e7a70b1c42f10e linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb" >> kernel.sha256 && \
52+
shasum -c kernel.sha256
4453

4554
#
4655
# Second build stage:
@@ -81,3 +90,16 @@ RUN cd /tmp/ && \
8190
mkdir -p /etc/node_exporter && \
8291
tar --strip-components=1 -C /usr/local/bin/ -zvxf node_exporter-1.8.1.linux-amd64.tar.gz node_exporter-1.8.1.linux-amd64/node_exporter && \
8392
rm /tmp/node_exporter-1.8.1.linux-amd64.tar.gz
93+
94+
# Install 6.11 kernel
95+
COPY --from=download /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb
96+
COPY --from=download /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb
97+
COPY --from=download /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb
98+
99+
RUN cd /tmp/ && \
100+
dpkg -i /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
101+
dpkg -i /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
102+
dpkg -i /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb && \
103+
rm /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
104+
rm /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
105+
rm /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb

ic-os/guestos/context/docker-base.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/dfinity/guestos-base-dev@sha256:8a0b0eb1d92df090f47c653307ccd8a537bf2d83de94f39c3aacca0ff6743074
1+
ghcr.io/dfinity/guestos-base-dev@sha256:e5ed9b6e079e93ab6fafb1abdce6387d76f6a74331511817c98cfa93d3cf61d2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/dfinity/guestos-base@sha256:618c1c4755af3fa30357350d983c89dbd8999ea61fb1cf31707a44f62d4b3161
1+
ghcr.io/dfinity/guestos-base@sha256:50017277cd6363ec0dbe6d5ce44aff252598e7c303638a0bb0a5f612692c0dd4

ic-os/guestos/context/packages.common

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
# image only.
66

77
# Need kernel to boot anything
8-
linux-image-virtual-hwe-24.04
98
initramfs-tools
109

10+
# Resolve some dependencies manualy for 6.11
11+
kmod
12+
linux-base
13+
wireless-regdb
14+
1115
# Need systemd for boot process
1216
systemd
1317
systemd-sysv

0 commit comments

Comments
 (0)