diff mbox

[1/1] package: cleanup github <pkg>{_VERSION, _SOURCE, _SITE} variable

Message ID 1383408814-8472-1-git-send-email-jerzy.grzegorek@trzebnica.net
State Accepted
Commit df70822c62f4bf0ff59d4f07315ca70028a67aee
Headers show

Commit Message

Jerzy Grzegorek Nov. 2, 2013, 4:13 p.m. UTC
According to the documentation, chapter
6.2.8.2 How to add a package from github
"
[...]
FOO_VERSION = tag or full commit ID
FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
[...]
- The tarball name generated by github matches the default one from
  Buildroot (...),
  so it is not necessary to specify it in the +.mk+ file.
"
This commit makes the appropriate changes.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
---
 package/civetweb/civetweb.mk                     |    4 ++--
 package/jquery-keyboard/jquery-keyboard.mk       |    4 ++--
 package/liblog4c-localtime/liblog4c-localtime.mk |    4 ++--
 package/mongrel2/mongrel2.mk                     |    5 ++---
 package/python-ipy/python-ipy.mk                 |    5 ++---
 package/sqlcipher/sqlcipher.mk                   |    4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

Comments

Thomas De Schampheleire Nov. 2, 2013, 4:47 p.m. UTC | #1
On Sat, Nov 2, 2013 at 5:13 PM, Jerzy Grzegorek
<jerzy.grzegorek@trzebnica.net> wrote:
> According to the documentation, chapter
> 6.2.8.2 How to add a package from github
> "
> [...]
> FOO_VERSION = tag or full commit ID
> FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
> [...]
> - The tarball name generated by github matches the default one from
>   Buildroot (...),
>   so it is not necessary to specify it in the +.mk+ file.
> "
> This commit makes the appropriate changes.
>
> Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
> ---
>  package/civetweb/civetweb.mk                     |    4 ++--
>  package/jquery-keyboard/jquery-keyboard.mk       |    4 ++--
>  package/liblog4c-localtime/liblog4c-localtime.mk |    4 ++--
>  package/mongrel2/mongrel2.mk                     |    5 ++---
>  package/python-ipy/python-ipy.mk                 |    5 ++---
>  package/sqlcipher/sqlcipher.mk                   |    4 ++--
>  6 files changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
> index 171ad0c..dd74d97 100644
> --- a/package/civetweb/civetweb.mk
> +++ b/package/civetweb/civetweb.mk
> @@ -4,8 +4,8 @@
>  #
>  ################################################################################
>
> -CIVETWEB_VERSION = 1.3
> -CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/v$(CIVETWEB_VERSION)
> +CIVETWEB_VERSION = v1.3
> +CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/$(CIVETWEB_VERSION)
>  CIVETWEB_LICENSE = MIT
>  CIVETWEB_LICENSE_FILES = LICENSE.md
>
> diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
> index c429f16..41edebf 100644
> --- a/package/jquery-keyboard/jquery-keyboard.mk
> +++ b/package/jquery-keyboard/jquery-keyboard.mk
> @@ -4,9 +4,9 @@
>  #
>  ################################################################################
>
> -JQUERY_KEYBOARD_VERSION = 1.17.7
> +JQUERY_KEYBOARD_VERSION = v1.17.7
>  JQUERY_KEYBOARD_SITE = \
> -       http://github.com/Mottie/Keyboard/tarball/v$(JQUERY_KEYBOARD_VERSION)
> +       http://github.com/Mottie/Keyboard/tarball/$(JQUERY_KEYBOARD_VERSION)
>  JQUERY_KEYBOARD_LICENSE = MIT WTFPL
>  JQUERY_KEYBOARD_LICENSE_FILES = README.markdown
>
> diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
> index f68fb53..474bd95 100644
> --- a/package/liblog4c-localtime/liblog4c-localtime.mk
> +++ b/package/liblog4c-localtime/liblog4c-localtime.mk
> @@ -4,8 +4,8 @@
>  #
>  ################################################################################
>
> -LIBLOG4C_LOCALTIME_VERSION = 1.0
> -LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
> +LIBLOG4C_LOCALTIME_VERSION = v1.0
> +LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/$(LIBLOG4C_LOCALTIME_VERSION)
>  LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
>  LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
>  LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
> diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
> index 116754c..89621de 100644
> --- a/package/mongrel2/mongrel2.mk
> +++ b/package/mongrel2/mongrel2.mk
> @@ -4,9 +4,8 @@
>  #
>  ################################################################################
>
> -MONGREL2_VERSION = 1.8.0
> -MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz
> -MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v$(MONGREL2_VERSION)
> +MONGREL2_VERSION = v1.8.0
> +MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/$(MONGREL2_VERSION)
>  MONGREL2_LICENSE = BSD-3c
>  MONGREL2_LICENSE_FILES = LICENSE
>  MONGREL2_DEPENDENCIES = sqlite zeromq
> diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
> index f3fb7c1..baac094 100644
> --- a/package/python-ipy/python-ipy.mk
> +++ b/package/python-ipy/python-ipy.mk
> @@ -4,9 +4,8 @@
>  #
>  ################################################################################
>
> -PYTHON_IPY_VERSION = 0.75-0-g58006fb
> -PYTHON_IPY_SOURCE  = haypo-python-ipy-IPy-$(PYTHON_IPY_VERSION).tar.gz
> -PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/IPy-0.75
> +PYTHON_IPY_VERSION = IPy-0.75
> +PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/$(PYTHON_IPY_VERSION)
>  PYTHON_IPY_DEPENDENCIES = host-python python
>  PYTHON_IPY_LICENSE = BSD-3c
>  PYTHON_IPY_LICENSE_FILES = COPYING
> diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
> index 0b2581b..3ade403 100644
> --- a/package/sqlcipher/sqlcipher.mk
> +++ b/package/sqlcipher/sqlcipher.mk
> @@ -4,8 +4,8 @@
>  #
>  ################################################################################
>
> -SQLCIPHER_VERSION = 1.1.9
> -SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
> +SQLCIPHER_VERSION = v1.1.9
> +SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/$(SQLCIPHER_VERSION)
>  SQLCIPHER_DEPENDENCIES = openssl host-tcl
>  SQLCIPHER_INSTALL_STAGING = YES
>

Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Jerzy, since you have been submitting several cleanup patches in this
area, here is another item from my todo list that you can freely take,
if you want: there are now several packages with github sources, but
using the git protocol instead of the above tarball download. It would
be nice to remove the git dependency for these packages.

Best regards,
Thomas
Thomas Petazzoni Nov. 2, 2013, 5:27 p.m. UTC | #2
Dear Jerzy Grzegorek,

On Sat,  2 Nov 2013 17:13:34 +0100, Jerzy Grzegorek wrote:
> According to the documentation, chapter
> 6.2.8.2 How to add a package from github
> "
> [...]
> FOO_VERSION = tag or full commit ID
> FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
> [...]
> - The tarball name generated by github matches the default one from
>   Buildroot (...),
>   so it is not necessary to specify it in the +.mk+ file.
> "
> This commit makes the appropriate changes.
> 
> Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
> ---
>  package/civetweb/civetweb.mk                     |    4 ++--
>  package/jquery-keyboard/jquery-keyboard.mk       |    4 ++--
>  package/liblog4c-localtime/liblog4c-localtime.mk |    4 ++--
>  package/mongrel2/mongrel2.mk                     |    5 ++---
>  package/python-ipy/python-ipy.mk                 |    5 ++---
>  package/sqlcipher/sqlcipher.mk                   |    4 ++--
>  6 files changed, 12 insertions(+), 14 deletions(-)

Applied to for-peter-2013.11, thanks!

Thomas
diff mbox

Patch

diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index 171ad0c..dd74d97 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-CIVETWEB_VERSION = 1.3
-CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/v$(CIVETWEB_VERSION)
+CIVETWEB_VERSION = v1.3
+CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/$(CIVETWEB_VERSION)
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
index c429f16..41edebf 100644
--- a/package/jquery-keyboard/jquery-keyboard.mk
+++ b/package/jquery-keyboard/jquery-keyboard.mk
@@ -4,9 +4,9 @@ 
 #
 ################################################################################
 
-JQUERY_KEYBOARD_VERSION = 1.17.7
+JQUERY_KEYBOARD_VERSION = v1.17.7
 JQUERY_KEYBOARD_SITE = \
-	http://github.com/Mottie/Keyboard/tarball/v$(JQUERY_KEYBOARD_VERSION)
+	http://github.com/Mottie/Keyboard/tarball/$(JQUERY_KEYBOARD_VERSION)
 JQUERY_KEYBOARD_LICENSE = MIT WTFPL
 JQUERY_KEYBOARD_LICENSE_FILES = README.markdown
 
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index f68fb53..474bd95 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-LIBLOG4C_LOCALTIME_VERSION = 1.0
-LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
+LIBLOG4C_LOCALTIME_VERSION = v1.0
+LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/$(LIBLOG4C_LOCALTIME_VERSION)
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index 116754c..89621de 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -4,9 +4,8 @@ 
 #
 ################################################################################
 
-MONGREL2_VERSION = 1.8.0
-MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz
-MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v$(MONGREL2_VERSION)
+MONGREL2_VERSION = v1.8.0
+MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/$(MONGREL2_VERSION)
 MONGREL2_LICENSE = BSD-3c
 MONGREL2_LICENSE_FILES = LICENSE
 MONGREL2_DEPENDENCIES = sqlite zeromq
diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
index f3fb7c1..baac094 100644
--- a/package/python-ipy/python-ipy.mk
+++ b/package/python-ipy/python-ipy.mk
@@ -4,9 +4,8 @@ 
 #
 ################################################################################
 
-PYTHON_IPY_VERSION = 0.75-0-g58006fb
-PYTHON_IPY_SOURCE  = haypo-python-ipy-IPy-$(PYTHON_IPY_VERSION).tar.gz
-PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/IPy-0.75
+PYTHON_IPY_VERSION = IPy-0.75
+PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/$(PYTHON_IPY_VERSION)
 PYTHON_IPY_DEPENDENCIES = host-python python
 PYTHON_IPY_LICENSE = BSD-3c
 PYTHON_IPY_LICENSE_FILES = COPYING
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 0b2581b..3ade403 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-SQLCIPHER_VERSION = 1.1.9
-SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
+SQLCIPHER_VERSION = v1.1.9
+SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/$(SQLCIPHER_VERSION)
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES