Upgrade the babel package to 0.97, renaming it to babeld
- adds librt dependency to the Makefile, - removes duplicated content from the sample babeld.conf file. Signed-off-by: Gabriel Kerneis <kerneis@pps.jussieu.fr> git-svn-id: svn://svn.openwrt.org/openwrt/packages@18462 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
parent
7419c6ce1d
commit
8acbe5fbf1
@ -8,24 +8,24 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=babeld
|
||||
PKG_VERSION:=0.96
|
||||
PKG_VERSION:=0.97
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
|
||||
PKG_MD5SUM:=fdb1949237ec99cd978222fe872c4f0b
|
||||
PKG_MD5SUM:=be0748c382dfe60bd35aa6b661e6077d
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/babel
|
||||
define Package/babeld
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=A loop-free distance-vector routing protocol
|
||||
URL:=http://www.pps.jussieu.fr/~jch/software/babel/
|
||||
DEPENDS:=+kmod-ipv6
|
||||
DEPENDS:=+kmod-ipv6 +librt
|
||||
endef
|
||||
|
||||
define Package/babel/description
|
||||
define Package/babeld/description
|
||||
Babel is a loop-avoiding distance-vector routing protocol roughly based
|
||||
on DSDV and AODV, but with provisions for link cost estimation and
|
||||
redistribution of routes from other routing protocols.
|
||||
@ -35,21 +35,23 @@ define Package/babel/description
|
||||
never counting to infinity.
|
||||
endef
|
||||
|
||||
define Package/babel/conffiles
|
||||
/etc/babel.conf
|
||||
define Package/babeld/conffiles
|
||||
/etc/babeld.conf
|
||||
endef
|
||||
|
||||
MAKE_FLAGS += \
|
||||
CC="$(TARGET_CC)" \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
|
||||
define Package/babel/install
|
||||
define Package/babeld/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc
|
||||
$(INSTALL_CONF) ./files/babel.conf $(1)/etc/
|
||||
$(INSTALL_CONF) ./files/babeld.conf $(1)/etc/
|
||||
$(INSTALL_DIR) $(1)/etc/config
|
||||
$(INSTALL_DATA) ./files/babeld.config $(1)/etc/config/babeld
|
||||
$(INSTALL_DIR) $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./files/babel.init $(1)/etc/init.d/babel
|
||||
$(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,babel))
|
||||
$(eval $(call BuildPackage,babeld))
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
# babel config file
|
||||
# Copyright (C) 2008 Juliusz Chroboczek, L. Aaron Kaplan
|
||||
# <jch@pps.jussieu.fr> , <aaron@lo-res.org>
|
||||
#
|
||||
# This config file simply docuements sample entries.
|
||||
# "redistribute" means: redistribute routes from other
|
||||
# routing protocols into babel. "local" means addresses assigned to local interfaces.
|
||||
#
|
||||
# the default rules are:
|
||||
#
|
||||
## redistribute local
|
||||
## redistribute deny
|
||||
#
|
||||
# this says, redistribute local addresses but no other routes
|
||||
|
||||
|
||||
|
||||
# redistribute IPv4 default route into babel
|
||||
## redistribute local ip 0.0.0.0/0 le 0 metric 128
|
||||
|
||||
# same but for IPv6
|
||||
## redistribute local ip ::/0 le 0 metric 128
|
||||
|
||||
# don't redistribute all local addresses, only selected ones
|
||||
# after the first line, the "deny" rules kicks in. After the "deny"
|
||||
# no redistribute local rules are going to match
|
||||
## redistribute local ip 192.160.4.0/24
|
||||
## redistribute local deny
|
||||
# babel config file
|
||||
# Copyright (C) 2008 Juliusz Chroboczek, L. Aaron Kaplan
|
||||
# <jch@pps.jussieu.fr> , <aaron@lo-res.org>
|
||||
#
|
||||
# This config file simply docuements sample entries.
|
||||
# "redistribute" means: redistribute routes from other
|
||||
# routing protocols into babel. "local" means addresses assigned to local interfaces.
|
||||
#
|
||||
# the default rules are:
|
||||
#
|
||||
## redistribute local
|
||||
## redistribute deny
|
||||
#
|
||||
# this says, redistribute local addresses but no other routes
|
||||
|
||||
|
||||
|
||||
# redistribute IPv4 default route into babel
|
||||
## redistribute local ip 0.0.0.0/0 le 0 metric 128
|
||||
|
||||
# same but for IPv6
|
||||
## redistribute local ip ::/0 le 0 metric 128
|
||||
|
||||
# don't redistribute all local addresses, only selected ones
|
||||
# after the first line, the "deny" rules kicks in. After the "deny"
|
||||
# no redistribute local rules are going to match
|
||||
## redistribute local ip 192.160.4.0/24
|
||||
## redistribute local deny
|
||||
28
net/babel/files/babeld.conf
Normal file
28
net/babel/files/babeld.conf
Normal file
@ -0,0 +1,28 @@
|
||||
# babel config file
|
||||
# Copyright (C) 2008 Juliusz Chroboczek, L. Aaron Kaplan
|
||||
# <jch@pps.jussieu.fr> , <aaron@lo-res.org>
|
||||
#
|
||||
# This config file simply documents sample entries.
|
||||
# "redistribute" means: redistribute routes from other
|
||||
# routing protocols into babel. "local" means addresses assigned to local interfaces.
|
||||
#
|
||||
# the default rules are:
|
||||
#
|
||||
## redistribute local
|
||||
## redistribute deny
|
||||
#
|
||||
# this says, redistribute local addresses but no other routes
|
||||
|
||||
|
||||
|
||||
# redistribute IPv4 default route into babel
|
||||
## redistribute local ip 0.0.0.0/0 le 0 metric 128
|
||||
|
||||
# same but for IPv6
|
||||
## redistribute local ip ::/0 le 0 metric 128
|
||||
|
||||
# don't redistribute all local addresses, only selected ones
|
||||
# after the first line, the "deny" rules kicks in. After the "deny"
|
||||
# no redistribute local rules are going to match
|
||||
## redistribute local ip 192.160.4.0/24
|
||||
## redistribute local deny
|
||||
@ -1,2 +1,2 @@
|
||||
config babel
|
||||
config babeld
|
||||
option interfaces "wl0"
|
||||
@ -4,6 +4,34 @@ START=70
|
||||
|
||||
pidfile=/var/run/babeld.pid
|
||||
|
||||
babeld_config() {
|
||||
local cfg="$1"
|
||||
config_get interfaces "$cfg" interfaces
|
||||
}
|
||||
|
||||
start() {
|
||||
config_load babeld
|
||||
config_foreach babeld_config babeld
|
||||
mkdir -p /var/lib
|
||||
if [ -e $pidfile ] ; then
|
||||
echo "$pidfile exists -- not starting babel." >&2
|
||||
else
|
||||
/usr/sbin/babeld -D -I $pidfile $interfaces
|
||||
fi
|
||||
}
|
||||
|
||||
stop() {
|
||||
[ -e $pidfile ] && kill $(cat $pidfile)
|
||||
[ -e $pidfile ] && sleep 2
|
||||
[ -e $pidfile ] && sleep 4
|
||||
[ -e $pidfile ] && echo "Failed to stop babel ($pidfile still exists)."
|
||||
}
|
||||
#!/bin/sh /etc/rc.common
|
||||
|
||||
START=70
|
||||
|
||||
pidfile=/var/run/babeld.pid
|
||||
|
||||
babel_config() {
|
||||
local cfg="$1"
|
||||
config_get interfaces "$cfg" interfaces
|
||||
Loading…
x
Reference in New Issue
Block a user