[batman] bump batman version to latest

[openwrt/svn-archive/archive.git] / net / batman-advanced / Makefile

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index 5a66ee3725ffe9e49b17e302041c5364990d425a..6b518afdcbf05d7d567771001a66249fc57b1cb4 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -8,11 +8,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=batmand-adv
-PKG_REV:=1057
+PKG_NAME:=batman-adv
+PKG_REV:=1439
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
-PKG_BRANCH:=batman-adv-userspace
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -20,71 +19,43 @@ PKG_SOURCE_SUBDIR:=batman-adv-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland/batman-core
+PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland
 
-PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-battool-install
-PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/battool
+PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-batctl-install
+PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batman-adv/Default
-  URL:=https://www.open-mesh.net/
+  URL:=http://www.open-mesh.net/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
-define Package/batmand-adv
-$(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/batmand-adv/description
-B.A.T.M.A.N. layer 2 routing daemon
-endef
-
-define Package/battool
-$(call Package/batman-adv/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=B.A.T.M.A.N. layer 2 debug tools
-endef
-
-define Package/battool/description
-B.A.T.M.A.N. layer 2 debug tools
-endef
-
-define KernelPackage/batman-adv-core
+define KernelPackage/batman-adv-kernelland
 $(call Package/batman-adv/Default)
   SUBMENU:=Network Support
   DEPENDS:=@LINUX_2_6
-  TITLE:=Kernel routing module for B.A.T.M.A.N. layer 2
-  FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv-core.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,batman-adv-core)
+  TITLE:=B.A.T.M.A.N. layer 2
+  FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,batman-adv)
 endef
 
 
-define KernelPackage/batman-adv-core/description
-Kernel routing module for B.A.T.M.A.N. layer 2
+define KernelPackage/batman-adv-kernelland/description
+B.A.T.M.A.N. layer 2
 endef
 
-MAKE_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)" \
+       PATH="$(TARGET_PATH)" \
+       SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
+       LINUX_VERSION="$(LINUX_VERSION)" \
+       REVISION="$(PKG_REV)" modules
 
-MAKE_TOOL_ARGS += \
+MAKE_BATCTL_ARGS += \
        CFLAGS="$(TARGET_CFLAGS)" \
        CCFLAGS="$(TARGET_CFLAGS)" \
        OFLAGS="$(TARGET_CFLAGS)" \
@@ -94,36 +65,30 @@ MAKE_TOOL_ARGS += \
        UNAME="Linux" \
        INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
        STRIP="/bin/true" \
-       battool install
+       batctl install
 
 define Build/Configure
 endef
 
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
+        BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS)
+endif
+
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
+        BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
+endif
+
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_ARGS)
-       $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_TOOL_ARGS)
        cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
-       $(MAKE) -C "$(LINUX_DIR)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               ARCH="$(LINUX_KARCH)" \
-               PATH="$(TARGET_PATH)" \
-               SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
-               REVISION="$(PKG_REV)" modules
-endef
-
-define Package/batmand-adv/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 $(1)/etc/init.d
-       $(INSTALL_DATA) ./files/etc/config/batmand-adv $(1)/etc/config
+       $(BUILD_KMOD_ADV)
+       $(BUILD_BATCTL)
 endef
 
-define Package/battool/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/
+define KernelPackage/batman-adv-kernelland/install
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin
+       $(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d
+       $(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batctl $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,batmand-adv))
-$(eval $(call BuildPackage,battool))
-$(eval $(call KernelPackage,batman-adv-core))
+$(eval $(call KernelPackage,batman-adv-kernelland))