Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
commit 622168a7419722a949a05fd0e80bb302ca9c69bc Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed May 4 22:17:08 2016 +0800
batman-adv-devel: convert from git ids to git branches / tags
622168a7419722a949a05fd0e80bb302ca9c69bc batman-adv-devel/Config.in | 8 ++++---- batman-adv-devel/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 700a15e..01f9e7e 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -29,13 +29,13 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_V depends on PACKAGE_kmod-batman-adv-devel default n
-config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV +config KMOD_BATMAN_ADV_DEVEL_BATMAN_BRANCH string - prompt "batman-adv git revision to build package with" + prompt "batman-adv branch to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "d5e8ba8" + default "master" help - Enter the full or shortened git revision to override package + Enter a batman-adv branch name or git tag to override package default value. This allows to build from non-master branches to test unreleased features.
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 0d63ab3..892f71e 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv-devel
-PKG_VERSION:=$(call qstrip,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV)) -PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_VERSION) | cut -c1-7) +PKG_BRANCH:=$(call qstrip,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_BRANCH)) +PKG_BATMAN_SHORTREV:=$(shell git ls-remote https://git@git.open-mesh.org/batman-adv.git $(PKG_BRANCH) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV)