commits August 2012

commits@lists.open-mesh.org

1 participants
355 discussions

[openwrt-feed-batman-adv] master: batman-adv-devel: handle crc16 correctly (2bf13e7)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 2bf13e7b0a4da06e7a096acbdf302116d6c07752 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Jun 24 14:53:12 2011 +0000 batman-adv-devel: handle crc16 correctly >--------------------------------------------------------------- 2bf13e7b0a4da06e7a096acbdf302116d6c07752 batman-adv-devel/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 3b57c74..e00105e 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_BATMAN_REV:=7bad46397eff76871c05fa219a95e00fc0b6ee3f -PKG_BATCTL_REV:=c6ed60c0f6fd9ba1a61693b4ddf2988487a21fcb +PKG_BATMAN_REV:=8c1fb2c2aa1ed1f5fa67a7d3459a9b6428aa337f +PKG_BATCTL_REV:=27b695b97cf0d6813e3e9951538186e15ad62068 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz @@ -33,11 +33,10 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=@!LINUX_2_4 + DEPENDS:=@!LINUX_2_4 +kmod-crc16 TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) - $(call AddDepends/crc16) endef define KernelPackage/batman-adv-devel/description

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: updating to latest git version & split init files (a832a79)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit a832a799a31bd3361e303eaf2b054cf5c8fe6f5a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Aug 21 23:14:26 2011 +0000 batman-adv-devel: updating to latest git version & split init files >--------------------------------------------------------------- a832a799a31bd3361e303eaf2b054cf5c8fe6f5a batman-adv-devel/Makefile | 10 +- batman-adv-devel/files/etc/init.d/batman-adv | 98 +------------------- .../init.d/batman-adv => lib/batman-adv/config.sh} | 28 +----- 3 files changed, 8 insertions(+), 128 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index e00105e..b338f44 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_BATMAN_REV:=8c1fb2c2aa1ed1f5fa67a7d3459a9b6428aa337f -PKG_BATCTL_REV:=27b695b97cf0d6813e3e9951538186e15ad62068 +PKG_BATMAN_REV:=d5efe7cd4d42d141056c1dd6c6498d168fcf66b7 +PKG_BATCTL_REV:=0a284c579e26edc603f46f71684ee66f8bfc0a68 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz @@ -109,16 +109,18 @@ endef ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL),) define KernelPackage/batman-adv-devel/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d + $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ endef else define KernelPackage/batman-adv-devel/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d + $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config endef endif diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/etc/init.d/batman-adv index a6a8500..f0f6789 100644 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ b/batman-adv-devel/files/etc/init.d/batman-adv @@ -3,101 +3,7 @@ START=90 -is_module_loaded() { - - if [ ! -d "/sys/module/batman_adv" ]; then - echo "batman-adv module directory not found - was the kernel module loaded ?" >&2 - return 0 - fi - - return 1 -} - -start_mesh () { - local meshif="$1" - local interfaces aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode - - is_module_loaded - [ $? -ne 1 ] && return - - config_get interfaces "$meshif" interfaces - config_get aggregated_ogms "$meshif" aggregated_ogms - config_get bonding "$meshif" bonding - config_get fragmentation "$meshif" fragmentation - config_get gw_bandwidth "$meshif" gw_bandwidth - config_get gw_mode "$meshif" gw_mode - config_get gw_sel_class "$meshif" gw_sel_class - config_get log_level "$meshif" log_level - config_get orig_interval "$meshif" orig_interval - config_get vis_mode "$meshif" vis_mode - - if [ "$interfaces" = "" ]; then - echo Error, you must specify at least a network interface - return - fi - - for interface in $interfaces - do - ifname=$(uci -P /var/state get network.$interface.ifname 2>&-) - [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && { - ifname=${interface} - [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && echo "Can't add interface $ifname - ignoring" && continue - } - - echo $meshif > /sys/class/net/$ifname/batman_adv/mesh_iface - done - - if [ $orig_interval ]; then - echo $orig_interval > /sys/class/net/$meshif/mesh/orig_interval - fi - - if [ $log_level ]; then - echo $log_level > /sys/class/net/$meshif/mesh/log_level 2>&- - fi - - if [ $aggregated_ogms ]; then - echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms - fi - - if [ $bonding ]; then - echo $bonding > /sys/class/net/$meshif/mesh/bonding - fi - - if [ $fragmentation ]; then - echo $fragmentation > /sys/class/net/$meshif/mesh/fragmentation - fi - - if [ $gw_bandwidth ]; then - echo $gw_bandwidth > /sys/class/net/$meshif/mesh/gw_bandwidth - fi - - if [ $gw_mode ]; then - echo $gw_mode > /sys/class/net/$meshif/mesh/gw_mode - fi - - if [ $gw_sel_class ]; then - echo $gw_sel_class > /sys/class/net/$meshif/mesh/gw_sel_class - fi - - if [ $vis_mode ]; then - echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode - fi -} - -stop_mesh() { - local meshif="$1" - - is_module_loaded - [ $? -ne 1 ] && return - - for iface in $(ls /sys/class/net/*) - do - [ ! -f "$iface/batman_adv/mesh_iface" ] && continue - [ "$(head -1 $iface/batman_adv/mesh_iface)" != "$meshif" ] && continue - - echo "none" > $iface/batman_adv/mesh_iface - done -} +. /lib/batman-adv/config.sh # can also be used with "batman-adv start bat0" start() { @@ -120,5 +26,3 @@ stop () { config_foreach stop_mesh mesh fi } - - diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/lib/batman-adv/config.sh similarity index 87% copy from batman-adv-devel/files/etc/init.d/batman-adv copy to batman-adv-devel/files/lib/batman-adv/config.sh index a6a8500..347e307 100644 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -1,8 +1,6 @@ -#!/bin/sh /etc/rc.common +#!/bin/sh # Copyright (C) 2011 OpenWrt.org -START=90 - is_module_loaded() { if [ ! -d "/sys/module/batman_adv" ]; then @@ -98,27 +96,3 @@ stop_mesh() { echo "none" > $iface/batman_adv/mesh_iface done } - -# can also be used with "batman-adv start bat0" -start() { - config_load batman-adv - - if [ -n "$1" ]; then - start_mesh $1 - else - config_foreach start_mesh mesh - fi -} - -# can also be used with "batman-adv stop bat0" -stop () { - config_load batman-adv - - if [ -n "$1" ]; then - stop_mesh $1 - else - config_foreach stop_mesh mesh - fi -} - -

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: openwrt devs renamed PATCH to KPATCH .. (19ee87a)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 19ee87a3f98d912bc74b11334fec058e75fedca2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Sep 12 00:42:11 2011 +0000 batman-adv-devel: openwrt devs renamed PATCH to KPATCH .. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 19ee87a3f98d912bc74b11334fec058e75fedca2 batman-adv-devel/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index b338f44..90222e6 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BATMAN_REV:=d5efe7cd4d42d141056c1dd6c6498d168fcf66b7 +PKG_BATMAN_REV:=dc1c387049b06b4429b62289d2a8d76f1ada154b PKG_BATCTL_REV:=0a284c579e26edc603f46f71684ee66f8bfc0a68 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) @@ -83,10 +83,11 @@ PATCH_BATCTL = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*b BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) endif +KPATCH ?= $(PATCH) define Build/DoPatch @if [ -d "$(2)" ]; then \ if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \ - $(PATCH) "$(1)" "$(2)" "$(3)"; \ + $(KPATCH) "$(1)" "$(2)" "$(3)"; \ fi; \ fi endef

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to lastest commits (2f5e219)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 2f5e21906dc7f91cb5847f5f8fdb5edd099b7031 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 30 21:26:29 2011 +0000 batman-adv-devel: update to lastest commits Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 2f5e21906dc7f91cb5847f5f8fdb5edd099b7031 batman-adv-devel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 90222e6..1064cef 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_BATMAN_REV:=dc1c387049b06b4429b62289d2a8d76f1ada154b -PKG_BATCTL_REV:=0a284c579e26edc603f46f71684ee66f8bfc0a68 +PKG_BATMAN_REV:=00ca20ef24617946e37bf69ca0a374f86ea56e6b +PKG_BATCTL_REV:=9031e43c3d40a1771d6969c44e06ba4229ee6522 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: support batctl patches (f761599)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit f761599c459692befb277ffb484d55b32a6ef634 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun May 1 13:45:04 2011 +0000 batman-adv-devel: support batctl patches * patches containing the string 'batman' will be applied onto the batman-adv code * patches containing the string 'batctl' will be applied onto the batctl code >--------------------------------------------------------------- f761599c459692befb277ffb484d55b32a6ef634 batman-adv-devel/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index ea2f69f..6fc245e 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_BATMAN_REV:=ffe432976aeb189d5721fc5d6dddc7340e8cf5b7 -PKG_BATCTL_REV:=16692bd9341f49d7c2f27ee6e3074d62f53df71e +PKG_BATMAN_REV:=89079aec4c0c2c60a3a2561afcce62538cebd71d +PKG_BATCTL_REV:=81bc72889b76209550b8e88a556ae48dc3b868d3 PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz @@ -79,13 +79,19 @@ endef $(eval $(call Download,batctl)) EXTRACT_BATCTL = tar xzf "$(DL_DIR)/$(PKG_BATCTL_FNAME)" -C "$(BUILD_DIR)/$(PKG_NAME)" +PATCH_BATCTL = $(PATCH) "$(PKG_BATCTL_BUILD_DIR)" "$(PATCH_DIR)" "*batctl*" BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) endif +define Build/Patch + $(PATCH) "$(PKG_BUILD_DIR)" "$(PATCH_DIR)" "*batman*" + $(EXTRACT_BATCTL) + $(PATCH_BATCTL) +endef + define Build/Compile cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS) - $(EXTRACT_BATCTL) $(BUILD_BATCTL) endef

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: check if patches directory exists before trying to apply patches (98b30da)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 98b30da81ea58b8403cced6c062ea15a44485971 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed May 4 14:08:09 2011 +0000 batman-adv-devel: check if patches directory exists before trying to apply patches >--------------------------------------------------------------- 98b30da81ea58b8403cced6c062ea15a44485971 batman-adv-devel/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 6fc245e..382e58b 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -79,12 +79,20 @@ endef $(eval $(call Download,batctl)) EXTRACT_BATCTL = tar xzf "$(DL_DIR)/$(PKG_BATCTL_FNAME)" -C "$(BUILD_DIR)/$(PKG_NAME)" -PATCH_BATCTL = $(PATCH) "$(PKG_BATCTL_BUILD_DIR)" "$(PATCH_DIR)" "*batctl*" +PATCH_BATCTL = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) endif +define Build/DoPatch + @if [ -d "$(2)" ]; then \ + if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \ + $(PATCH) "$(1)" "$(2)" "$(3)"; \ + fi; \ + fi +endef + define Build/Patch - $(PATCH) "$(PKG_BUILD_DIR)" "$(PATCH_DIR)" "*batman*" + $(call Build/DoPatch,"$(PKG_BUILD_DIR)","$(PATCH_DIR)","*batman*") $(EXTRACT_BATCTL) $(PATCH_BATCTL) endef

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: upgrade to latest trunk and handle crc16 dependency (70d3fc8)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 70d3fc85b660260477aef23fe5ba081c818a9a22 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue May 31 23:45:14 2011 +0000 batman-adv-devel: upgrade to latest trunk and handle crc16 dependency >--------------------------------------------------------------- 70d3fc85b660260477aef23fe5ba081c818a9a22 batman-adv-devel/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 382e58b..3b57c74 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_BATMAN_REV:=89079aec4c0c2c60a3a2561afcce62538cebd71d -PKG_BATCTL_REV:=81bc72889b76209550b8e88a556ae48dc3b868d3 +PKG_BATMAN_REV:=7bad46397eff76871c05fa219a95e00fc0b6ee3f +PKG_BATCTL_REV:=c6ed60c0f6fd9ba1a61693b4ddf2988487a21fcb PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz @@ -37,6 +37,7 @@ define KernelPackage/batman-adv-devel TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) + $(call AddDepends/crc16) endef define KernelPackage/batman-adv-devel/description @@ -67,7 +68,7 @@ MAKE_BATCTL_ARGS += \ CC="$(TARGET_CC)" \ NODEBUG=1 \ UNAME="Linux" \ - INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ STRIP="/bin/true" \ batctl install @@ -113,7 +114,7 @@ define KernelPackage/batman-adv-devel/install $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ endef else define KernelPackage/batman-adv-devel/install

1 0

[openwrt-feed-batman-adv] master: replace @LINUX_2_6 with @!LINUX_2_4, fixes fallout after openwrt commit 23246 (a901327)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit a901327219225952cf2c5833cfe527a399ae382a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Jan 19 13:29:49 2011 +0000 replace @LINUX_2_6 with @!LINUX_2_4, fixes fallout after openwrt commit 23246 >--------------------------------------------------------------- a901327219225952cf2c5833cfe527a399ae382a batman-adv-devel/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 633eda0..24b0e84 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_REV:=1787 +PKG_REV:=1902 PKG_VERSION:=r$(PKG_REV) PKG_SOURCE_PROTO:=svn @@ -28,8 +28,8 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=@LINUX_2_6 - TITLE:=B.A.T.M.A.N. Adv + DEPENDS:=@!LINUX_2_4 + TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) endef

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update config/init script to match latest release (7557f67)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 7557f67e64327e30f17d2224ea53dffed483db14 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Jan 31 02:54:10 2011 +0000 batman-adv-devel: update config/init script to match latest release >--------------------------------------------------------------- 7557f67e64327e30f17d2224ea53dffed483db14 batman-adv-devel/Makefile | 2 +- batman-adv-devel/files/etc/config/batman-adv | 9 +++++++-- batman-adv-devel/files/etc/init.d/batman-adv | 26 +++++++++++++++++++++++--- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 24b0e84..f9f1743 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_REV:=1902 +PKG_REV:=1928 PKG_VERSION:=r$(PKG_REV) PKG_SOURCE_PROTO:=svn diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 886fdb9..9c66c93 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -1,8 +1,13 @@ config 'mesh' 'bat0' option 'interfaces' 'wlan0' - option 'orig_interval' - option 'log_level' option 'aggregated_ogms' option 'bonding' + option 'fragmentation' + option 'gw_bandwidth' + option 'gw_mode' + option 'gw_sel_class' + option 'log_level' + option 'orig_interval' option 'vis_mode' + diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/etc/init.d/batman-adv index a08b21e..5011b6d 100644 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ b/batman-adv-devel/files/etc/init.d/batman-adv @@ -13,16 +13,20 @@ is_module_loaded() { start_mesh () { local meshif="$1" - local interfaces orig_interval log_level aggregated_ogms bonding vis_mode + local interfaces aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode is_module_loaded [ $? -ne 1 ] && return config_get interfaces "$meshif" interfaces - config_get orig_interval "$meshif" orig_interval - config_get log_level "$meshif" log_level config_get aggregated_ogms "$meshif" aggregated_ogms config_get bonding "$meshif" bonding + config_get fragmentation "$meshif" fragmentation + config_get gw_bandwidth "$meshif" gw_bandwidth + config_get gw_mode "$meshif" gw_mode + config_get gw_sel_class "$meshif" gw_sel_class + config_get log_level "$meshif" log_level + config_get orig_interval "$meshif" orig_interval config_get vis_mode "$meshif" vis_mode if [ "$interfaces" = "" ]; then @@ -52,6 +56,22 @@ start_mesh () { echo $bonding > /sys/class/net/$meshif/mesh/bonding fi + if [ $fragmentation ]; then + echo $fragmentation > /sys/class/net/$meshif/mesh/fragmentation + fi + + if [ $gw_bandwidth ]; then + echo $gw_bandwidth > /sys/class/net/$meshif/mesh/gw_bandwidth + fi + + if [ $gw_mode ]; then + echo $gw_mode > /sys/class/net/$meshif/mesh/gw_mode + fi + + if [ $gw_sel_class ]; then + echo $gw_sel_class > /sys/class/net/$meshif/mesh/gw_sel_class + fi + if [ $vis_mode ]; then echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode fi

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: convert devel package to use git (adcf17d)
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit adcf17dc99068d331272811657e32bc060c3b597 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Mar 22 14:56:25 2011 +0000 batman-adv-devel: convert devel package to use git >--------------------------------------------------------------- adcf17dc99068d331272811657e32bc060c3b597 batman-adv-devel/Makefile | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index f9f1743..3eff7ed 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,16 +10,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_REV:=1928 +PKG_BATMAN_REV:=3cc9ba15c95147eeb70529ca3892853b3c81a862 +PKG_BATCTL_REV:=6f77463027311b49d52bd3aef4d82c8aae27014f -PKG_VERSION:=r$(PKG_REV) -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/trunk -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) +PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz +PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV) +PKG_BATCTL_SHORTREV:=$(shell echo $(PKG_BATCTL_REV) | cut -c1-7) +PKG_BATCTL_FNAME:=batctl-devel-$(PKG_BATCTL_SHORTREV).tar.gz +PKG_BATCTL_DIR:=batctl-$(PKG_BATCTL_SHORTREV) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_SOURCE_URL:=http://git.open-mesh.org/snapshot/$(PKG_BATMAN_VERSION) +PKG_SOURCE:=$(PKG_BATMAN_FNAME) + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_BATMAN_DIR) +PKG_BATCTL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_BATCTL_DIR) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -30,14 +35,14 @@ define KernelPackage/batman-adv-devel SUBMENU:=Network Support DEPENDS:=@!LINUX_2_4 TITLE:=B.A.T.M.A.N. Adv devel - FILES:=$(PKG_BUILD_DIR)/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) endef define KernelPackage/batman-adv-devel/description B.A.T.M.A.N. advanced is a kernel module which allows to build layer 2 mesh networks. This package builds the latest -development version ($(PKG_VERSION)) of the kernel module plus +development version ($(PKG_BATMAN_SHORTREV)) of the kernel module plus its user space configuration & managerment tool batctl. endef @@ -49,16 +54,16 @@ MAKE_BATMAN_ADV_ARGS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ PATH="$(TARGET_PATH)" \ - $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG -DREVISION_VERSION=\\\"$(PKG_REV)\\\"") \ - SUBDIRS="$(PKG_BUILD_DIR)/batman-adv" \ + $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG -DREVISION_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\"") \ + SUBDIRS="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ - REVISION="$(PKG_REV)" modules + REVISION="$(PKG_BATMAN_SHORTREV)" modules MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \ CCFLAGS="$(TARGET_CFLAGS)" \ OFLAGS="$(TARGET_CFLAGS)" \ - REVISION="$(PKG_REV)" \ + REVISION="$(PKG_BATCTL_SHORTREV)" \ CC="$(TARGET_CC)" \ NODEBUG=1 \ UNAME="Linux" \ @@ -67,12 +72,20 @@ MAKE_BATCTL_ARGS += \ batctl install ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL),) -BUILD_BATCTL = $(MAKE) -C $(PKG_BUILD_DIR)/batctl $(MAKE_BATCTL_ARGS) +define Download/batctl + FILE:=$(PKG_BATCTL_FNAME) + URL:=$(PKG_SOURCE_URL) +endef +$(eval $(call Download,batctl)) + +EXTRACT_BATCTL = tar xzf "$(DL_DIR)/$(PKG_BATCTL_FNAME)" -C "$(BUILD_DIR)/$(PKG_NAME)" +BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) endif define Build/Compile - cp $(PKG_BUILD_DIR)/batman-adv/Makefile.kbuild $(PKG_BUILD_DIR)/batman-adv/Makefile + cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS) + $(EXTRACT_BATCTL) $(BUILD_BATCTL) endef

1 0

← Newer
1
...
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2012