bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix "d" mess in batman adv package

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@14842 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2009-03-10 15:48:41 +00:00
parent 8606590790
commit 6d6abb3d3e
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/batman-advanced/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=batmand-adv PKG_NAME:=batman-adv
PKG_REV:=1220 PKG_REV:=1220
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -34,7 +34,7 @@ define Package/batman-adv/Default
MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de> MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
endef endef
define Package/batmand-adv-userspace define Package/batman-adv-userspace
$(call Package/batman-adv/Default) $(call Package/batman-adv/Default)
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
@ -42,7 +42,7 @@ $(call Package/batman-adv/Default)
TITLE:=B.A.T.M.A.N. layer 2 routing daemon TITLE:=B.A.T.M.A.N. layer 2 routing daemon
endef endef
define Package/batmand-adv-userspace/description define Package/batman-adv-userspace/description
B.A.T.M.A.N. layer 2 routing daemon B.A.T.M.A.N. layer 2 routing daemon
endef endef
@ -106,7 +106,7 @@ MAKE_TOOL_ARGS += \
define Build/Configure define Build/Configure
endef endef
ifneq ($(CONFIG_PACKAGE_batmand-adv-userspace),n) ifneq ($(CONFIG_PACKAGE_batman-adv-userspace),n)
BUILD_ADV = $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_ARGS) BUILD_ADV = $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_ARGS)
endif endif
@ -125,17 +125,17 @@ define Build/Compile
$(BUILD_BATTOOL) $(BUILD_BATTOOL)
endef endef
define Package/batmand-adv-userspace/install define Package/batman-adv-userspace/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand-adv $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand-adv $(1)/usr/sbin/
$(INSTALL_BIN) ./files/etc/init.d/batmand-adv-userspace $(1)/etc/init.d $(INSTALL_BIN) ./files/etc/init.d/batman-adv-userspace $(1)/etc/init.d
$(INSTALL_DATA) ./files/etc/config/batmand-adv-userspace $(1)/etc/config $(INSTALL_DATA) ./files/etc/config/batman-adv-userspace $(1)/etc/config
endef endef
define Package/batmand-adv-kernelland/install define Package/batman-adv-kernelland/install
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) ./files/etc/init.d/batmand-adv-kernelland $(1)/etc/init.d $(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d
$(INSTALL_DATA) ./files/etc/config/batmand-adv-kernelland $(1)/etc/config $(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config
endef endef
define Package/battool/install define Package/battool/install
@ -143,6 +143,6 @@ define Package/battool/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/
endef endef
$(eval $(call BuildPackage,batmand-adv-userspace)) $(eval $(call BuildPackage,batman-adv-userspace))
$(eval $(call BuildPackage,battool)) $(eval $(call BuildPackage,battool))
$(eval $(call KernelPackage,batman-adv-kernelland)) $(eval $(call KernelPackage,batman-adv-kernelland))

2
net/batman-advanced/files/etc/config/batmand-adv-kernelland → net/batman-advanced/files/etc/config/batman-adv-kernelland
View File

@ -1,4 +1,4 @@
config batmand-adv-kernelland general config batman-adv-kernelland general
option interface ath0 option interface ath0
option originator_interval option originator_interval
option log_level option log_level

2
net/batman-advanced/files/etc/config/batmand-adv-userspace → net/batman-advanced/files/etc/config/batman-adv-userspace
View File

@ -1,4 +1,4 @@
config batmand-adv-userspace general config batman-adv-userspace general
option interface ath0 option interface ath0
option originator_interval option originator_interval
option visualisation_srv option visualisation_srv

10
net/batman-advanced/files/etc/init.d/batmand-adv-kernelland → net/batman-advanced/files/etc/init.d/batman-adv-kernelland
View File

@ -1,10 +1,10 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
START=90 START=90
. /lib/config/uci.sh . /lib/config/uci.sh
uci_load batmand-adv-kernelland uci_load batman-adv-kernelland
start () { start () {
interfaces=$(uci get batmand-adv-kernalland.general.interface) interfaces=$(uci get batman-adv-kernalland.general.interface)
if [ "$interface" = "" ]; then if [ "$interfaces" = "" ]; then
echo $1 Error, you must specify at least a network interface echo $1 Error, you must specify at least a network interface
exit exit
fi fi
@ -14,8 +14,8 @@ start () {
echo $interface > /proc/net/batman-adv/interfaces echo $interface > /proc/net/batman-adv/interfaces
done done
originator_interval=$(uci get batmand-adv-kernalland.general.originator_interval) originator_interval=$(uci get batman-adv-kernalland.general.originator_interval)
log_level=$(uci get batmand-adv-kernalland.general.log_level) log_level=$(uci get batman-adv-kernalland.general.log_level)
if [ $originator_interval ]; then if [ $originator_interval ]; then
echo $originator_interval > /proc/net/batman-adv/originator_interval echo $originator_interval > /proc/net/batman-adv/originator_interval

8
net/batman-advanced/files/etc/init.d/batmand-adv-userspace → net/batman-advanced/files/etc/init.d/batman-adv-userspace
View File

@ -1,15 +1,15 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
START=90 START=90
. /lib/config/uci.sh . /lib/config/uci.sh
uci_load batmand-adv-userspace uci_load batman-adv-userspace
start () { start () {
interface=$(uci get batmand-adv-userspace.general.interface) interface=$(uci get batman-adv-userspace.general.interface)
if [ "$interface" = "" ]; then if [ "$interface" = "" ]; then
echo $1 Error, you must specify at least a network interface echo $1 Error, you must specify at least a network interface
exit exit
fi fi
originator_interval=$(uci get batmand-adv-userspace.general.originator_interval) originator_interval=$(uci get batman-adv-userspace.general.originator_interval)
visualisation_srv=$(uci get batmand-adv-space.general.visualisation_srv) visualisation_srv=$(uci get batman-adv-userspace.general.visualisation_srv)
batman_args="" batman_args=""
if [ $originator_interval ]; then if [ $originator_interval ]; then