From 6d6abb3d3e0fe0e12e5a7234f19005431512ff18 Mon Sep 17 00:00:00 2001 From: marek Date: Tue, 10 Mar 2009 15:48:41 +0000 Subject: [PATCH] fix "d" mess in batman adv package git-svn-id: svn://svn.openwrt.org/openwrt/packages@14842 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/batman-advanced/Makefile | 22 +++++++++---------- ...d-adv-kernelland => batman-adv-kernelland} | 2 +- ...and-adv-userspace => batman-adv-userspace} | 2 +- ...d-adv-kernelland => batman-adv-kernelland} | 10 ++++----- ...and-adv-userspace => batman-adv-userspace} | 8 +++---- 5 files changed, 22 insertions(+), 22 deletions(-) rename net/batman-advanced/files/etc/config/{batmand-adv-kernelland => batman-adv-kernelland} (65%) rename net/batman-advanced/files/etc/config/{batmand-adv-userspace => batman-adv-userspace} (68%) rename net/batman-advanced/files/etc/init.d/{batmand-adv-kernelland => batman-adv-kernelland} (66%) rename net/batman-advanced/files/etc/init.d/{batmand-adv-userspace => batman-adv-userspace} (68%) diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile index 4c9ce8806..194df05a1 100644 --- a/net/batman-advanced/Makefile +++ b/net/batman-advanced/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=batmand-adv +PKG_NAME:=batman-adv PKG_REV:=1220 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -34,7 +34,7 @@ define Package/batman-adv/Default MAINTAINER:=Marek Lindner endef -define Package/batmand-adv-userspace +define Package/batman-adv-userspace $(call Package/batman-adv/Default) SECTION:=net CATEGORY:=Network @@ -42,7 +42,7 @@ $(call Package/batman-adv/Default) TITLE:=B.A.T.M.A.N. layer 2 routing daemon endef -define Package/batmand-adv-userspace/description +define Package/batman-adv-userspace/description B.A.T.M.A.N. layer 2 routing daemon endef @@ -106,7 +106,7 @@ MAKE_TOOL_ARGS += \ define Build/Configure 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) endif @@ -125,17 +125,17 @@ define Build/Compile $(BUILD_BATTOOL) 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_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_DATA) ./files/etc/config/batmand-adv-userspace $(1)/etc/config + $(INSTALL_BIN) ./files/etc/init.d/batman-adv-userspace $(1)/etc/init.d + $(INSTALL_DATA) ./files/etc/config/batman-adv-userspace $(1)/etc/config endef -define Package/batmand-adv-kernelland/install +define Package/batman-adv-kernelland/install $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) ./files/etc/init.d/batmand-adv-kernelland $(1)/etc/init.d - $(INSTALL_DATA) ./files/etc/config/batmand-adv-kernelland $(1)/etc/config + $(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d + $(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config endef define Package/battool/install @@ -143,6 +143,6 @@ define Package/battool/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/ endef -$(eval $(call BuildPackage,batmand-adv-userspace)) +$(eval $(call BuildPackage,batman-adv-userspace)) $(eval $(call BuildPackage,battool)) $(eval $(call KernelPackage,batman-adv-kernelland)) diff --git a/net/batman-advanced/files/etc/config/batmand-adv-kernelland b/net/batman-advanced/files/etc/config/batman-adv-kernelland similarity index 65% rename from net/batman-advanced/files/etc/config/batmand-adv-kernelland rename to net/batman-advanced/files/etc/config/batman-adv-kernelland index 4ba0710dc..21062367a 100644 --- a/net/batman-advanced/files/etc/config/batmand-adv-kernelland +++ b/net/batman-advanced/files/etc/config/batman-adv-kernelland @@ -1,4 +1,4 @@ -config batmand-adv-kernelland general +config batman-adv-kernelland general option interface ath0 option originator_interval option log_level diff --git a/net/batman-advanced/files/etc/config/batmand-adv-userspace b/net/batman-advanced/files/etc/config/batman-adv-userspace similarity index 68% rename from net/batman-advanced/files/etc/config/batmand-adv-userspace rename to net/batman-advanced/files/etc/config/batman-adv-userspace index b077b7720..33dd034e8 100644 --- a/net/batman-advanced/files/etc/config/batmand-adv-userspace +++ b/net/batman-advanced/files/etc/config/batman-adv-userspace @@ -1,4 +1,4 @@ -config batmand-adv-userspace general +config batman-adv-userspace general option interface ath0 option originator_interval option visualisation_srv diff --git a/net/batman-advanced/files/etc/init.d/batmand-adv-kernelland b/net/batman-advanced/files/etc/init.d/batman-adv-kernelland similarity index 66% rename from net/batman-advanced/files/etc/init.d/batmand-adv-kernelland rename to net/batman-advanced/files/etc/init.d/batman-adv-kernelland index b55384155..649929a4e 100644 --- a/net/batman-advanced/files/etc/init.d/batmand-adv-kernelland +++ b/net/batman-advanced/files/etc/init.d/batman-adv-kernelland @@ -1,10 +1,10 @@ #!/bin/sh /etc/rc.common START=90 . /lib/config/uci.sh -uci_load batmand-adv-kernelland +uci_load batman-adv-kernelland start () { - interfaces=$(uci get batmand-adv-kernalland.general.interface) - if [ "$interface" = "" ]; then + interfaces=$(uci get batman-adv-kernalland.general.interface) + if [ "$interfaces" = "" ]; then echo $1 Error, you must specify at least a network interface exit fi @@ -14,8 +14,8 @@ start () { echo $interface > /proc/net/batman-adv/interfaces done - originator_interval=$(uci get batmand-adv-kernalland.general.originator_interval) - log_level=$(uci get batmand-adv-kernalland.general.log_level) + originator_interval=$(uci get batman-adv-kernalland.general.originator_interval) + log_level=$(uci get batman-adv-kernalland.general.log_level) if [ $originator_interval ]; then echo $originator_interval > /proc/net/batman-adv/originator_interval diff --git a/net/batman-advanced/files/etc/init.d/batmand-adv-userspace b/net/batman-advanced/files/etc/init.d/batman-adv-userspace similarity index 68% rename from net/batman-advanced/files/etc/init.d/batmand-adv-userspace rename to net/batman-advanced/files/etc/init.d/batman-adv-userspace index 9ea7e4fee..f634977ab 100644 --- a/net/batman-advanced/files/etc/init.d/batmand-adv-userspace +++ b/net/batman-advanced/files/etc/init.d/batman-adv-userspace @@ -1,15 +1,15 @@ #!/bin/sh /etc/rc.common START=90 . /lib/config/uci.sh -uci_load batmand-adv-userspace +uci_load batman-adv-userspace start () { - interface=$(uci get batmand-adv-userspace.general.interface) + interface=$(uci get batman-adv-userspace.general.interface) if [ "$interface" = "" ]; then echo $1 Error, you must specify at least a network interface exit fi - originator_interval=$(uci get batmand-adv-userspace.general.originator_interval) - visualisation_srv=$(uci get batmand-adv-space.general.visualisation_srv) + originator_interval=$(uci get batman-adv-userspace.general.originator_interval) + visualisation_srv=$(uci get batman-adv-userspace.general.visualisation_srv) batman_args="" if [ $originator_interval ]; then