From f257188e42f740f618864b8538e9434f01b0dd56 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 1 Apr 2021 15:00:44 +0200 Subject: [PATCH] Revert "U-boot compilation for Tinkerboard breaks due missing some headers files (#2747)" This reverts commit c7b853602d0b0068935dd821f2b114b841a8c6d7. --- config/templates/Dockerfile | 1 - lib/general.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/templates/Dockerfile b/config/templates/Dockerfile index 86aaa84d5..31d9f396d 100644 --- a/config/templates/Dockerfile +++ b/config/templates/Dockerfile @@ -54,7 +54,6 @@ RUN apt-get update \ libc6-dev-armhf-cross \ libc6-i386 \ libfile-fcntllock-perl \ - libfdt-dev \ libfl-dev \ liblz4-tool \ libncurses5-dev \ diff --git a/lib/general.sh b/lib/general.sh index 6bf8225c3..e5a6a0899 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -1001,7 +1001,7 @@ prepare_host() nfs-kernel-server btrfs-progs ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross imagemagick \ curl patchutils liblz4-tool libpython2.7-dev linux-base swig aptly acl python3-dev python3-distutils \ locales ncurses-base pixz dialog systemd-container udev lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 \ - bison libbison-dev flex libfl-dev cryptsetup gpg gnupg1 cpio aria2 pigz dirmngr python3-distutils jq libfdt-dev" + bison libbison-dev flex libfl-dev cryptsetup gpg gnupg1 cpio aria2 pigz dirmngr python3-distutils jq" # build aarch64 else @@ -1012,7 +1012,7 @@ prepare_host() nfs-kernel-server btrfs-progs ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross imagemagick \ curl patchutils liblz4-tool libpython2.7-dev linux-base swig aptly acl python3-dev \ locales ncurses-base pixz dialog systemd-container udev libc6 qemu\ - bison libbison-dev flex libfl-dev cryptsetup gpg gnupg1 cpio aria2 pigz dirmngr python3-distutils jq libfdt-dev" + bison libbison-dev flex libfl-dev cryptsetup gpg gnupg1 cpio aria2 pigz dirmngr python3-distutils" # build aarch64 fi