Skip to content

Commit 985a231

Browse files
authored
Upgrade opensdk container to 22.04 and install binutils-aarch64-linux-gnu and zstd (#77)
We need both of these to be able strip the debug info out of the libraries in the SC sysroot (20.04's binutils are too old and fail on the newer `.relr.dyn` sections).
1 parent 6c970ab commit 985a231

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
UBUNTU?=22.04
2-
OPENSDK_UBUNTU?=20.04
2+
OPENSDK_UBUNTU?=22.04
33
DEBIAN?=bookworm
44

55
DS?=trixie

opensdk/ubuntu/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPENSDK_UBUNTU=20.04
1+
ARG OPENSDK_UBUNTU=22.04
22
FROM ubuntu:${OPENSDK_UBUNTU}
33

44
ENV TZ=UTC
@@ -7,9 +7,9 @@ ENV DEBIAN_FRONTEND=noninteractive
77
RUN apt-get update && \
88
apt-get install -y tzdata && \
99
apt-get install -y \
10+
binutils-aarch64-linux-gnu \
1011
bison \
1112
crossbuild-essential-amd64 \
12-
crossbuild-essential-riscv64 \
1313
flex \
1414
gawk \
1515
libgmp-dev \
@@ -26,5 +26,6 @@ RUN apt-get update && \
2626
sudo \
2727
texinfo \
2828
wget \
29-
zip && \
29+
zip \
30+
zstd && \
3031
rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)