From 89cfa1c5e69e73e73f3ecf732cfc6844f3e17e2c Mon Sep 17 00:00:00 2001
From: Serban Iorga <seriorga@amazon.com>
Date: Tue, 25 May 2021 21:39:26 +0300
Subject: [PATCH] use default libfdt in aarch64 Dockerfile

Signed-off-by: Serban Iorga <seriorga@amazon.com>
---
 tools/devctr/Dockerfile.aarch64 | 15 +--------------
 tools/devtool                   |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/tools/devctr/Dockerfile.aarch64 b/tools/devctr/Dockerfile.aarch64
index 29c4a92e93d6..198029e06ae6 100644
--- a/tools/devctr/Dockerfile.aarch64
+++ b/tools/devctr/Dockerfile.aarch64
@@ -38,6 +38,7 @@ RUN apt-get update \
         libbfd-dev \
         libcurl4-openssl-dev \
         libdw-dev \
+        libfdt-dev \
         libiberty-dev \
         libssl-dev \
         lsof \
@@ -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/"
diff --git a/tools/devtool b/tools/devtool
index 4caf5a801fad..3e2a5cd063c1 100755
--- a/tools/devtool
+++ b/tools/devtool
@@ -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.