Skip to contentSkip to conversation

infra: introduce github helper function

PATCH Superseded Mischa Jonker 4 participants 9 messages Nov 13, 2013 Arm/Allwinner sunXi SoC support

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 infra: introduce github helper function

In order to make it easier to cope with changes in github download-URL's, this patch introduces the github helper function. It generates the site URL of a github repository. It's usage is $(call github,user,pkg,version).

Cc Arnout Vandecapelle <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
Cc Samuel Martin <[email protected]>
Cc Thomas De Schampheleire <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
v2:
fixed input-event-daemon

 docs/manual/adding-packages-tips.txt             |    5 +++--
 package/a10disp/a10disp.mk                       |    2 +-
 package/civetweb/civetweb.mk                     |    2 +-
 package/cpuload/cpuload.mk                       |    2 +-
 package/fb-test-app/fb-test-app.mk               |    2 +-
 package/input-event-daemon/input-event-daemon.mk |    2 +-
 package/jq/jq.mk                                 |    2 +-
 package/jsmin/jsmin.mk                           |    2 +-
 package/knock/knock.mk                           |    2 +-
 package/libcec/libcec.mk                         |    2 +-
 package/libcofi/libcofi.mk                       |    2 +-
 package/libiqrf/libiqrf.mk                       |    2 +-
 package/liblog4c-localtime/liblog4c-localtime.mk |    2 +-
 package/libsha1/libsha1.mk                       |    2 +-
 package/libsoc/libsoc.mk                         |    2 +-
 package/libtpl/libtpl.mk                         |    2 +-
 package/linenoise/linenoise.mk                   |    2 +-
 package/lua-ev/lua-ev.mk                         |    2 +-
 package/luacrypto/luacrypto.mk                   |    2 +-
 package/luaexpatutils/luaexpatutils.mk           |    2 +-
 package/luasql/luasql.mk                         |    2 +-
 package/mongrel2/mongrel2.mk                     |    2 +-
 package/mtdev2tuio/mtdev2tuio.mk                 |    2 +-
 package/neardal/neardal.mk                       |    2 +-
 package/omap-u-boot-utils/omap-u-boot-utils.mk   |    2 +-
 package/on2-8170-modules/on2-8170-modules.mk     |    2 +-
 package/pkg-utils.mk                             |    3 +++
 package/python-ipy/python-ipy.mk                 |    2 +-
 package/qjson/qjson.mk                           |    2 +-
 package/rpi-firmware/rpi-firmware.mk             |    2 +-
 package/rpi-userland/rpi-userland.mk             |    2 +-
 package/socketcand/socketcand.mk                 |    2 +-
 package/sqlcipher/sqlcipher.mk                   |    2 +-
 package/sunxi-boards/sunxi-boards.mk             |    2 +-
 package/sunxi-cedarx/sunxi-cedarx.mk             |    2 +-
 package/sunxi-mali-prop/sunxi-mali-prop.mk       |    2 +-
 package/sunxi-mali/sunxi-mali.mk                 |    2 +-
 package/sunxi-tools/sunxi-tools.mk               |    2 +-
 package/tinymembench/tinymembench.mk             |    2 +-
 package/tslib/tslib.mk                           |    2 +-
 package/xl2tp/xl2tp.mk                           |    2 +-
 package/yajl/yajl.mk                             |    2 +-
 42 files changed, 46 insertions(+), 42 deletions(-)
docs/manual/adding-packages-tips.txt +3 -2
index 00244fe..73c25be 100644
@@ -41,11 +41,12 @@ How to add a package from github
 
 Packages on github often don't have a download area with release tarballs.
 However, it is possible to download tarballs directly from the repository
-on github.
+on github. As github is known to have changed download mechanisms in the
+past, the 'github' helper function should be used as shown below.
 
 ------------------------
 FOO_VERSION = v1.0 # tag or full commit ID
-FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
+FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
 ------------------------
 
 .Notes
package/a10disp/a10disp.mk +1 -1
index 486db44..066e988 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 A10DISP_VERSION = a899cc6dcf909360aac00482ede5369f3656f226
-A10DISP_SITE = http://github.com/hglm/a10disp/tarball/$(A10DISP_VERSION)
+A10DISP_SITE = $(call github,hglm,a10disp,$(A10DISP_VERSION))
 A10DISP_LICENSE = MIT
 
 A10DISP_DEPENDENCIES = linux
package/civetweb/civetweb.mk +1 -1
index dd74d97..4c8f4e8 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 CIVETWEB_VERSION = v1.3
-CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/$(CIVETWEB_VERSION)
+CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
package/cpuload/cpuload.mk +1 -1
index e0b8ccf..30c3db6 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 CPULOAD_VERSION = v0.3
-CPULOAD_SITE = http://github.com/kelvincheung/cpuload/tarball/$(CPULOAD_VERSION)
+CPULOAD_SITE = $(call github,kelvincheung,cpuload,$(CPULOAD_VERSION))
 CPULOAD_LICENSE = GPLv2
 CPULOAD_LICENSE_FILES = COPYING
 
package/fb-test-app/fb-test-app.mk +1 -1
index a2183e0..d1ed508 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 FB_TEST_APP_VERSION = v1.0.0
-FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
+FB_TEST_APP_SITE = $(call github,prpplague,fb-test-app,$(FB_TEST_APP_VERSION))
 FB_TEST_APP_LICENSE = GPLv2
 FB_TEST_APP_LICENSE_FILES = COPYING
 
package/input-event-daemon/input-event-daemon.mk +1 -1
index 762d3c2..35af28a 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
-INPUT_EVENT_DAEMON_SITE = http://github.com/gandro/input-event-daemon/tarball/$(INPUT_EVENT_DAEMON_VERSION)
+INPUT_EVENT_DAEMON_SITE = $(call github,gandro,input-event-daemon,$(INPUT_EVENT_DAEMON_VERSION))
 INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license
 INPUT_EVENT_DAEMON_LICENSE_FILES = README
 
package/jq/jq.mk +1 -1
index 8d4f24f..f08752b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 JQ_VERSION = jq-1.3
-JQ_SITE = http://github.com/stedolan/jq/tarball/$(JQ_VERSION)
+JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION))
 JQ_AUTORECONF = YES
 JQ_DEPENDENCIES = host-flex host-bison
 JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
package/jsmin/jsmin.mk +1 -1
index 2d18187..597f06f 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 JSMIN_VERSION = a9b47554d5684a55301a2eb7ca8480b7ee7630d4
-JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/$(JSMIN_VERSION)
+JSMIN_SITE = $(call github,douglascrockford,JSMin,$(JSMIN_VERSION))
 
 define JSMIN_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin
package/knock/knock.mk +1 -1
index 5fcf414..41fc0fb 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 KNOCK_VERSION = 7666f2e86e18d482eaad5fe1fea46d87d80b0555
-KNOCK_SITE = https://github.com/jvinet/knock/tarball/master
+KNOCK_SITE = $(call github,jvinet,knock,master)
 KNOCK_LICENSE = GPLv2+
 KNOCK_LICENSE_FILES = COPYING
 KNOCK_AUTORECONF = YES
package/libcec/libcec.mk +1 -1
index 8a58e1e..910f319 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCEC_VERSION = libcec-2.1.1
-LIBCEC_SITE = http://github.com/Pulse-Eight/libcec/tarball/$(LIBCEC_VERSION)
+LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
 LIBCEC_LICENSE = GPLv2+
 LIBCEC_LICENSE_FILES = COPYING
 
package/libcofi/libcofi.mk +1 -1
index 88d51d3..dcfc641 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
-LIBCOFI_SITE = http://github.com/simonjhall/copies-and-fills/tarball/$(LIBCOFI_VERSION)
+LIBCOFI_SITE = $(call github,simonjhall,copies-and-fills,$(LIBCOFI_VERSION))
 LIBCOFI_LICENSE = LGPLv2.1
 LIBCOFI_LICENSE_FILES = README.md
 
package/libiqrf/libiqrf.mk +1 -1
index 6c33654..ec0d599 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBIQRF_VERSION = v0.1.2
-LIBIQRF_SITE = http://github.com/nandra/libiqrf/tarball/$(LIBIQRF_VERSION)
+LIBIQRF_SITE = $(call github,nandra,libiqrf,$(LIBIQRF_VERSION))
 LIBIQRF_INSTALL_STAGING = YES
 
 LIBIQRF_DEPENDENCIES = libusb
package/liblog4c-localtime/liblog4c-localtime.mk +1 -1
index 474bd95..f2b851d 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBLOG4C_LOCALTIME_VERSION = v1.0
-LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/$(LIBLOG4C_LOCALTIME_VERSION)
+LIBLOG4C_LOCALTIME_SITE    = $(call github,rcmadruga,log4c-localtime,$(LIBLOG4C_LOCALTIME_VERSION))
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
package/libsha1/libsha1.mk +1 -1
index 6976a8f..2fd7705 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBSHA1_VERSION = 0.3
-LIBSHA1_SITE = http://github.com/dottedmag/libsha1/tarball/$(LIBSHA1_VERSION)
+LIBSHA1_SITE = $(call github,dottedmag,libsha1,$(LIBSHA1_VERSION))
 LIBSHA1_LICENSE = BSD-3c or GPL
 LIBSHA1_LICENSE_FILES = COPYING
 
package/libsoc/libsoc.mk +1 -1
index 79c7e90..eca3e84 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBSOC_VERSION = 0.4
-LIBSOC_SITE = http://github.com/jackmitch/libsoc/tarball/$(LIBSOC_VERSION)
+LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION))
 LIBSOC_LICENSE = LGPLv2.1
 LIBSOC_LICENSE_FILES = COPYING
 LIBSOC_AUTORECONF = YES
package/libtpl/libtpl.mk +1 -1
index 478b298..0a0fe8b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBTPL_VERSION = 445b4e9f236a48e274eaace31acf56d700da142a
-LIBTPL_SITE = http://github.com/troydhanson/tpl/tarball/$(LIBTPL_VERSION)
+LIBTPL_SITE = $(call github,troydhanson,tpl,$(LIBTPL_VERSION))
 LIBTPL_INSTALL_STAGING = YES
 LIBTPL_LICENSE = BSD-like
 LIBTPL_LICENSE_FILES = LICENSE
package/linenoise/linenoise.mk +1 -1
index a8ea1f6..1f56a9e 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LINENOISE_VERSION = 27a3b4d5205a5fb3e2101128edd6653bd0c92189
-LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/$(LINENOISE_VERSION)
+LINENOISE_SITE = $(call github,antirez,linenoise,$(LINENOISE_VERSION))
 LINENOISE_LICENSE = BSD-2c
 LINENOISE_INSTALL_STAGING = YES
 
package/lua-ev/lua-ev.mk +1 -1
index 0beece4..173cf0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUA_EV_VERSION = 458165bdfe0c6eadc788813925f11a0e6a823845
-LUA_EV_SITE = http://github.com/brimworks/lua-ev/tarball/$(LUA_EV_VERSION)
+LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION))
 LUA_EV_DEPENDENCIES = lua libev
 LUA_EV_LICENSE = MIT
 LUA_EV_LICENSE_FILES = README
package/luacrypto/luacrypto.mk +1 -1
index f6fcc78..54ab388 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUACRYPTO_VERSION = 0.3.2
-LUACRYPTO_SITE = http://github.com/mkottman/luacrypto/tarball/$(LUACRYPTO_VERSION)
+LUACRYPTO_SITE = $(call github,mkottman,luacrypto,$(LUACRYPTO_VERSION))
 LUACRYPTO_LICENSE = MIT
 LUACRYPTO_LICENSE_FILES = COPYING
 LUACRYPTO_DEPENDENCIES = lua openssl host-pkgconf
package/luaexpatutils/luaexpatutils.mk +1 -1
index 391031b..147c4b9 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUAEXPATUTILS_VERSION = 88c228365b084224c911d34aff06002634b38b50
-LUAEXPATUTILS_SITE = http://github.com/stevedonovan/LuaExpatUtils/tarball/$(LUAEXPATUTILS_VERSION)
+LUAEXPATUTILS_SITE = $(call github,stevedonovan,LuaExpatUtils,$(LUAEXPATUTILS_VERSION))
 LUAEXPATUTILS_LICENSE = Public Domain
 LUAEXPATUTILS_DEPENDENCIES = luaexpat
 
package/luasql/luasql.mk +1 -1
index 6fbdccc..03dcb20 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUASQL_VERSION = v2.3.0
-LUASQL_SITE = https://github.com/keplerproject/luasql/tarball/$(LUASQL_VERSION)
+LUASQL_SITE = $(call github,keplerproject,luasql,$(LUASQL_VERSION))
 LUASQL_LICENSE = MIT
 LUASQL_LICENSE_FILES = README
 LUASQL_DEPENDENCIES = lua
package/mongrel2/mongrel2.mk +1 -1
index 89621de..64799a8 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 MONGREL2_VERSION = v1.8.0
-MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/$(MONGREL2_VERSION)
+MONGREL2_SITE = $(call github,zedshaw,mongrel2,$(MONGREL2_VERSION))
 MONGREL2_LICENSE = BSD-3c
 MONGREL2_LICENSE_FILES = LICENSE
 MONGREL2_DEPENDENCIES = sqlite zeromq
package/mtdev2tuio/mtdev2tuio.mk +1 -1
index ff56ee7..3116f39 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1
-MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/$(MTDEV2TUIO_VERSION)
+MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION))
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
 MTDEV2TUIO_LICENSE = GPLv3+
 MTDEV2TUIO_LICENSE_FILES = COPYING
package/neardal/neardal.mk +1 -1
index 7e085e4..c07ae5f 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 NEARDAL_VERSION = 0.8
-NEARDAL_SITE = http://github.com/connectivity/neardal/tarball/$(NEARDAL_VERSION)
+NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION))
 NEARDAL_SOURCE = connectivity-neardal-$(NEARDAL_VERSION).tar.gz
 NEARDAL_INSTALL_STAGING = YES
 NEARDAL_LICENSE = GPLv2
package/omap-u-boot-utils/omap-u-boot-utils.mk +1 -1
index 8e03718..10c7a07 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852322c6f52bd09568bef7725ab509d81725
-OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/$(OMAP_U_BOOT_UTILS_VERSION)
+OMAP_U_BOOT_UTILS_SITE = $(call github,nmenon,omap-u-boot-utils,$(OMAP_U_BOOT_UTILS_VERSION))
 OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
 OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 
package/on2-8170-modules/on2-8170-modules.mk +1 -1
index d332885..f779eda 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
-ON2_8170_MODULES_SITE    = http://github.com/alexandrebelloni/on2-8170-modules/tarball/$(ON2_8170_MODULES_VERSION)
+ON2_8170_MODULES_SITE    = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
 
 ON2_8170_MODULES_DEPENDENCIES = linux
 
package/pkg-utils.mk +3 -0
index 0ef433d..40a8ed0 100644
@@ -73,6 +73,9 @@ INFLATE.tar  = cat
 # suitable-extractor(filename): returns extractor based on suffix
 suitable-extractor = $(INFLATE$(suffix $(1)))
 
+# github(user,package,version): returns site of github repository
+github = https://github.com/$(1)/$(2)/tarball/$(3)
+
 # MESSAGE Macro -- display a message in bold type
 MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
 TERM_BOLD  := $(shell tput smso)
package/python-ipy/python-ipy.mk +1 -1
index baac094..c03f91f 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 PYTHON_IPY_VERSION = IPy-0.75
-PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/$(PYTHON_IPY_VERSION)
+PYTHON_IPY_SITE    = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
 PYTHON_IPY_DEPENDENCIES = host-python python
 PYTHON_IPY_LICENSE = BSD-3c
 PYTHON_IPY_LICENSE_FILES = COPYING
package/qjson/qjson.mk +1 -1
index 29b8c31..dcd53bc 100644
@@ -6,7 +6,7 @@
 
 QJSON_VERSION = 0.8.1
 
-QJSON_SITE = http://github.com/flavio/qjson/tarball/$(QJSON_VERSION)
+QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
 QJSON_INSTALL_STAGING = YES
 QJSON_DEPENDENCIES =  qt
 QJSON_LICENSE = LGPLv2.1
package/rpi-firmware/rpi-firmware.mk +1 -1
index 94badf9..0cc8e19 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 RPI_FIRMWARE_VERSION = 18a163f9341755b00841312af2878afeb64c131c
-RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
+RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 
package/rpi-userland/rpi-userland.mk +1 -1
index 1741153..7171cc8 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 RPI_USERLAND_VERSION = 0d486513f56453f8203c270fcad0b04f8e4f1fee
-RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
+RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
package/socketcand/socketcand.mk +1 -1
index 1a19c92..1a2c9fc 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SOCKETCAND_VERSION = dc3437abf17359fa8cb16567415b47e7ef8568d0
-SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/$(SOCKETCAND_VERSION)
+SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION))
 SOCKETCAND_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
package/sqlcipher/sqlcipher.mk +1 -1
index e93d24d..1636a8e 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SQLCIPHER_VERSION = v1.1.9
-SQLCIPHER_SITE = http://github.com/sqlcipher/sqlcipher/archive/$(SQLCIPHER_VERSION)
+SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,$(SQLCIPHER_VERSION))
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES
 
package/sunxi-boards/sunxi-boards.mk +1 -1
index ef5b34d..932b625 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_BOARDS_VERSION = 25a868189dbaa40872b2ac7d8a941dd73972eb08
-SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/$(SUNXI_BOARDS_VERSION)
+SUNXI_BOARDS_SITE = $(call github,linux-sunxi,sunxi-boards,$(SUNXI_BOARDS_VERSION))
 SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools
 SUNXI_BOARDS_INSTALL_IMAGES = YES
 SUNXI_BOARDS_INSTALL_TARGET = NO
package/sunxi-cedarx/sunxi-cedarx.mk +1 -1
index 5e1c820..54d081e 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_CEDARX_VERSION = 74923e55fc3ef512d4cd2462da58ae5331611f37
-SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CEDARX_VERSION)
+SUNXI_CEDARX_SITE = $(call github,linux-sunxi,cedarx-libs,$(SUNXI_CEDARX_VERSION))
 
 SUNXI_CEDARX_INSTALL_STAGING = YES
 
package/sunxi-mali-prop/sunxi-mali-prop.mk +1 -1
index f04b0b0..0cb2d93 100644
@@ -5,6 +5,6 @@
 ################################################################################
 
 SUNXI_MALI_PROP_VERSION = e4ced471d576708ac9aa093e41a0f91cf429862b
-SUNXI_MALI_PROP_SITE = http://github.com/linux-sunxi/sunxi-mali-proprietary/tarball/$(SUNXI_MALI_PROP_VERSION)
+SUNXI_MALI_PROP_SITE = $(call github,linux-sunxi,sunxi-mali-proprietary,$(SUNXI_MALI_PROP_VERSION))
 
 $(eval $(generic-package))
package/sunxi-mali/sunxi-mali.mk +1 -1
index dec211f..d9fd8be 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_MALI_VERSION = c2491fe952354ba44538064e534ed7c731cedb1e
-SUNXI_MALI_SITE = http://github.com/linux-sunxi/sunxi-mali/tarball/$(SUNXI_MALI_VERSION)
+SUNXI_MALI_SITE = $(call github,linux-sunxi,sunxi-mali,$(SUNXI_MALI_VERSION))
 
 SUNXI_MALI_INSTALL_STAGING = YES
 SUNXI_MALI_DEPENDENCIES = sunxi-mali-prop
package/sunxi-tools/sunxi-tools.mk +1 -1
index d47574c..a6c38d9 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_TOOLS_VERSION = 3a94e721dd8d1e13d0b25da0a83463891e8e9ee0
-SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/$(SUNXI_TOOLS_VERSION)
+SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION))
 SUNXI_TOOLS_LICENSE = GPLv2+
 SUNXI_TOOLS_LICENSE_FILES = COPYING
 HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb
package/tinymembench/tinymembench.mk +1 -1
index 732616f..8bb01d5 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 TINYMEMBENCH_VERSION = v0.2
-TINYMEMBENCH_SITE = http://github.com/ssvb/tinymembench/tarball/$(TINYMEMBENCH_VERSION)
+TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,$(TINYMEMBENCH_VERSION))
 TINYMEMBENCH_LICENSE = MIT
 TINYMEMBENCH_LICENSE_FILES = main.c
 
package/tslib/tslib.mk +1 -1
index 751d01e..9524965 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 TSLIB_VERSION = 1.1
-TSLIB_SITE = http://github.com/kergoth/tslib/tarball/$(TSLIB_VERSION)
+TSLIB_SITE = $(call github,kergoth,tslib,$(TSLIB_VERSION))
 TSLIB_LICENSE = GPL, LGPL
 TSLIB_LICENSE_FILES = COPYING
 
package/xl2tp/xl2tp.mk +1 -1
index 7b0a228..cf496fe 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 XL2TP_VERSION = v1.3.1
-XL2TP_SITE = http://github.com/xelerance/xl2tpd/tarball/$(XL2TP_VERSION)
+XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION))
 XL2TP_DEPENDENCIES = libpcap
 
 define XL2TP_BUILD_CMDS
package/yajl/yajl.mk +1 -1
index 6f9c640..ff64123 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 YAJL_VERSION = 2.0.4
-YAJL_SITE = http://github.com/lloyd/yajl/tarball/$(YAJL_VERSION)
+YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION))
 YAJL_INSTALL_STAGING = YES
 YAJL_LICENSE = ISC
 YAJL_LICENSE_FILES = COPYING
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 infra: introduce github helper function

Quoted 10 lines · Mischa Jonker

In order to make it easier to cope with changes in github download-URL's, this patch introduces the github helper function. It generates the site URL of a github repository. It's usage is $(call github,user,pkg,version).

Cc Arnout Vandecapelle<[email protected]>
Cc Maxime Hadjinlian<[email protected]>
Cc Samuel Martin<[email protected]>
Cc Thomas De Schampheleire<[email protected]>
Cc Thomas Petazzoni<[email protected]>
Signature · 6 lines
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH v2 1/1 infra: introduce github helper function

In reply to Mischa Jonker

Hi everyone,

Thanks you Mischa for creating this patch.

How about a dedicated URI scheme like github://<username>/<package>/<version> instead of a call to a macro ? I find it easier to remember, less error prone and maybe more user friendly.

Quoted 613 lines · Mischa Jonker

In order to make it easier to cope with changes in github download-URL's, this patch introduces the github helper function. It generates the site URL of a github repository. It's usage is $(call github,user,pkg,version).

Cc Arnout Vandecapelle <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
Cc Samuel Martin <[email protected]>
Cc Thomas De Schampheleire <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
v2:
fixed input-event-daemon

 docs/manual/adding-packages-tips.txt             |    5 +++--
 package/a10disp/a10disp.mk                       |    2 +-
 package/civetweb/civetweb.mk                     |    2 +-
 package/cpuload/cpuload.mk                       |    2 +-
 package/fb-test-app/fb-test-app.mk               |    2 +-
 package/input-event-daemon/input-event-daemon.mk |    2 +-
 package/jq/jq.mk                                 |    2 +-
 package/jsmin/jsmin.mk                           |    2 +-
 package/knock/knock.mk                           |    2 +-
 package/libcec/libcec.mk                         |    2 +-
 package/libcofi/libcofi.mk                       |    2 +-
 package/libiqrf/libiqrf.mk                       |    2 +-
 package/liblog4c-localtime/liblog4c-localtime.mk |    2 +-
 package/libsha1/libsha1.mk                       |    2 +-
 package/libsoc/libsoc.mk                         |    2 +-
 package/libtpl/libtpl.mk                         |    2 +-
 package/linenoise/linenoise.mk                   |    2 +-
 package/lua-ev/lua-ev.mk                         |    2 +-
 package/luacrypto/luacrypto.mk                   |    2 +-
 package/luaexpatutils/luaexpatutils.mk           |    2 +-
 package/luasql/luasql.mk                         |    2 +-
 package/mongrel2/mongrel2.mk                     |    2 +-
 package/mtdev2tuio/mtdev2tuio.mk                 |    2 +-
 package/neardal/neardal.mk                       |    2 +-
 package/omap-u-boot-utils/omap-u-boot-utils.mk   |    2 +-
 package/on2-8170-modules/on2-8170-modules.mk     |    2 +-
 package/pkg-utils.mk                             |    3 +++
 package/python-ipy/python-ipy.mk                 |    2 +-
 package/qjson/qjson.mk                           |    2 +-
 package/rpi-firmware/rpi-firmware.mk             |    2 +-
 package/rpi-userland/rpi-userland.mk             |    2 +-
 package/socketcand/socketcand.mk                 |    2 +-
 package/sqlcipher/sqlcipher.mk                   |    2 +-
 package/sunxi-boards/sunxi-boards.mk             |    2 +-
 package/sunxi-cedarx/sunxi-cedarx.mk             |    2 +-
 package/sunxi-mali-prop/sunxi-mali-prop.mk       |    2 +-
 package/sunxi-mali/sunxi-mali.mk                 |    2 +-
 package/sunxi-tools/sunxi-tools.mk               |    2 +-
 package/tinymembench/tinymembench.mk             |    2 +-
 package/tslib/tslib.mk                           |    2 +-
 package/xl2tp/xl2tp.mk                           |    2 +-
 package/yajl/yajl.mk                             |    2 +-
 42 files changed, 46 insertions(+), 42 deletions(-)
docs/manual/adding-packages-tips.txt +3 -2
index 00244fe..73c25be 100644
@@ -41,11 +41,12 @@ How to add a package from github
 
 Packages on github often don't have a download area with release tarballs.
 However, it is possible to download tarballs directly from the repository
-on github.
+on github. As github is known to have changed download mechanisms in the
+past, the 'github' helper function should be used as shown below.
 
 ------------------------
 FOO_VERSION = v1.0 # tag or full commit ID
-FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
+FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
 ------------------------
 
 .Notes
package/a10disp/a10disp.mk +1 -1
index 486db44..066e988 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 A10DISP_VERSION = a899cc6dcf909360aac00482ede5369f3656f226
-A10DISP_SITE = http://github.com/hglm/a10disp/tarball/$(A10DISP_VERSION)
+A10DISP_SITE = $(call github,hglm,a10disp,$(A10DISP_VERSION))
 A10DISP_LICENSE = MIT
 
 A10DISP_DEPENDENCIES = linux
package/civetweb/civetweb.mk +1 -1
index dd74d97..4c8f4e8 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 CIVETWEB_VERSION = v1.3
-CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/$(CIVETWEB_VERSION)
+CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
package/cpuload/cpuload.mk +1 -1
index e0b8ccf..30c3db6 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 CPULOAD_VERSION = v0.3
-CPULOAD_SITE = http://github.com/kelvincheung/cpuload/tarball/$(CPULOAD_VERSION)
+CPULOAD_SITE = $(call github,kelvincheung,cpuload,$(CPULOAD_VERSION))
 CPULOAD_LICENSE = GPLv2
 CPULOAD_LICENSE_FILES = COPYING
 
package/fb-test-app/fb-test-app.mk +1 -1
index a2183e0..d1ed508 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 FB_TEST_APP_VERSION = v1.0.0
-FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
+FB_TEST_APP_SITE = $(call github,prpplague,fb-test-app,$(FB_TEST_APP_VERSION))
 FB_TEST_APP_LICENSE = GPLv2
 FB_TEST_APP_LICENSE_FILES = COPYING
 
package/input-event-daemon/input-event-daemon.mk +1 -1
index 762d3c2..35af28a 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
-INPUT_EVENT_DAEMON_SITE = http://github.com/gandro/input-event-daemon/tarball/$(INPUT_EVENT_DAEMON_VERSION)
+INPUT_EVENT_DAEMON_SITE = $(call github,gandro,input-event-daemon,$(INPUT_EVENT_DAEMON_VERSION))
 INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license
 INPUT_EVENT_DAEMON_LICENSE_FILES = README
 
package/jq/jq.mk +1 -1
index 8d4f24f..f08752b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 JQ_VERSION = jq-1.3
-JQ_SITE = http://github.com/stedolan/jq/tarball/$(JQ_VERSION)
+JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION))
 JQ_AUTORECONF = YES
 JQ_DEPENDENCIES = host-flex host-bison
 JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
package/jsmin/jsmin.mk +1 -1
index 2d18187..597f06f 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 JSMIN_VERSION = a9b47554d5684a55301a2eb7ca8480b7ee7630d4
-JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/$(JSMIN_VERSION)
+JSMIN_SITE = $(call github,douglascrockford,JSMin,$(JSMIN_VERSION))
 
 define JSMIN_BUILD_CMDS
        $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin
package/knock/knock.mk +1 -1
index 5fcf414..41fc0fb 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 KNOCK_VERSION = 7666f2e86e18d482eaad5fe1fea46d87d80b0555
-KNOCK_SITE = https://github.com/jvinet/knock/tarball/master
+KNOCK_SITE = $(call github,jvinet,knock,master)
 KNOCK_LICENSE = GPLv2+
 KNOCK_LICENSE_FILES = COPYING
 KNOCK_AUTORECONF = YES
package/libcec/libcec.mk +1 -1
index 8a58e1e..910f319 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCEC_VERSION = libcec-2.1.1
-LIBCEC_SITE = http://github.com/Pulse-Eight/libcec/tarball/$(LIBCEC_VERSION)
+LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
 LIBCEC_LICENSE = GPLv2+
 LIBCEC_LICENSE_FILES = COPYING
 
package/libcofi/libcofi.mk +1 -1
index 88d51d3..dcfc641 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
-LIBCOFI_SITE = http://github.com/simonjhall/copies-and-fills/tarball/$(LIBCOFI_VERSION)
+LIBCOFI_SITE = $(call github,simonjhall,copies-and-fills,$(LIBCOFI_VERSION))
 LIBCOFI_LICENSE = LGPLv2.1
 LIBCOFI_LICENSE_FILES = README.md
 
package/libiqrf/libiqrf.mk +1 -1
index 6c33654..ec0d599 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBIQRF_VERSION = v0.1.2
-LIBIQRF_SITE = http://github.com/nandra/libiqrf/tarball/$(LIBIQRF_VERSION)
+LIBIQRF_SITE = $(call github,nandra,libiqrf,$(LIBIQRF_VERSION))
 LIBIQRF_INSTALL_STAGING = YES
 
 LIBIQRF_DEPENDENCIES = libusb
package/liblog4c-localtime/liblog4c-localtime.mk +1 -1
index 474bd95..f2b851d 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBLOG4C_LOCALTIME_VERSION = v1.0
-LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/$(LIBLOG4C_LOCALTIME_VERSION)
+LIBLOG4C_LOCALTIME_SITE    = $(call github,rcmadruga,log4c-localtime,$(LIBLOG4C_LOCALTIME_VERSION))
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
package/libsha1/libsha1.mk +1 -1
index 6976a8f..2fd7705 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBSHA1_VERSION = 0.3
-LIBSHA1_SITE = http://github.com/dottedmag/libsha1/tarball/$(LIBSHA1_VERSION)
+LIBSHA1_SITE = $(call github,dottedmag,libsha1,$(LIBSHA1_VERSION))
 LIBSHA1_LICENSE = BSD-3c or GPL
 LIBSHA1_LICENSE_FILES = COPYING
 
package/libsoc/libsoc.mk +1 -1
index 79c7e90..eca3e84 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBSOC_VERSION = 0.4
-LIBSOC_SITE = http://github.com/jackmitch/libsoc/tarball/$(LIBSOC_VERSION)
+LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION))
 LIBSOC_LICENSE = LGPLv2.1
 LIBSOC_LICENSE_FILES = COPYING
 LIBSOC_AUTORECONF = YES
package/libtpl/libtpl.mk +1 -1
index 478b298..0a0fe8b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBTPL_VERSION = 445b4e9f236a48e274eaace31acf56d700da142a
-LIBTPL_SITE = http://github.com/troydhanson/tpl/tarball/$(LIBTPL_VERSION)
+LIBTPL_SITE = $(call github,troydhanson,tpl,$(LIBTPL_VERSION))
 LIBTPL_INSTALL_STAGING = YES
 LIBTPL_LICENSE = BSD-like
 LIBTPL_LICENSE_FILES = LICENSE
package/linenoise/linenoise.mk +1 -1
index a8ea1f6..1f56a9e 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LINENOISE_VERSION = 27a3b4d5205a5fb3e2101128edd6653bd0c92189
-LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/$(LINENOISE_VERSION)
+LINENOISE_SITE = $(call github,antirez,linenoise,$(LINENOISE_VERSION))
 LINENOISE_LICENSE = BSD-2c
 LINENOISE_INSTALL_STAGING = YES
 
package/lua-ev/lua-ev.mk +1 -1
index 0beece4..173cf0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUA_EV_VERSION = 458165bdfe0c6eadc788813925f11a0e6a823845
-LUA_EV_SITE = http://github.com/brimworks/lua-ev/tarball/$(LUA_EV_VERSION)
+LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION))
 LUA_EV_DEPENDENCIES = lua libev
 LUA_EV_LICENSE = MIT
 LUA_EV_LICENSE_FILES = README
package/luacrypto/luacrypto.mk +1 -1
index f6fcc78..54ab388 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUACRYPTO_VERSION = 0.3.2
-LUACRYPTO_SITE = http://github.com/mkottman/luacrypto/tarball/$(LUACRYPTO_VERSION)
+LUACRYPTO_SITE = $(call github,mkottman,luacrypto,$(LUACRYPTO_VERSION))
 LUACRYPTO_LICENSE = MIT
 LUACRYPTO_LICENSE_FILES = COPYING
 LUACRYPTO_DEPENDENCIES = lua openssl host-pkgconf
package/luaexpatutils/luaexpatutils.mk +1 -1
index 391031b..147c4b9 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUAEXPATUTILS_VERSION = 88c228365b084224c911d34aff06002634b38b50
-LUAEXPATUTILS_SITE = http://github.com/stevedonovan/LuaExpatUtils/tarball/$(LUAEXPATUTILS_VERSION)
+LUAEXPATUTILS_SITE = $(call github,stevedonovan,LuaExpatUtils,$(LUAEXPATUTILS_VERSION))
 LUAEXPATUTILS_LICENSE = Public Domain
 LUAEXPATUTILS_DEPENDENCIES = luaexpat
 
package/luasql/luasql.mk +1 -1
index 6fbdccc..03dcb20 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUASQL_VERSION = v2.3.0
-LUASQL_SITE = https://github.com/keplerproject/luasql/tarball/$(LUASQL_VERSION)
+LUASQL_SITE = $(call github,keplerproject,luasql,$(LUASQL_VERSION))
 LUASQL_LICENSE = MIT
 LUASQL_LICENSE_FILES = README
 LUASQL_DEPENDENCIES = lua
package/mongrel2/mongrel2.mk +1 -1
index 89621de..64799a8 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 MONGREL2_VERSION = v1.8.0
-MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/$(MONGREL2_VERSION)
+MONGREL2_SITE = $(call github,zedshaw,mongrel2,$(MONGREL2_VERSION))
 MONGREL2_LICENSE = BSD-3c
 MONGREL2_LICENSE_FILES = LICENSE
 MONGREL2_DEPENDENCIES = sqlite zeromq
package/mtdev2tuio/mtdev2tuio.mk +1 -1
index ff56ee7..3116f39 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1
-MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/$(MTDEV2TUIO_VERSION)
+MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION))
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
 MTDEV2TUIO_LICENSE = GPLv3+
 MTDEV2TUIO_LICENSE_FILES = COPYING
package/neardal/neardal.mk +1 -1
index 7e085e4..c07ae5f 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 NEARDAL_VERSION = 0.8
-NEARDAL_SITE = http://github.com/connectivity/neardal/tarball/$(NEARDAL_VERSION)
+NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION))
 NEARDAL_SOURCE = connectivity-neardal-$(NEARDAL_VERSION).tar.gz
 NEARDAL_INSTALL_STAGING = YES
 NEARDAL_LICENSE = GPLv2
package/omap-u-boot-utils/omap-u-boot-utils.mk +1 -1
index 8e03718..10c7a07 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852322c6f52bd09568bef7725ab509d81725
-OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/$(OMAP_U_BOOT_UTILS_VERSION)
+OMAP_U_BOOT_UTILS_SITE = $(call github,nmenon,omap-u-boot-utils,$(OMAP_U_BOOT_UTILS_VERSION))
 OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
 OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 
package/on2-8170-modules/on2-8170-modules.mk +1 -1
index d332885..f779eda 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
-ON2_8170_MODULES_SITE    = http://github.com/alexandrebelloni/on2-8170-modules/tarball/$(ON2_8170_MODULES_VERSION)
+ON2_8170_MODULES_SITE    = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
 
 ON2_8170_MODULES_DEPENDENCIES = linux
 
package/pkg-utils.mk +3 -0
index 0ef433d..40a8ed0 100644
@@ -73,6 +73,9 @@ INFLATE.tar  = cat
 # suitable-extractor(filename): returns extractor based on suffix
 suitable-extractor = $(INFLATE$(suffix $(1)))
 
+# github(user,package,version): returns site of github repository
+github = https://github.com/$(1)/$(2)/tarball/$(3)
+
 # MESSAGE Macro -- display a message in bold type
 MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
 TERM_BOLD  := $(shell tput smso)
package/python-ipy/python-ipy.mk +1 -1
index baac094..c03f91f 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 PYTHON_IPY_VERSION = IPy-0.75
-PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/$(PYTHON_IPY_VERSION)
+PYTHON_IPY_SITE    = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
 PYTHON_IPY_DEPENDENCIES = host-python python
 PYTHON_IPY_LICENSE = BSD-3c
 PYTHON_IPY_LICENSE_FILES = COPYING
package/qjson/qjson.mk +1 -1
index 29b8c31..dcd53bc 100644
@@ -6,7 +6,7 @@
 
 QJSON_VERSION = 0.8.1
 
-QJSON_SITE = http://github.com/flavio/qjson/tarball/$(QJSON_VERSION)
+QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
 QJSON_INSTALL_STAGING = YES
 QJSON_DEPENDENCIES =  qt
 QJSON_LICENSE = LGPLv2.1
package/rpi-firmware/rpi-firmware.mk +1 -1
index 94badf9..0cc8e19 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 RPI_FIRMWARE_VERSION = 18a163f9341755b00841312af2878afeb64c131c
-RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
+RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 
package/rpi-userland/rpi-userland.mk +1 -1
index 1741153..7171cc8 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 RPI_USERLAND_VERSION = 0d486513f56453f8203c270fcad0b04f8e4f1fee
-RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
+RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
package/socketcand/socketcand.mk +1 -1
index 1a19c92..1a2c9fc 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SOCKETCAND_VERSION = dc3437abf17359fa8cb16567415b47e7ef8568d0
-SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/$(SOCKETCAND_VERSION)
+SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION))
 SOCKETCAND_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
package/sqlcipher/sqlcipher.mk +1 -1
index e93d24d..1636a8e 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SQLCIPHER_VERSION = v1.1.9
-SQLCIPHER_SITE = http://github.com/sqlcipher/sqlcipher/archive/$(SQLCIPHER_VERSION)
+SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,$(SQLCIPHER_VERSION))
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES
 
package/sunxi-boards/sunxi-boards.mk +1 -1
index ef5b34d..932b625 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_BOARDS_VERSION = 25a868189dbaa40872b2ac7d8a941dd73972eb08
-SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/$(SUNXI_BOARDS_VERSION)
+SUNXI_BOARDS_SITE = $(call github,linux-sunxi,sunxi-boards,$(SUNXI_BOARDS_VERSION))
 SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools
 SUNXI_BOARDS_INSTALL_IMAGES = YES
 SUNXI_BOARDS_INSTALL_TARGET = NO
package/sunxi-cedarx/sunxi-cedarx.mk +1 -1
index 5e1c820..54d081e 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_CEDARX_VERSION = 74923e55fc3ef512d4cd2462da58ae5331611f37
-SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CEDARX_VERSION)
+SUNXI_CEDARX_SITE = $(call github,linux-sunxi,cedarx-libs,$(SUNXI_CEDARX_VERSION))
 
 SUNXI_CEDARX_INSTALL_STAGING = YES
 
package/sunxi-mali-prop/sunxi-mali-prop.mk +1 -1
index f04b0b0..0cb2d93 100644
@@ -5,6 +5,6 @@
 ################################################################################
 
 SUNXI_MALI_PROP_VERSION = e4ced471d576708ac9aa093e41a0f91cf429862b
-SUNXI_MALI_PROP_SITE = http://github.com/linux-sunxi/sunxi-mali-proprietary/tarball/$(SUNXI_MALI_PROP_VERSION)
+SUNXI_MALI_PROP_SITE = $(call github,linux-sunxi,sunxi-mali-proprietary,$(SUNXI_MALI_PROP_VERSION))
 
 $(eval $(generic-package))
package/sunxi-mali/sunxi-mali.mk +1 -1
index dec211f..d9fd8be 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_MALI_VERSION = c2491fe952354ba44538064e534ed7c731cedb1e
-SUNXI_MALI_SITE = http://github.com/linux-sunxi/sunxi-mali/tarball/$(SUNXI_MALI_VERSION)
+SUNXI_MALI_SITE = $(call github,linux-sunxi,sunxi-mali,$(SUNXI_MALI_VERSION))
 
 SUNXI_MALI_INSTALL_STAGING = YES
 SUNXI_MALI_DEPENDENCIES = sunxi-mali-prop
package/sunxi-tools/sunxi-tools.mk +1 -1
index d47574c..a6c38d9 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_TOOLS_VERSION = 3a94e721dd8d1e13d0b25da0a83463891e8e9ee0
-SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/$(SUNXI_TOOLS_VERSION)
+SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION))
 SUNXI_TOOLS_LICENSE = GPLv2+
 SUNXI_TOOLS_LICENSE_FILES = COPYING
 HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb
package/tinymembench/tinymembench.mk +1 -1
index 732616f..8bb01d5 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 TINYMEMBENCH_VERSION = v0.2
-TINYMEMBENCH_SITE = http://github.com/ssvb/tinymembench/tarball/$(TINYMEMBENCH_VERSION)
+TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,$(TINYMEMBENCH_VERSION))
 TINYMEMBENCH_LICENSE = MIT
 TINYMEMBENCH_LICENSE_FILES = main.c
 
package/tslib/tslib.mk +1 -1
index 751d01e..9524965 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 TSLIB_VERSION = 1.1
-TSLIB_SITE = http://github.com/kergoth/tslib/tarball/$(TSLIB_VERSION)
+TSLIB_SITE = $(call github,kergoth,tslib,$(TSLIB_VERSION))
 TSLIB_LICENSE = GPL, LGPL
 TSLIB_LICENSE_FILES = COPYING
 
package/xl2tp/xl2tp.mk +1 -1
index 7b0a228..cf496fe 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 XL2TP_VERSION = v1.3.1
-XL2TP_SITE = http://github.com/xelerance/xl2tpd/tarball/$(XL2TP_VERSION)
+XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION))
 XL2TP_DEPENDENCIES = libpcap
 
 define XL2TP_BUILD_CMDS
package/yajl/yajl.mk +1 -2
index 6f9c640..ff64123 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 YAJL_VERSION = 2.0.4
-YAJL_SITE = http://github.com/lloyd/yajl/tarball/$(YAJL_VERSION)
+YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION))
 YAJL_INSTALL_STAGING = YES
 YAJL_LICENSE = ISC
 YAJL_LICENSE_FILES = COPYING
--

1.7.9.5

#3 lore raw

PATCH v2 1/1 infra: introduce github helper function

Hi Maxime,

Quoted 3 lines

How about a dedicated URI scheme like github://<username>/<package>/<version> instead of a call to a macro ? I find it easier to remember, less error prone and maybe more user friendly.

Personally I don't have a strong preference; I chose the helper function because of the earlier discussion:

http://lists.busybox.net/pipermail/buildroot/2013-November/081714.html

Mischa

#4 lore raw

PATCH v2 1/1 infra: introduce github helper function

In reply to Maxime Hadjinlian
Quoted 7 lines · Maxime Hadjinlian

Hi everyone,

Thanks you Mischa for creating this patch.

How about a dedicated URI scheme like github://<username>/<package>/<version> instead of a call to a macro ? I find it easier to remember, less error prone and maybe more user friendly.

Easier to remember: maybe.

Less error prone: how so? Admittedly, with the call you won't get an
error if you forget the third argument, but you will get an error if you forget e.g. the $(call ...) part.

However, the killer argument is: the implementation of this helper
function is quite trivial, while the implementation of a github URL parser would be a lot more complicated.

Bottom line: I like it the way it is.

That said, feel free to post an alternative patch :-)

Regards,
Arnout

[snip]

Signature · 6 lines
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#5 lore raw

PATCH v2 1/1 infra: introduce github helper function

Quoted 14 lines · Arnout Vandecappelle
Quoted 9 lines · Maxime Hadjinlian

Hi everyone,

Thanks you Mischa for creating this patch.

How about a dedicated URI scheme like github://<username>/<package>/<version> instead of a call to a macro ? I find it easier to remember, less error prone and maybe more user friendly.

Easier to remember: maybe.

Quoted 7 lines

Less error prone: how so? Admittedly, with the call you won't get an error
if you forget the third argument, but you will get an error if you forget e.g. the $(call ...) part.

However, the killer argument is: the implementation of this helper function
is quite trivial, while the implementation of a github URL parser would be a lot more complicated.

You're right.
I don't how I managed that, but I totally missed the answer to my own thread.
After reading the missed thread, I fully agree with what was said and your arguments right here is, a trully a killer one.
No need to had clutter when it's not really needed.

Quoted 19 lines

Bottom line: I like it the way it is.

That said, feel free to post an alternative patch :-)

Regards,
Arnout

[snip]

--

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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#6 lore raw

PATCH v2 1/1 infra: introduce github helper function

In reply to Mischa Jonker

Hi Mischa,

Quoted 49 lines · Mischa Jonker

In order to make it easier to cope with changes in github download-URL's, this patch introduces the github helper function. It generates the site URL of a github repository. It's usage is $(call github,user,pkg,version).

Cc Arnout Vandecapelle <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
Cc Samuel Martin <[email protected]>
Cc Thomas De Schampheleire <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
v2:
fixed input-event-daemon

 docs/manual/adding-packages-tips.txt             |    5 +++--
 package/a10disp/a10disp.mk                       |    2 +-
 package/civetweb/civetweb.mk                     |    2 +-
 package/cpuload/cpuload.mk                       |    2 +-
 package/fb-test-app/fb-test-app.mk               |    2 +-
 package/input-event-daemon/input-event-daemon.mk |    2 +-
 package/jq/jq.mk                                 |    2 +-
 package/jsmin/jsmin.mk                           |    2 +-
 package/knock/knock.mk                           |    2 +-
 package/libcec/libcec.mk                         |    2 +-
 package/libcofi/libcofi.mk                       |    2 +-
 package/libiqrf/libiqrf.mk                       |    2 +-
 package/liblog4c-localtime/liblog4c-localtime.mk |    2 +-
 package/libsha1/libsha1.mk                       |    2 +-
 package/libsoc/libsoc.mk                         |    2 +-
 package/libtpl/libtpl.mk                         |    2 +-
 package/linenoise/linenoise.mk                   |    2 +-
 package/lua-ev/lua-ev.mk                         |    2 +-
 package/luacrypto/luacrypto.mk                   |    2 +-
 package/luaexpatutils/luaexpatutils.mk           |    2 +-
 package/luasql/luasql.mk                         |    2 +-
 package/mongrel2/mongrel2.mk                     |    2 +-
 package/mtdev2tuio/mtdev2tuio.mk                 |    2 +-
 package/neardal/neardal.mk                       |    2 +-
 package/omap-u-boot-utils/omap-u-boot-utils.mk   |    2 +-
 package/on2-8170-modules/on2-8170-modules.mk     |    2 +-
 package/pkg-utils.mk                             |    3 +++
 package/python-ipy/python-ipy.mk                 |    2 +-
 package/qjson/qjson.mk                           |    2 +-
 package/rpi-firmware/rpi-firmware.mk             |    2 +-
 package/rpi-userland/rpi-userland.mk             |    2 +-
 package/socketcand/socketcand.mk                 |    2 +-
 package/sqlcipher/sqlcipher.mk                   |    2 +-
 package/sunxi-boards/sunxi-boards.mk             |    2 +-
 package/sunxi-cedarx/sunxi-cedarx.mk             |    2 +-
Quoted 9 lines
 package/sunxi-mali-prop/sunxi-mali-prop.mk       |    2 +-
 package/sunxi-mali/sunxi-mali.mk                 |    2 +-
 package/sunxi-tools/sunxi-tools.mk               |    2 +-
 package/tinymembench/tinymembench.mk             |    2 +-
 package/tslib/tslib.mk                           |    2 +-
 package/xl2tp/xl2tp.mk                           |    2 +-
 package/yajl/yajl.mk                             |    2 +-
 42 files changed, 46 insertions(+), 42 deletions(-)

As Arnout mentioned in his comments on the first version, adding-packages-generic.txt also give a wrong example of github integration. I think that should be fixed too, probably adding a reference to the github section for more details.

Also: are you planning a follow-up patch fixing the packages that are currently using git://github.com ?

Regarding the defconfigs: Arnout suggested adding the $(call github) there as well. However, I'm not very fond of that: if you run 'make savedefconfig' later it will not be preserved.

Best regards,
Thomas

#7 lore raw

PATCH v2 1/1 infra: introduce github helper function

Quoted 3 lines · Thomas De Schampheleire

Regarding the defconfigs: Arnout suggested adding the $(call github) there as well. However, I'm not very fond of that: if you run 'make savedefconfig' later it will not be preserved.

Why would it not be preserved?

The only real disadvantage is that it looks very ugly:

BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux-sunxi,linux-sunxi,274a66a7bfcbaabb88d63e4eba161965383cc416)/linux-sunxi-274a66a7bfcbaabb88d63e4eba161965383cc416.tar.gz"

Regards,
Arnout

Quoted 3 lines

Best regards,
Thomas

Signature · 6 lines
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#8 lore raw

PATCH v2 1/1 infra: introduce github helper function

Quoted 10 lines · Arnout Vandecappelle
Quoted 3 lines · Thomas De Schampheleire

Regarding the defconfigs: Arnout suggested adding the $(call github) there as well. However, I'm not very fond of that: if you run 'make savedefconfig' later it will not be preserved.

Why would it not be preserved?

The only real disadvantage is that it looks very ugly:

BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux-sunxi,linux-sunxi,274a66a7bfcbaabb88d63e4eba161965383cc416)/linux-sunxi-274a66a7bfcbaabb88d63e4eba161965383cc416.tar.gz"

Ah, my bad. It would be preserved, indeed.

It does look awkward, but I am not strongly against nor for changing it.

But: what will be the strategy for the defconfigs with respect to using git / http-tarball ? In a defconfig, a version bump of, say, the kernel is actually easier with the git method, since you only have to update BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION, while with a tarball (with or without the github helper) you need to update the version number in two places inside a long string.
FYI: currently the nitrogen6x defconfig uses a tarball, the others (cubieboard, cubieboard2, raspberrypi, calao_snowball) use git.

Best regards,
Thomas