* [Buildroot] [PATCH v2] pkg-download: remove explicit PKG_VERSION from github helper
@ 2017-08-30 7:54 Marcin Nowakowski
0 siblings, 0 replies; 5+ messages in thread
From: Marcin Nowakowski @ 2017-08-30 7:54 UTC (permalink / raw)
To: buildroot
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 <marcin.nowakowski@imgtec.com>
---
Changes:
v2
- update docs to include optional version argument
- use $(or $foo,...) instead of $(if $foo,$foo,...)
---
docs/manual/adding-packages-tips.txt | 4 +++-
package/pkg-download.mk | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 19577fa..8caf2b9 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>[,<version>])
------------------------
.Notes
@@ -147,6 +147,8 @@ FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
Buildroot (e.g.: +foo-f6fb6654af62045239caed5950bc6c7971965e60.tar.gz+),
so it is not necessary to specify it in the +.mk+ file.
- When using a commit ID as version, you should use the full 40 hex characters.
+- +version+ parameter is optional and should only be specified if anything
+ other than FOO_VERSION needs to be used
If the package you wish to add does have a release section on GitHub, the
maintainer may have uploaded a release tarball, or the release may just point
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index fbbc2d7..7489fca 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
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] pkg-download: remove explicit PKG_VERSION from github helper
2017-09-30 13:39 ` Peter Korsgaard
@ 2017-09-30 17:16 ` Arnout Vandecappelle
0 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2017-09-30 17:16 UTC (permalink / raw)
To: buildroot
On 30-09-17 15:39, Peter Korsgaard wrote:
>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
>
> > On 07-09-17 08:31, Marcin Nowakowski wrote:
> >> 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 <marcin.nowakowski@imgtec.com>
>
>
> > Applied to master, thanks. I extended the text in the manual a little bit to
> > cover the case where you do have to use the third argument.
>
> > Next step is a mass update removing the third argument.
>
> Have you tested this? It doesn't seem to work for me UNLESS I use
>
> FOO_SITE := $(call github,user,product)
>
> Instead of the normal FOO_SITE = to get it expanded right away. I guess
> pkgname gets expanded too late.
Gah, my fault. I had written to use $(PKG) instead of $(pkgname) in v1 of the
patch, but didn't double-check in v2. Hm, reading back my comment, I wasn't very
explicit about it apparently.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] pkg-download: remove explicit PKG_VERSION from github helper
2017-09-24 11:53 ` Arnout Vandecappelle
@ 2017-09-30 13:39 ` Peter Korsgaard
2017-09-30 17:16 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2017-09-30 13:39 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> On 07-09-17 08:31, Marcin Nowakowski wrote:
>> 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 <marcin.nowakowski@imgtec.com>
> Applied to master, thanks. I extended the text in the manual a little bit to
> cover the case where you do have to use the third argument.
> Next step is a mass update removing the third argument.
Have you tested this? It doesn't seem to work for me UNLESS I use
FOO_SITE := $(call github,user,product)
Instead of the normal FOO_SITE = to get it expanded right away. I guess
pkgname gets expanded too late.
E.G. if I drop the explicit version argument from librtlsdr:
LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr)
make BR2_BACKUP_SITE='' librtlsdr-source
>>> librtlsdr v0.5.3 Downloading
--2017-09-30 15:36:00-- https://github.com/steve-m/librtlsdr/archive//librtlsdr-v0.5.3.tar.gz
Resolving github.com (github.com)... 192.30.253.112, 192.30.253.113
Connecting to github.com (github.com)|192.30.253.112|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://codeload.github.com/steve-m/librtlsdr/tar.gz/librtlsdr-v0.5.3 [following]
--2017-09-30 15:36:00-- https://codeload.github.com/steve-m/librtlsdr/tar.gz/librtlsdr-v0.5.3
Resolving codeload.github.com (codeload.github.com)... 192.30.253.120, 192.30.253.121
Connecting to codeload.github.com (codeload.github.com)|192.30.253.120|:443... connected.
HTTP request sent, awaiting response... 404 Not Found
2017-09-30 15:36:01 ERROR 404: Not Found.
package/pkg-generic.mk:146: recipe for target '/home/peko/source/buildroot/output-rpi/build/librtlsdr-v0.5.3/.stamp_downloaded' failed
Notice the missing version between archive and the file name.
With LIBRTLSDR_SITE := $(call github,steve-m,librtlsdr) I get:
make BR2_BACKUP_SITE='' librtlsdr-source
>>> librtlsdr v0.5.3 Downloading
--2017-09-30 15:38:20-- https://github.com/steve-m/librtlsdr/archive/v0.5.3/librtlsdr-v0.5.3.tar.gz
Resolving github.com (github.com)... 192.30.253.113, 192.30.253.112
Connecting to github.com (github.com)|192.30.253.113|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://codeload.github.com/steve-m/librtlsdr/tar.gz/v0.5.3 [following]
--2017-09-30 15:38:21-- https://codeload.github.com/steve-m/librtlsdr/tar.gz/v0.5.3
Resolving codeload.github.com (codeload.github.com)... 192.30.253.121, 192.30.253.120
Connecting to codeload.github.com (codeload.github.com)|192.30.253.121|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [application/x-gzip]
Saving to: ?/home/peko/source/buildroot/output-rpi/build/.librtlsdr-v0.5.3.tar.gz.CsUtgo/output?
/home/peko/source/buildroot/output-rpi/build/.librtlsdr- [ <=> ] 114.66K 374KB/s in 0.3s
2017-09-30 15:38:22 (374 KB/s) - ?/home/peko/source/buildroot/output-rpi/build/.librtlsdr-v0.5.3.tar.gz.CsUtgo/output? saved [117414]
librtlsdr-v0.5.3.tar.gz: OK (sha256: 98fb5c34ac94d6f2235a0bb41a08f8bed7949e1d1b91ea57a7c1110191ea58de)
I'm not sure how to fix it inside the github wrapper though.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] pkg-download: remove explicit PKG_VERSION from github helper
2017-09-07 6:31 Marcin Nowakowski
@ 2017-09-24 11:53 ` Arnout Vandecappelle
2017-09-30 13:39 ` Peter Korsgaard
0 siblings, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 11:53 UTC (permalink / raw)
To: buildroot
On 07-09-17 08:31, Marcin Nowakowski wrote:
> 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 <marcin.nowakowski@imgtec.com>
Applied to master, thanks. I extended the text in the manual a little bit to
cover the case where you do have to use the third argument.
Next step is a mass update removing the third argument.
Regards,
Arnout
> ---
> Changes:
> v3
> - v2 has an errorenous trailing ')'
> v2
> - update docs to include optional version argument
> - use $(or $foo,...) instead of $(if $foo,$foo,...)
> ---
> docs/manual/adding-packages-tips.txt | 4 +++-
> package/pkg-download.mk | 4 ++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
> index 19577fa..8caf2b9 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>[,<version>])
> ------------------------
>
> .Notes
> @@ -147,6 +147,8 @@ FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
> Buildroot (e.g.: +foo-f6fb6654af62045239caed5950bc6c7971965e60.tar.gz+),
> so it is not necessary to specify it in the +.mk+ file.
> - When using a commit ID as version, you should use the full 40 hex characters.
> +- +version+ parameter is optional and should only be specified if anything
> + other than FOO_VERSION needs to be used
>
> If the package you wish to add does have a release section on GitHub, the
> maintainer may have uploaded a release tarball, or the release may just point
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index fbbc2d7..7489fca 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
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] pkg-download: remove explicit PKG_VERSION from github helper
@ 2017-09-07 6:31 Marcin Nowakowski
2017-09-24 11:53 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Marcin Nowakowski @ 2017-09-07 6:31 UTC (permalink / raw)
To: buildroot
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 <marcin.nowakowski@imgtec.com>
---
Changes:
v3
- v2 has an errorenous trailing ')'
v2
- update docs to include optional version argument
- use $(or $foo,...) instead of $(if $foo,$foo,...)
---
docs/manual/adding-packages-tips.txt | 4 +++-
package/pkg-download.mk | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 19577fa..8caf2b9 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>[,<version>])
------------------------
.Notes
@@ -147,6 +147,8 @@ FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
Buildroot (e.g.: +foo-f6fb6654af62045239caed5950bc6c7971965e60.tar.gz+),
so it is not necessary to specify it in the +.mk+ file.
- When using a commit ID as version, you should use the full 40 hex characters.
+- +version+ parameter is optional and should only be specified if anything
+ other than FOO_VERSION needs to be used
If the package you wish to add does have a release section on GitHub, the
maintainer may have uploaded a release tarball, or the release may just point
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index fbbc2d7..7489fca 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
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-09-30 17:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-30 7:54 [Buildroot] [PATCH v2] pkg-download: remove explicit PKG_VERSION from github helper Marcin Nowakowski
2017-09-07 6:31 Marcin Nowakowski
2017-09-24 11:53 ` Arnout Vandecappelle
2017-09-30 13:39 ` Peter Korsgaard
2017-09-30 17:16 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.