batman-adv: fix mac addr change and symmetry check

[feed/routing.git] / Makefile

diff --git a/Makefile b/Makefile
index f09c883971853276681b436bb00d5d8268c955f6..5fdfae693d339e47b0d6ceec68352f1507466255 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2011.3.0
-PKG_MD5SUM:=0ba4b63f7fe9d2a561662cdc0378caa5
-BATCTL_MD5SUM:=8eb197896049bb04a6beef56015a16b6
+PKG_VERSION:=2012.3.0
+BATCTL_VERSION:=2012.3.0
+PKG_RELEASE:=3
+PKG_MD5SUM:=9f2d0bb2792fe0db012203d502e2085c
+BATCTL_MD5SUM:=fe9e6a3994539037b48afc5e3d31628c
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_TOOL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(PKG_VERSION)
+PKG_BATCTL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(BATCTL_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -27,7 +29,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 +kmod-crc16
+  DEPENDS:=+kmod-lib-crc16 +libc
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
@@ -46,12 +48,15 @@ endef
 
 MAKE_BATMAN_ADV_ARGS += \
        CROSS_COMPILE="$(TARGET_CROSS)" \
+       KERNELPATH="$(LINUX_DIR)" \
        ARCH="$(LINUX_KARCH)" \
        PATH="$(TARGET_PATH)" \
-       $(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \
        SUBDIRS="$(PKG_BUILD_DIR)" \
+       PWD="$(PKG_BUILD_DIR)" \
        LINUX_VERSION="$(LINUX_VERSION)" \
-       REVISION="" modules
+       CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
+       CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
+       REVISION="" all
 
 MAKE_BATCTL_ARGS += \
        CFLAGS="$(TARGET_CFLAGS)" \
@@ -67,57 +72,49 @@ MAKE_BATCTL_ARGS += \
 
 ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
 define Download/batctl
-  FILE:=batctl-$(PKG_VERSION).tar.gz
+  FILE:=batctl-$(BATCTL_VERSION).tar.gz
   URL:=$(PKG_SOURCE_URL)
   MD5SUM:=$(BATCTL_MD5SUM)
 endef
 $(eval $(call Download,batctl))
 
-EXTRACT_BATCTL = tar xzf "$(DL_DIR)/batctl-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)"
-PATCH_BATCTL = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*")
-BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
+BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)"
+BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*")
+BATCTL_BUILD = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
+BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/
 endif
 
+KPATCH ?= $(PATCH)
 define Build/DoPatch
        @if [ -d "$(2)" ]; then \
                if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \
-                       $(PATCH) "$(1)" "$(2)" "$(3)"; \
+                       $(KPATCH) "$(1)" "$(2)" "$(3)"; \
                fi; \
        fi
 endef
 
 define Build/Patch
        $(call Build/DoPatch,"$(PKG_BUILD_DIR)","$(PATCH_DIR)","*batman*")
-       $(EXTRACT_BATCTL)
-       $(PATCH_BATCTL)
+       $(BATCTL_EXTRACT)
+       $(BATCTL_PATCH)
 endef
 
 define Build/Compile
-       cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile
-       $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS)
-       $(BUILD_BATCTL)
+       $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS)
+       $(BATCTL_BUILD)
 endef
 
 define Build/Clean
         rm -rf $(BUILD_DIR)/$(PKG_NAME)/
 endef
 
-ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
 define KernelPackage/batman-adv/install
-       $(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_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/lib/batman-adv $(1)/usr/sbin
        $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/
+       $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
+       $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net
+       $(INSTALL_BIN) ./files/usr/sbin/batman-adv $(1)/usr/sbin
+       $(BATCTL_INSTALL)
 endef
-else
-define KernelPackage/batman-adv/install
-       $(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
 
 $(eval $(call KernelPackage,batman-adv))