summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-05-03 22:17:57 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-03 23:08:11 +0200
commitb55c0c7cd54d13d10109719bfc0f6874c457b12a (patch)
treea2576afb2bf3a05bafa0a832f22d2a1a438eed43
parent2bbb6b800143b87608cc68351036ae4ccf649c1b (diff)
downloadbuildroot-b55c0c7cd54d13d10109719bfc0f6874c457b12a.tar.gz
buildroot-b55c0c7cd54d13d10109719bfc0f6874c457b12a.zip
core/pkg-infra: don't display "foo Downloading" when there's no source
Commit ea55e1323 (core/pkg-infra: don't enforce site-method for extra downloads) forgot to account for those packages that have nothing to download, like the skeleton, or like virtual packages... The side effect is that the message "foo Downloading" is thus displayed when it should not be. Fix that. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/pkg-generic.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index a303dc2e07..8a3b5f90a9 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -488,7 +488,7 @@ BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE)
endif
$(2)_ALL_DOWNLOADS = \
- $$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE) \
+ $$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) \
$$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\
$$(if $$(findstring ://,$$(p)),$$(p),\
$$($(2)_SITE)/$$(p)))
OpenPOWER on IntegriCloud