Skip to content

Commit e2e1c70

Browse files
author
Serban Iorga
committed
use default libfdt in aarch64 Dockerfile
Signed-off-by: Serban Iorga <[email protected]>
1 parent 55534f0 commit e2e1c70

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

tools/devctr/Dockerfile.aarch64

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN apt-get update \
3838
libbfd-dev \
3939
libcurl4-openssl-dev \
4040
libdw-dev \
41+
libfdt-dev \
4142
libiberty-dev \
4243
libssl-dev \
4344
lsof \
@@ -60,20 +61,6 @@ RUN apt-get update \
6061
&& python3 -m pip install --upgrade pip \
6162
&& rm -rf /var/lib/apt/lists/*
6263

63-
# We need to build libfdt-dev using -fno-stack-protector
64-
# See https://github.com/rust-lang/rust/issues/79791
65-
RUN mkdir "$TMP_BUILD_DIR" \
66-
&& sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list \
67-
&& apt update \
68-
&& apt -y install build-essential fakeroot dpkg-dev \
69-
&& apt source libfdt-dev \
70-
&& apt -y build-dep libfdt-dev \
71-
&& cd device-tree-compiler-1.4.5 \
72-
&& echo "CFLAGS += -fno-stack-protector" >> libfdt/Makefile.libfdt \
73-
&& dpkg-buildpackage -uc -us -b \
74-
&& dpkg -i ../libfdt1_1.4.5-3_arm64.deb ../libfdt-dev_1.4.5-3_arm64.deb \
75-
&& rm -rf "$TMP_BUILD_DIR"
76-
7764
RUN python3 -m pip install poetry
7865
RUN mkdir "$TMP_POETRY_DIR"
7966
COPY tools/devctr/pyproject.toml $POETRY_LOCK_PATH "$TMP_POETRY_DIR/"

tools/devtool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
DEVCTR_IMAGE_NO_TAG="public.ecr.aws/firecracker/fcuvm"
7373

7474
# Development container tag
75-
DEVCTR_IMAGE_TAG="v29"
75+
DEVCTR_IMAGE_TAG="v30"
7676

7777
# Development container image (name:tag)
7878
# This should be updated whenever we upgrade the development container.

0 commit comments

Comments
 (0)