batman-adv: upgrade package to latest release (2011.3.0)

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

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 53d724e5c0bdcbfe6f5ac613845daad291092635..f09c883971853276681b436bb00d5d8268c955f6 100644 (file)
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2011.2.0
-PKG_MD5SUM:=1ef45406201913cc08ac01e47ad2d034
-BATCTL_MD5SUM:=69e7fe915f2c1867b74e6efe7c627dd5
+PKG_VERSION:=2011.3.0
+PKG_MD5SUM:=0ba4b63f7fe9d2a561662cdc0378caa5
+BATCTL_MD5SUM:=8eb197896049bb04a6beef56015a16b6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -27,7 +27,7 @@ define KernelPackage/batman-adv
   URL:=http://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
   SUBMENU:=Network Support
-  DEPENDS:=@!LINUX_2_4
+  DEPENDS:=@!LINUX_2_4 +kmod-crc16
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
@@ -61,7 +61,7 @@ MAKE_BATCTL_ARGS += \
        CC="$(TARGET_CC)" \
        NODEBUG=1 \
        UNAME="Linux" \
-       INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
        STRIP="/bin/true" \
        batctl install
 
@@ -104,16 +104,18 @@ endef
 
 ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
 define KernelPackage/batman-adv/install
-       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv
        $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
        $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batctl $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/
 endef
 else
 define KernelPackage/batman-adv/install
-       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv
        $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
        $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
 endef
 endif