infra: introduce github helper function
PATCH v3 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).
---
v3:
- rebase on master
- removed reference to old github method and added xref
- _no_ change in defconfigs, as there is no consensus yet on policy, and we can add it later in a separate patch.
docs/manual/adding-packages-generic.txt | 5 +++-- 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/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, 48 insertions(+), 43 deletions(-)
docs/manual/adding-packages-generic.txt +3 -2
@@ -230,7 +230,9 @@ information is (assuming the package name is +libfoo+) : URL or a local filesystem path. HTTP, FTP and SCP are supported URL types for retrieving package tarballs. Git, Subversion, Mercurial, and Bazaar are supported URL types for retrieving packages directly - from source code management systems. A filesystem path may be used + from source code management systems. There is a helper function to make + it easier to download source tarballs from github (refer to + xref:github-download-url[] for details). A filesystem path may be used to specify either a tarball or a directory containing the package source code. See +LIBFOO_SITE_METHOD+ below for more details on how retrieval works. +
@@ -244,7 +246,6 @@ information is (assuming the package name is +libfoo+) : Examples: + +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ + +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+ + - +LIBFOO_SITE=git://github.com/kergoth/tslib.git+ + +LIBFOO_SITE=/opt/software/libfoo.tar.gz+ + +LIBFOO_SITE=$(TOPDIR)/../src/libfoo/+
docs/manual/adding-packages-tips.txt +3 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/jsmin/jsmin.mk +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@ ################################################################################ RPI_FIRMWARE_VERSION = f7e9bcd25c9b01521fdf88aac2740b6cfc887dfb -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
@@ -5,7 +5,7 @@ ################################################################################ RPI_USERLAND_VERSION = d2c9f912da389c23ed27e81e940be3540f64fc59 -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v3 1/1 infra: introduce github helper function
Hi Mischa,
Quoted 52 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]>Signed-off-by Mischa Jonker <[email protected]>---
v3:
- rebase on master
- removed reference to old github method and added xref
- _no_ change in defconfigs, as there is no consensus yet on policy, and we can add it later in a separate patch.docs/manual/adding-packages-generic.txt | 5 +++-- 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/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 8 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, 48 insertions(+), 43 deletions(-)
Given the large number of files touched, I'd find it easier to review if this would be split in two patches: one for the infra changes, one for the packages. You could put the doc changes even in a separate patch. Note this is my personal opinion, I don't know if it is shared by others.
There seem to be several packages missing in your patch. I think all of the below can use the github helper too (even jq that uses a special URL)
$ find -name "*.mk" | xargs grep _SITE | grep github | grep http ./package/inadyn/inadyn.mk:INADYN_SITE = https://github.com/downloads/troglobit/inadyn ./package/jq/jq.mk:JQ_SITE = http://stedolan.github.io/jq/download/source ./package/snowball-init/snowball-init.mk:SNOWBALL_INIT_SITE = https://github.com/igloocommunity/snowball-init ./package/libevent/libevent.mk:LIBEVENT_SITE = https://github.com/downloads/libevent/libevent ./package/wsapi/wsapi.mk:WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi ./package/luafilesystem/luafilesystem.mk:LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem ./package/copas/copas.mk:COPAS_SITE = http://github.com/downloads/keplerproject/copas ./package/ti-utils/ti-utils.mk:TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/$(TI_UTILS_VERSION) ./package/cgilua/cgilua.mk:CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua ./package/taglib/taglib.mk:TAGLIB_SITE = http://github.com/downloads/taglib/taglib ./package/ne10/ne10.mk:NE10_SITE = http://github.com/projectNe10/Ne10/tarball/$(NE10_VERSION) ./package/inotify-tools/inotify-tools.mk:INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/ ./package/luaposix/luaposix.mk:LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive ./package/freerdp/freerdp.mk:FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP ./package/rings/rings.mk:RINGS_SITE = http://github.com/downloads/keplerproject/rings ./package/mrouted/mrouted.mk:MROUTED_SITE = http://cloud.github.com/downloads/troglobit/mrouted ./package/cpanminus/cpanminus.mk:CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/archive ./package/libarchive/libarchive.mk:LIBARCHIVE_SITE = http://github.com/downloads/libarchive/libarchive ./package/orbit/orbit.mk:ORBIT_SITE = http://github.com/downloads/keplerproject/orbit ./package/lua-msgpack-native/lua-msgpack-native.mk:LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/$(LUA_MSGPACK_NATIVE_VERSION) ./package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk:XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator ./package/xavante/xavante.mk:XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante ./package/snowball-hdmiservice/snowball-hdmiservice.mk:SNOWBALL_HDMISERVICE_SITE = https://github.com/igloocommunity/hdmiservice ./package/lcdapi/lcdapi.mk:LCDAPI_SITE = http://github.com/spdawson/lcdapi/tarball/$(LCDAPI_VERSION) ./package/libiscsi/libiscsi.mk:LIBISCSI_SITE = https://github.com/downloads/sahlberg/libiscsi
This patch only changes the existing http(s) github downloads. Do you plan to create a follow-up patch to replace the current git:// github packages to use the new helper too (and thus the http tarball method)?
Finally, you added the github helper in pkg-utils.mk, but I think pkg-download.mk may be a more logical place.
Best regards,
Thomas
PATCH v3 1/1 infra: introduce github helper function
Hi Thomas,
First of all, thanks for looking at the patches.
Quoted 3 lines
This patch only changes the existing http(s) github downloads. Do you plan to create a follow-up patch to replace the current
git://github packages to use the new helper too (and thus the http tarball method)?
I have not planned that yet, but of course I can take a look at it. When is it required?
Mischa
PATCH v3 1/1 infra: introduce github helper function
Hi Mischa,
Quoted 9 lines · Mischa Jonker
Hi Thomas,
First of all, thanks for looking at the patches.
Quoted 3 lines
This patch only changes the existing http(s) github downloads. Do you plan to create a follow-up patch to replace the current
git://github packages to use the new helper too (and thus the http tarball method)?I have not planned that yet, but of course I can take a look at it. When is it required?
There is nothing 'required' and there are no deadlines. If you have time for it that would be great. If not, no problem either, then I will have a look at it, just let us know.
Thanks,
Thomas