From 1e5a8916b2ab4c9c99548fa6fbd4855eee323881 Mon Sep 17 00:00:00 2001 From: Marcin Nowakowski Date: Thu, 7 Sep 2017 08:31:06 +0200 Subject: pkg-download: remove explicit PKG_VERSION from github helper Currently it is always required to add package version as an argument to the github helper. Since the version is always defined as PKG_VERSION, drop this argument and generate it automatically inside the helper routine. The github helper function is extended to support both 2 and 3 argument variants (ie. either use the provided package version argument or automatically substitute with PKG_VERSION if not available), which can make the transition of the package files easier as well allows using the 3-argument variant outside of package definitions. Signed-off-by: Marcin Nowakowski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-download.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pkg-download.mk') diff --git a/package/pkg-download.mk b/package/pkg-download.mk index fbbc2d7391..dc4ff1c8c7 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -52,8 +52,8 @@ notdomain = $(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$ # default domainseparator is /, specify alternative value as first argument domainseparator = $(if $(1),$(1),/) -# github(user,package,version): returns site of GitHub repository -github = https://github.com/$(1)/$(2)/archive/$(3) +# github(user,package[,version]): returns site of GitHub repository +github = https://github.com/$(1)/$(2)/archive/$(or $(3),$($(call UPPERCASE,$(pkgname))_VERSION)) # Expressly do not check hashes for those files # Exported variables default to immediately expanded in some versions of -- cgit v1.2.1