From 119ab097e442e8a87ebd05beb478ade5b638a1ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 27 Feb 2018 09:55:40 +0100 Subject: [PATCH] dependencies.mk: check for valid host-tar before other host dependencies host-{cmake,lzip,xz} needs host-tar to extract their source code tarball, so we need to ensure that host-tar gets added to DEPENDENCIES_HOST_PREREQ before these in case they are both needed, otherwise the tools will fail to extract. With the upcoming change to blacklist modern tar versions this situation is likely to trigger more often. The real solution to this issue is the _EXTRACT_DEPENDENCIES rework, but that series is a bit too intrusive to add this close to 2018.02, so therefore this hack. Signed-off-by: Peter Korsgaard Reviewed-by: Matt Weber Signed-off-by: Peter Korsgaard (cherry picked from commit 7c09cb82b75f30eba7a9daaae5e77a604f6e49c1) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk index ef2ae9b7e1..e81745d04f 100644 --- a/support/dependencies/dependencies.mk +++ b/support/dependencies/dependencies.mk @@ -12,7 +12,10 @@ define suitable-host-package $(shell support/dependencies/check-host-$(1).sh $(2)) endef --include $(sort $(wildcard support/dependencies/check-host-*.mk)) +# host utilities needs host-tar to extract the source code tarballs, so +# ensure check-host-tar.mk is included before the rest +include support/dependencies/check-host-tar.mk +-include $(sort $(filter-out %-tar.mk,$(wildcard support/dependencies/check-host-*.mk))) ifeq ($(BR2_CCACHE),y) DEPENDENCIES_HOST_PREREQ += host-ccache