Skip to content

Commit c058e53

Browse files
committed
dockerfile: upgrade ubuntu to noble
We need a newer meson for the cross build. Signed-off-by: Daniel Wagner <wagi@kernel.org>
1 parent f69ec01 commit c058e53

3 files changed

+22
-13
lines changed

Dockerfile.ubuntu.armhf

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
22

33
ARG TARGETPLATFORM
44
ARG DEBIAN_FRONTEND=noninteractive
55
ENV LANG=en_US.utf8
6-
RUN dpkg --add-architecture armhf && \
7-
sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list && \
8-
echo "deb [arch=armhf] http://ports.ubuntu.com/ jammy main universe restricted" > /etc/apt/sources.list.d/armhf.list && \
9-
echo "deb [arch=armhf] http://ports.ubuntu.com/ jammy-updates main universe restricted" >> /etc/apt/sources.list.d/armhf.list && \
6+
RUN dpkg --add-architecture armhf &&
7+
rm /etc/apt/sources.list.d/ubuntu.sources && \
8+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse" > /etc/apt/sources.list && \
9+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
10+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse" >> /etc/apt/sources.list && \
11+
echo "deb [arch=armhf] http://ports.ubuntu.com/ noble main universe restricted" >> /etc/apt/sources.list && \
12+
echo "deb [arch=armhf] http://ports.ubuntu.com/ noble-updates main universe restricted" >> /etc/apt/sources.list && \
1013
apt-get update && \
1114
apt-get install -y locales && \
1215
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \

Dockerfile.ubuntu.ppc64le

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
22

33
ARG TARGETPLATFORM
44
ARG DEBIAN_FRONTEND=noninteractive
55
ENV LANG=en_US.utf8
66
RUN dpkg --add-architecture ppc64el && \
7-
sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list && \
8-
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ jammy main universe restricted" > /etc/apt/sources.list.d/ppc64le.list && \
9-
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ jammy-updates main universe restricted" >> /etc/apt/sources.list.d/ppc64le.list && \
7+
rm /etc/apt/sources.list.d/ubuntu.sources && \
8+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse" > /etc/apt/sources.list && \
9+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
10+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse" >> /etc/apt/sources.list && \
11+
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ noble main universe restricted" >> /etc/apt/sources.list && \
12+
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ noble-updates main universe restricted" >> /etc/apt/sources.list && \
1013
apt-get update && \
1114
apt-get install -y locales && \
1215
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \

Dockerfile.ubuntu.s390x

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
22

33
ARG TARGETPLATFORM
44
ARG DEBIAN_FRONTEND=noninteractive
55
ENV LANG=en_US.utf8
66
RUN dpkg --add-architecture s390x && \
7-
sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list && \
8-
echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy main universe restricted" > /etc/apt/sources.list.d/armhf.list && \
9-
echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy-updates main universe restricted" >> /etc/apt/sources.list.d/armhf.list && \
7+
rm /etc/apt/sources.list.d/ubuntu.sources && \
8+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse" > /etc/apt/sources.list && \
9+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
10+
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-security main restricted universe multiverse" >> /etc/apt/sources.list && \
11+
echo "deb [arch=s390x] http://ports.ubuntu.com/ noble main universe restricted" >> /etc/apt/sources.list && \
12+
echo "deb [arch=s390x] http://ports.ubuntu.com/ noble-updates main universe restricted" >> /etc/apt/sources.list && \
1013
apt-get update && \
1114
apt-get install -y locales && \
1215
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \

0 commit comments

Comments
 (0)