Skip to contentSkip to conversation

core/pkg-infra: don't display "foo Downloading" when there's no source

PATCH New Yann E. MORIN 2 participants 2 messages May 3, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-generic.mk +1 -1
index a6e6e2b22c..aa638a4b04 100644
@@ -498,7 +498,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)))
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 core/pkg-infra: don't display "foo Downloading" when there's no source

Hello,

Quoted 7 lines · Yann E. MORIN

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.

Quoted 6 lines

Fix that.

---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com