core/pkg-infra: don't display "foo Downloading" when there's no source
authorYann E. MORIN <yann.morin.1998@free.fr>
Thu, 3 May 2018 20:17:57 +0000 (22:17 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Thu, 3 May 2018 21:08:11 +0000 (23:08 +0200)
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>
package/pkg-generic.mk

index a303dc2e0735a61e2e995323f8c789678a406186..8a3b5f90a9a2b90c83ca5275f72712814716e609 100644 (file)
@@ -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)))