uplevel batman advanced revision to make batman adv user space compile with 2.6.28

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

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index de581c48755ff8a2cd96c45bcb87a439ce69fd14..f6a788867c70e7746acac58510fcb12a6b922e63 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batmand-adv
-PKG_REV:=963
+PKG_REV:=1220
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_BRANCH:=batman-adv-userspace
@@ -20,9 +20,8 @@ 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
@@ -31,14 +30,14 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batman-adv/Default
-  SECTION:=net
-  CATEGORY:=Network
   URL:=https://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
@@ -49,6 +48,8 @@ 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
 
@@ -56,16 +57,17 @@ define Package/battool/description
 B.A.T.M.A.N. layer 2 debug tools
 endef
 
-define KernelPackage/batman-adv-core
+define KernelPackage/batman-advanced
 $(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)
+  FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,batman-adv)
 endef
 
 
-define KernelPackage/batman-adv-core/description
+define KernelPackage/batman-advanced/description
 Kernel routing module for B.A.T.M.A.N. layer 2
 endef
 
@@ -80,6 +82,14 @@ MAKE_ARGS += \
        INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
        STRIP="/bin/true" \
        batmand-adv install
+       
+MAKE_KMOD_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 += \
        CFLAGS="$(TARGET_CFLAGS)" \
@@ -96,17 +106,23 @@ MAKE_TOOL_ARGS += \
 define Build/Configure
 endef
 
+ifeq ($(CONFIG_PACKAGE_batmand-adv),y)
+       BUILD_ADV = $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_ARGS)
+endif
+
+ifeq ($(CONFIG_PACKAGE_kmod-batman-advanced),y)
+        BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_KMOD_ARGS)
+endif
+
+ifeq ($(CONFIG_PACKAGE_battool),y)
+        BUILD_BATTOOL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_TOOL_ARGS)
+endif
+
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_ARGS)
-       $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_TOOL_ARGS)
+       $(BUILD_ADV)
        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
+       $(BUILD_KMOD_ADV)
+       $(BUILD_BATTOOL)
 endef
 
 define Package/batmand-adv/install
@@ -123,4 +139,4 @@ endef
 
 $(eval $(call BuildPackage,batmand-adv))
 $(eval $(call BuildPackage,battool))
-$(eval $(call KernelPackage,batman-adv-core))
+$(eval $(call KernelPackage,batman-advanced))