projects / openwrt / svn-archive / archive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use kill $(cat /var/run/sshd.pid) instead of killall sshd to
[openwrt/svn-archive/archive.git] / net / batman-advanced / Makefile
diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index d1e5c75305663d464bb13d740ce3155e9bbf1a11..9b20d21401ef3925183fd90c35ffdaf7e0e7c0b0 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,117 +9,55 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_REV:=1568
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
 
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_VERSION:=2010.1.0
+PKG_MD5SUM:=81aef7e965b516d5ba75f92b0039ddd1
+BATCTL_MD5SUM:=ae1996621d0d72c0822d33a463cdaf70
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_TOOL_VERSION=$(PKG_REV)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 
-ifneq ($(CONFIG_BATMAN_ADV_DEV),)
-       PKG_KMOD_VERSION=060c4d34077550d57cd57c5375dd5f8758391eb5
-       PKG_KMOD_FNAME=batman-adv-dev-$(PKG_REV).tar.gz
-       PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/trunk/batctl
-       PKG_TOOL_FNAME:=batctl-dev-$(PKG_TOOL_VERSION).tar.gz
-else
-       PKG_KMOD_VERSION=1b58d49b4342caabb9624243bc76e037eaac2673
-       PKG_KMOD_FNAME=batman-adv-maint-$(PKG_REV).tar.gz
-       PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/branches/batctl-0.2.x/
-       PKG_TOOL_FNAME:=batctl-maint-$(PKG_TOOL_VERSION).tar.gz
-endif
-
-PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland
-PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_TOOL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-define Package/batman-adv/Default
+define KernelPackage/batman-adv
   URL:=http://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
-endef
-
-define KernelPackage/batman-adv-kernelland
-$(call Package/batman-adv/Default)
   SUBMENU:=Network Support
-  DEPENDS:=@LINUX_2_6
-  TITLE:=B.A.T.M.A.N. layer 2
-  FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@!LINUX_2_4
+  TITLE:=B.A.T.M.A.N. Adv
+  FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
 endef
 
-define KernelPackage/batman-adv-kernelland/config
-       source "$(SOURCE)/Config.in"
-endef
-
-define KernelPackage/batman-adv-kernelland/description
-B.A.T.M.A.N. layer 2
-endef
-
-define Download/batman-adv-kernelland
-  FILE:=$(PKG_KMOD_FNAME)
-  URL:=http://git.open-mesh.org/snapshot/$(PKG_KMOD_VERSION)/
+define KernelPackage/batman-adv/description
+B.A.T.M.A.N. advanced is a kernel module which allows to
+build layer 2 mesh networks. This package contains the
+version $(PKG_VERSION) of the kernel module plus its user space
+configuration & managerment tool batctl.
 endef
-$(eval $(call Download,batman-adv-kernelland))
 
-ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
-define Download/batctl
-  FILE:=$(PKG_TOOL_FNAME)
-  URL:=$(PKG_TOOL_URL)
-  PROTO:=svn
-  VERSION:=$(PKG_TOOL_VERSION)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)/batctl
-endef
-$(eval $(call Download,batctl))
-endif
-
-ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
-ifneq ($(DEVELOPER)$(CONFIG_BATMAN_ADV_DEV),)
-define Download/batman
-  FILE:=batman-$(PKG_REV).tar.gz
-  URL:=http://downloads.open-mesh.org/svn/batman/trunk/batman
-  PROTO:=svn
-  VERSION:=$(PKG_REV)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)/batman
-endef
-$(eval $(call Download,batman))
-endif
-endif
-
-define Build/Prepare
-       tar xzf "$(DL_DIR)/$(PKG_KMOD_FNAME)" -C "$(PKG_BUILD_DIR)"
-ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
-       tar xzf "$(DL_DIR)/$(PKG_TOOL_FNAME)" -C "$(BUILD_DIR)"
-ifneq ($(DEVELOPER)$(CONFIG_BATMAN_ADV_DEV),)
-       tar xzf "$(DL_DIR)/batman-$(PKG_REV).tar.gz" -C "$(BUILD_DIR)"
-endif
-endif
-       mv "$(PKG_BUILD_DIR)/batman-adv" "$(PKG_KMOD_BUILD_DIR)"
-       cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
-       $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),)
-ifneq ($(CONFIG_BATMAN_ADV_DEV),)
-       $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dev,)
-else
-       $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/maint,)
-endif
+define KernelPackage/batman-adv/config
+       source "$(SOURCE)/Config.in"
 endef
 
-MAKE_BATADV_KERNELLAND_ARGS += \
+MAKE_BATMAN_ADV_ARGS += \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
        PATH="$(TARGET_PATH)" \
        $(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \
-       SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
+       SUBDIRS="$(PKG_BUILD_DIR)" \
        LINUX_VERSION="$(LINUX_VERSION)" \
-       REVISION="$(PKG_REV)" modules
+       REVISION="" modules
 
 MAKE_BATCTL_ARGS += \
        CFLAGS="$(TARGET_CFLAGS)" \
        CCFLAGS="$(TARGET_CFLAGS)" \
        OFLAGS="$(TARGET_CFLAGS)" \
-       REVISION="$(PKG_REV)" \
+       REVISION="" \
        CC="$(TARGET_CC)" \
        NODEBUG=1 \
        UNAME="Linux" \
@@ -127,33 +65,42 @@ MAKE_BATCTL_ARGS += \
        STRIP="/bin/true" \
        batctl install
 
-define Build/Configure
+ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
+define Download/batctl
+  FILE:=batctl-$(PKG_VERSION).tar.gz
+  URL:=$(PKG_SOURCE_URL)
+  MD5SUM:=$(BATCTL_MD5SUM)
 endef
+$(eval $(call Download,batctl))
 
-ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
-        BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS)
-        BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
+BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
 endif
 
 define Build/Compile
-       $(BUILD_KMOD_ADV)
-ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
+       tar xzf "$(DL_DIR)/batctl-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)"
+       cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile
+       $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS)
        $(BUILD_BATCTL)
-endif
 endef
 
 define Build/Clean
-        rm -rf $(PKG_KMOD_BUILD_DIR)
+        rm -rf $(BUILD_DIR)/$(PKG_NAME)/
 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
-       $(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config
 ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
+define KernelPackage/batman-adv/install
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
+       $(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/
-endif
 endef
+else
+define KernelPackage/batman-adv/install
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
+       $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
+endef
+endif
 
-$(eval $(call KernelPackage,batman-adv-kernelland))
+$(eval $(call KernelPackage,batman-adv))
OpenWrt SVN history