From 6908c82a8886bd9130e825ccf2d9c58cfa887d23 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 25 Apr 2018 21:41:52 +0200 Subject: [PATCH] core/pkg-infra: set no-check-hash only for main download Currently, when the main download if from an SCM, we exclude all downloads from being hash-checked, on the assumption that we don't have hashes for downloads from an SCM. However, the exclusion is computed on the DOWNLOAD macro, which is called for each download of a package, thus effectively disabling hash checks for extra downloads, even though those are only ever download with wget. What we really wanted to do, in fact, was to exclude just the main download. We fix that by appending the main source file to the global list of excluded files, from within the generic-package infra itself. Reported-by: Luca Ceresoli Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli Cc: Thomas Petazzoni Cc: Maxime Hadjinlian Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 2 -- package/pkg-generic.mk | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2c4ad3ba2c..2d9b0d4a41 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -92,8 +92,6 @@ endif define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) - $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)), - BR_NO_CHECK_HASH_FOR=$(notdir $(call qstrip,$(1)))) \ $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -d '$($(PKG)_DL_DIR)' \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 87c856407d..28e6c41a7f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -483,6 +483,10 @@ ifndef $(2)_PATCH endif endif +ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE)),) +BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE) +endif + $(2)_ALL_DOWNLOADS = \ $$(foreach p,$$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\ $$(if $$(findstring ://,$$(p)),$$(p),\ -- 2.30.2