From 97617bb36127be43006cddbd50291d0d96af895b Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Mon, 8 Jun 2009 09:12:24 +0000 Subject: [PATCH] [batman] removing batman-adv userspace as it is not supported anymore (see: http://www.open-mesh.net/changeset/1283) SVN-Revision: 16376 --- net/batman-advanced/Makefile | 39 +------------------ .../files/etc/config/batman-adv-userspace | 4 -- .../files/etc/init.d/batman-adv-kernelland | 3 +- .../files/etc/init.d/batman-adv-userspace | 31 --------------- net/batman/Makefile | 2 +- net/batman/files/etc/init.d/batmand | 3 +- net/batman/files/etc/init.d/vis | 3 +- 7 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 net/batman-advanced/files/etc/config/batman-adv-userspace delete mode 100644 net/batman-advanced/files/etc/init.d/batman-adv-userspace diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile index c442302424..6b2e95f338 100644 --- a/net/batman-advanced/Makefile +++ b/net/batman-advanced/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_REV:=1267 +PKG_REV:=1289 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -33,18 +33,6 @@ define Package/batman-adv/Default MAINTAINER:=Marek Lindner endef -define Package/batman-adv-userspace -$(call Package/batman-adv/Default) - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libpthread +kmod-tun - TITLE:=B.A.T.M.A.N. layer 2 routing daemon -endef - -define Package/batman-adv-userspace/description -B.A.T.M.A.N. layer 2 routing daemon -endef - define Package/battool $(call Package/batman-adv/Default) SECTION:=net @@ -70,18 +58,6 @@ define KernelPackage/batman-adv-kernelland/description B.A.T.M.A.N. layer 2 endef -MAKE_BATADV_USERSPACE_ARGS += \ - CFLAGS="$(TARGET_CFLAGS)" \ - CCFLAGS="$(TARGET_CFLAGS)" \ - OFLAGS="$(TARGET_CFLAGS)" \ - REVISION="$(PKG_REV)" \ - CC="$(TARGET_CC)" \ - NODEBUG=1 \ - UNAME="Linux" \ - INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ - STRIP="/bin/true" \ - batmand-adv install - MAKE_BATADV_KERNELLAND_ARGS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ @@ -105,10 +81,6 @@ MAKE_BATTOOL_ARGS += \ define Build/Configure endef -ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batman-adv-userspace),) - BUILD_ADV = $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_BATADV_USERSPACE_ARGS) -endif - ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),) BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS) endif @@ -118,19 +90,11 @@ ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_battool),) endif define Build/Compile - $(BUILD_ADV) cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile $(BUILD_KMOD_ADV) $(BUILD_BATTOOL) endef -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/batman-adv-userspace $(1)/etc/init.d - $(INSTALL_DATA) ./files/etc/config/batman-adv-userspace $(1)/etc/config -endef - define KernelPackage/batman-adv-kernelland/install $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d @@ -142,6 +106,5 @@ define Package/battool/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/ endef -$(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/batman-adv-userspace b/net/batman-advanced/files/etc/config/batman-adv-userspace deleted file mode 100644 index 33dd034e81..0000000000 --- a/net/batman-advanced/files/etc/config/batman-adv-userspace +++ /dev/null @@ -1,4 +0,0 @@ -config batman-adv-userspace general - option interface ath0 - option originator_interval - option visualisation_srv diff --git a/net/batman-advanced/files/etc/init.d/batman-adv-kernelland b/net/batman-advanced/files/etc/init.d/batman-adv-kernelland index 01b169c8a3..e3e44da9c5 100644 --- a/net/batman-advanced/files/etc/init.d/batman-adv-kernelland +++ b/net/batman-advanced/files/etc/init.d/batman-adv-kernelland @@ -1,7 +1,6 @@ #!/bin/sh /etc/rc.common START=90 -. /lib/config/uci.sh -uci_load batman-adv-kernelland + start () { interfaces=$(uci get batman-adv-kernelland.general.interface) if [ "$interfaces" = "" ]; then diff --git a/net/batman-advanced/files/etc/init.d/batman-adv-userspace b/net/batman-advanced/files/etc/init.d/batman-adv-userspace deleted file mode 100644 index 4df894fa50..0000000000 --- a/net/batman-advanced/files/etc/init.d/batman-adv-userspace +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh /etc/rc.common -START=90 -. /lib/config/uci.sh -uci_load batman-adv-userspace -start () { - 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 batman-adv-userspace.general.originator_interval) - visualisation_srv=$(uci get batman-adv-userspace.general.visualisation_srv) - batman_args="" - - if [ $originator_interval ]; then - batman_args=${batman_args}'-o '$originator_interval' ' - fi - - if [ $visualisation_srv ]; then - batman_args=${batman_args}'-s '$visualisation_srv' ' - fi - - batman_args=${batman_args}$interface - batmand-adv $batman_args >/dev/null 2>&1 -} - -stop () { - killall batmand-adv -} - - diff --git a/net/batman/Makefile b/net/batman/Makefile index 052039b5cf..658fa6fe8e 100644 --- a/net/batman/Makefile +++ b/net/batman/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=batmand -PKG_REV:=1267 +PKG_REV:=1289 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" diff --git a/net/batman/files/etc/init.d/batmand b/net/batman/files/etc/init.d/batmand index 411f025025..403e9f39a0 100644 --- a/net/batman/files/etc/init.d/batmand +++ b/net/batman/files/etc/init.d/batmand @@ -1,7 +1,6 @@ #!/bin/sh /etc/rc.common START=90 -. /lib/config/uci.sh -uci_load batmand + start () { interface=$(uci get batmand.general.interface) if [ "$interface" = "" ]; then diff --git a/net/batman/files/etc/init.d/vis b/net/batman/files/etc/init.d/vis index 26db938fdc..ef18eb718c 100644 --- a/net/batman/files/etc/init.d/vis +++ b/net/batman/files/etc/init.d/vis @@ -1,7 +1,6 @@ #!/bin/sh /etc/rc.common START=90 -. /lib/config/uci.sh -uci_load vis + start () { interface=$(uci get vis.general.interface) if [ "$interface" = "" ]; then -- 2.30.2