[Buildroot] [PATCH] pkg-download: remove explicit PKG_VERSION from github helper

Marcin Nowakowski marcin.nowakowski at imgtec.com
Mon Aug 28 09:30:43 UTC 2017


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 atuomatically inside the helper
routine.

To make the transition easier 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).

Signed-off-by: Marcin Nowakowski <marcin.nowakowski at imgtec.com>
---
 docs/manual/adding-packages-tips.txt | 2 +-
 package/pkg-download.mk              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 19577fa..30ec768 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -138,7 +138,7 @@ past, the 'github' helper function should be used as shown below.
 ------------------------
 # Use a tag or a full commit ID
 FOO_VERSION = v1.0
-FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
+FOO_SITE = $(call github,<user>,<package>)
 ------------------------
 
 .Notes
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index fbbc2d7..38c8f35 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/$(if $(3),$(3),$($(call UPPERCASE,$(pkgname))_VERSION))
 
 # Expressly do not check hashes for those files
 # Exported variables default to immediately expanded in some versions of
-- 
2.7.4



More information about the buildroot mailing list