Skip to content

Commit

Permalink
use default libfdt in aarch64 Dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: Serban Iorga <[email protected]>
  • Loading branch information
Serban Iorga committed May 27, 2021
1 parent ba208b0 commit 89cfa1c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
15 changes: 1 addition & 14 deletions tools/devctr/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN apt-get update \
libbfd-dev \
libcurl4-openssl-dev \
libdw-dev \
libfdt-dev \
libiberty-dev \
libssl-dev \
lsof \
Expand All @@ -60,20 +61,6 @@ RUN apt-get update \
&& python3 -m pip install --upgrade pip \
&& rm -rf /var/lib/apt/lists/*

# We need to build libfdt-dev using -fno-stack-protector
# See https://github.com/rust-lang/rust/issues/79791
RUN mkdir "$TMP_BUILD_DIR" \
&& sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list \
&& apt update \
&& apt -y install build-essential fakeroot dpkg-dev \
&& apt source libfdt-dev \
&& apt -y build-dep libfdt-dev \
&& cd device-tree-compiler-1.4.5 \
&& echo "CFLAGS += -fno-stack-protector" >> libfdt/Makefile.libfdt \
&& dpkg-buildpackage -uc -us -b \
&& dpkg -i ../libfdt1_1.4.5-3_arm64.deb ../libfdt-dev_1.4.5-3_arm64.deb \
&& rm -rf "$TMP_BUILD_DIR"

RUN python3 -m pip install poetry
RUN mkdir "$TMP_POETRY_DIR"
COPY tools/devctr/pyproject.toml $POETRY_LOCK_PATH "$TMP_POETRY_DIR/"
Expand Down
2 changes: 1 addition & 1 deletion tools/devtool
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
DEVCTR_IMAGE_NO_TAG="public.ecr.aws/firecracker/fcuvm"

# Development container tag
DEVCTR_IMAGE_TAG="v29"
DEVCTR_IMAGE_TAG="v30"

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

0 comments on commit 89cfa1c

Please sign in to comment.