Changeset 35175


Ignore:
Timestamp:
2013-01-15T14:09:04+01:00 (5 years ago)
Author:
marek
Message:

batman-adv: upgrade package to latest release 2013.0.0 & netifd integration

Signed-off-by: Gui Iribarren <gui@…>
Signed-off-by: Moritz Warning <moritzwarning@…>
Signed-off-by: Marek Lindner <lindner_marek@…>

Location:
packages/net/batman-adv
Files:
3 added
5 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • packages/net/batman-adv/Config.in

    r32342 r35175  
    44        depends PACKAGE_kmod-batman-adv 
    55        default n 
     6 
    67config KMOD_BATMAN_ADV_BLA 
    78        bool "enable bridge loop avoidance" 
    89        depends PACKAGE_kmod-batman-adv 
    910        default y 
     11 
     12config KMOD_BATMAN_ADV_DAT 
     13        bool "enable distributed arp table" 
     14        depends PACKAGE_kmod-batman-adv 
     15        default y 
     16 
    1017config KMOD_BATMAN_ADV_BATCTL 
    1118        bool "enable batctl" 
  • packages/net/batman-adv/Makefile

    r34385 r35175  
    1111PKG_NAME:=batman-adv 
    1212 
    13 PKG_VERSION:=2012.4.0 
    14 BATCTL_VERSION:=2012.4.0 
    15 PKG_RELEASE:=2 
    16 PKG_MD5SUM:=24e922a64a507b146c32c585538407f2 
    17 BATCTL_MD5SUM:=79d5aa796ae8b008a9fa42c27d4da2c1 
     13PKG_VERSION:=2013.0.0 
     14BATCTL_VERSION:=2013.0.0 
     15PKG_RELEASE:=1 
     16PKG_MD5SUM:=37f4aa02f393daad3d87cead2bc28ed9 
     17BATCTL_MD5SUM:=6ea4bcd8a9332d586bb06b5063f882cd 
    1818 
    1919PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    3030  MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de> 
    3131  SUBMENU:=Network Support 
    32   DEPENDS:=+kmod-lib-crc16 +libc 
     32  DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc 
    3333  TITLE:=B.A.T.M.A.N. Adv 
    3434  FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) 
     
    5757        CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \ 
    5858        CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \ 
     59        CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \ 
    5960        REVISION="" all 
    6061 
     
    110111 
    111112define KernelPackage/batman-adv/install 
    112         $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin 
     113        $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto 
    113114        $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config 
    114115        $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv 
    115116        $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net 
    116         $(INSTALL_BIN) ./files/etc/hotplug.d/iface/99-batman-adv $(1)/etc/hotplug.d/iface 
     117        $(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto 
    117118        $(INSTALL_BIN) ./files/usr/sbin/batman-adv $(1)/usr/sbin 
    118119        $(BATCTL_INSTALL) 
  • packages/net/batman-adv/files/etc/config/batman-adv

    r32342 r35175  
    11 
    22config 'mesh' 'bat0' 
    3         option 'interfaces' 'mesh' 
    43        option 'aggregated_ogms' 
    54        option 'ap_isolation' 
     
    1312        option 'vis_mode' 
    1413        option 'bridge_loop_avoidance' 
     14        option 'distributed_arp_table' 
     15        option 'hop_penalty' 
    1516 
    1617# yet another batX instance 
  • packages/net/batman-adv/files/etc/hotplug.d/net/99-batman-adv

    r34385 r35175  
    1010                [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" 
    1111                ;; 
    12         remove) 
    13                 [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_del_interface mesh "$INTERFACE" 
    14                 ;; 
    1512esac 
  • packages/net/batman-adv/files/lib/batman-adv/config.sh

    r34385 r35175  
    1212{ 
    1313        local mesh="$1" 
    14         local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode bridge_loop_avoidance 
     14        local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation 
     15        local gw_bandwidth gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode 
    1516 
    1617        config_get aggregated_ogms "$mesh" aggregated_ogms 
     18        config_get ap_isolation "$mesh" ap_isolation 
    1719        config_get bonding "$mesh" bonding 
     20        config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance 
     21        config_get distributed_arp_table "$mesh" distributed_arp_table 
    1822        config_get fragmentation "$mesh" fragmentation 
    1923        config_get gw_bandwidth "$mesh" gw_bandwidth 
    2024        config_get gw_mode "$mesh" gw_mode 
    2125        config_get gw_sel_class "$mesh" gw_sel_class 
     26        config_get hop_penalty "$mesh" hop_penalty 
    2227        config_get log_level "$mesh" log_level 
    2328        config_get orig_interval "$mesh" orig_interval 
    24         config_get hop_penalty "$mesh" hop_penalty 
    2529        config_get vis_mode "$mesh" vis_mode 
    26         config_get ap_isolation "$mesh" ap_isolation 
    27         config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance 
    28          
     30 
    2931        [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 
    3032 
    31         [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval 
    32         [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty 
    33         [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- 
    3433        [ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms 
     34        [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation 
    3535        [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding 
     36        [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance 
     37        [ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table 
    3638        [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation 
    3739        [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth 
    3840        [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode 
    3941        [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class 
     42        [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty 
     43        [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- 
     44        [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval 
    4045        [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode 
    41         [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation 
    42         [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance 
    4346} 
    44  
    45 bat_add_interface() 
    46 { 
    47         local mesh="$1" 
    48         local interface="$2" 
    49         local interfaces 
    50  
    51         config_get interfaces $mesh interfaces 
    52         for iface in $interfaces; do 
    53                 [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || { 
    54                         iface=$(uci -q -P/var/state get network.$iface.ifname) 
    55                         [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || continue 
    56                 } 
    57          
    58                 [ "$iface" = "$interface" ] && echo $mesh > /sys/class/net/$iface/batman_adv/mesh_iface 
    59         done 
    60 } 
    61  
    62 bat_del_interface() 
    63 { 
    64         local mesh="$1" 
    65         local interface="$2" 
    66         local interfaces 
    67  
    68         config_get interfaces $mesh interfaces 
    69         for iface in $interfaces; do 
    70                 [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || { 
    71                         iface=$(uci -q -P/var/state get network.$iface.ifname) 
    72                         [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || continue 
    73                 } 
    74  
    75                 [ "$iface" = "$interface" ] && echo none > /sys/class/net/$iface/batman_adv/mesh_iface 
    76         done 
    77 } 
Note: See TracChangeset for help on using the changeset viewer.