X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=Makefile;h=74d85673c78d8cba9a98c9e265dbe38925b3a923;hb=71b66430557b1bd5d4940a2fc023394457e69d37;hp=b35f6e4883614a338c18dde8982e2db35e928d04;hpb=deb0f240cb4d9045fb4e2556970556c3acca8880;p=lede-routing%2F.git

diff --git a/Makefile b/Makefile
index b35f6e4..74d8567 100644
--- a/Makefile
+++ b/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,47 +9,88 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batmand
-PKG_VERSION:=0.2-rv478
+PKG_REV:=989
+PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
+PKG_BRANCH:=batman
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_sources
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_sources.tgz
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/batman/stable/sources/ \
-	http://downloads.open-mesh.net/batman/stable/sources/old/
-PKG_MD5SUM:=b00ad9603e32c85224d5b19f99126ddf
-PKG_CAT:=zcat
-
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_BRANCH)d-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/$(PKG_BRANCH)
+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)/linux/modules
+
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
 
-define Package/batman
+define Package/batmand/Default
+  URL:=https://www.open-mesh.net/
+  MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
+endef
+
+define Package/batmand
+$(call Package/batmand/Default)
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libpthread +kmod-tun
-  TITLE:=B.A.T.M.A.N. Better Approach To Mobile Ad-hoc Networking
-  URL:=https://www.open-mesh.net/
+  TITLE:=B.A.T.M.A.N. layer 3 routing daemon
 endef
 
-define Build/Configure
+define Package/batmand/description
+B.A.T.M.A.N. layer 3 routing daemon
 endef
 
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
+define KernelPackage/batgat
+$(call Package/batmand/Default)
+  SUBMENU:=Network Support
+  DEPENDS:=+batmand
+  TITLE:=B.A.T.M.A.N. gateway module
+  FILES:=$(PKG_KMOD_BUILD_DIR)/batgat.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,batgat)
+endef
+
+
+define KernelPackage/batgat/description
+ Kernel gateway module for B.A.T.M.A.N.
+endef
+
+MAKE_ARGS += \
+	EXTRA_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 install
 
-define Package/batman/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/batmand $(1)/usr/sbin/
-	$(CP) -a ./files/* $(1)/
-	chmod -R 755 $(1)/etc/init.d/batman
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_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/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/batmand $(1)/etc/init.d
+	$(INSTALL_DATA) ./files/etc/config/batmand $(1)/etc/config
+endef
 
-$(eval $(call BuildPackage,batman))
+$(eval $(call BuildPackage,batmand))
+$(eval $(call KernelPackage,batgat))