package: cleanup github <pkg>{_VERSION, _SOURCE, _SITE} variable
PATCH 1/1 package: cleanup github <pkg>{_VERSION, _SOURCE, _SITE} variable
According to the documentation, chapter
6.2.8.2 How to add a package from github
"
[...]FOO_VERSION = tag or full commit IDFOO_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.
--- 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(-)
package/civetweb/civetweb.mk +2 -2
@@ -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
package/jquery-keyboard/jquery-keyboard.mk +2 -2
@@ -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
package/liblog4c-localtime/liblog4c-localtime.mk +2 -2
@@ -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
package/mongrel2/mongrel2.mk +2 -3
@@ -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
package/python-ipy/python-ipy.mk +2 -3
@@ -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
package/sqlcipher/sqlcipher.mk +2 -2
@@ -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
Signature · 1 line
1.7.9.5
PATCH 1/1 package: cleanup github <pkg>{_VERSION, _SOURCE, _SITE} variable
Quoted 106 lines · Jerzy Grzegorek
According to the documentation, chapter
6.2.8.2 How to add a package from github
"
[...]FOO_VERSION= tag or full commit IDFOO_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 <[email protected]>--- 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(-)package/civetweb/civetweb.mk +2
-2@@ -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.mdpackage/jquery-keyboard/jquery-keyboard.mk +2
-2@@ -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.markdownpackage/liblog4c-localtime/liblog4c-localtime.mk +2
-2@@ -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 = expatpackage/mongrel2/mongrel2.mk +2
-3@@ -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 zeromqpackage/python-ipy/python-ipy.mk +2
-3@@ -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 = COPYINGpackage/sqlcipher/sqlcipher.mk +0
-0
package/sqlcipher/sqlcipher.mk line 11
Quoted 10 lines
package/sqlcipher/sqlcipher.mk +2
-2@@ -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
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
AppliedPATCH 1/1 package: cleanup github <pkg>{_VERSION, _SOURCE, _SITE} variable
In reply to Jerzy GrzegorekDear Jerzy Grzegorek,
Quoted 14 lines · Jerzy Grzegorek
According to the documentation, chapter
6.2.8.2 How to add a package from github
"
[...]FOO_VERSION= tag or full commit IDFOO_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 <[email protected]>
Quoted 8 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com