resources: Remove libfdt in docker image

Signed-off-by: Henry Wang <Henry.Wang@arm.com>
This commit is contained in:
Henry Wang 2021-05-07 21:40:59 +08:00 committed by Sebastien Boeuf
parent cb26ad511b
commit 1f63350eba

View File

@ -37,7 +37,6 @@ RUN apt-get update \
socat \ socat \
dosfstools \ dosfstools \
cpio \ cpio \
libfdt-dev \
python3-setuptools \ python3-setuptools \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -56,14 +55,7 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \
&& apt-get -yq upgrade \ && apt-get -yq upgrade \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq libcap2-bin \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq libcap2-bin \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/*; fi
# Build and install the musl-gcc version of libfdt. This is to ensure
# the cloud-hypervisor binary can be built and linked using musl toolchain.
&& git clone https://github.com/dgibson/dtc.git && cd dtc \
&& sed -i 's/$(LIBFDT_archive) $(LIBFDT_lib)/$(LIBFDT_archive)/g' Makefile \
&& export CC=musl-gcc && make libfdt \
&& cp libfdt/libfdt.a /usr/lib/aarch64-linux-musl \
&& rm -rf /dtc; fi
# Fix the libssl-dev install # Fix the libssl-dev install
RUN export ARCH="$(uname -m)" \ RUN export ARCH="$(uname -m)" \