batman-advanced: clean up and honor copts

SVN-Revision: 8289

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index 818b09e51820065983b18484d90a25ecb27c68e9..d6c82d362fd5e26a9c62b560aacfb9b677889ead 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batmand-adv
-PKG_VERSION:=0.1-alpha-rv466_sources
+PKG_VERSION:=0.1-alpha-rv466
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/batman/development/sources/
+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/development/sources/ \
+       http://downloads.open-mesh.net/batman/development/sources/old/
 PKG_MD5SUM:=3ebc394a7b7b3fa5cecaf97f6a220a3f
 PKG_CAT:=zcat
 
@@ -26,32 +27,28 @@ define Package/batman-advanced
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libpthread +kmod-tun
-  TITLE:=B.A.T.M.A.N. Better Approach To Mobile Ad-hoc Networking (L2 Version)
+  TITLE:=B.A.T.M.A.N. Advanced (Layer2 Version)
   URL:=https://www.open-mesh.net/
 endef
 
 define Build/Configure
 endef
 
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               $(TARGET_CONFIGURE_OPTS) \
-               NODEBUG=1 \
-               OFLAGS="$(TARGET_CFLAGS)" \
-               UNAME="Linux" \
-               INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-               STRIP="/bin/true" \
-               batmand-adv install
-endef
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       CCFLAGS="$(TARGET_CFLAGS)" \
+       OFLAGS="$(TARGET_CFLAGS)" \
+       NODEBUG=1 \
+       UNAME="Linux" \
+       INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+       STRIP="/bin/true" \
+       batmand-adv install
 
 define Package/batman-advanced/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/batmand-adv $(1)/usr/sbin/
-       $(CP) -a ./files/* $(1)/
-       chmod -R 755 $(1)/etc/init.d/batman
+       $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand-adv $(1)/usr/sbin/
+       $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
+       $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
 endef
 
-
 $(eval $(call BuildPackage,batman-advanced))

diff --git a/net/batman-advanced/Makefile.save b/net/batman-advanced/Makefile.save
deleted file mode 100644 (file)
index 53cb85c..0000000
--- a/net/batman-advanced/Makefile.save
+++ /dev/null
@@ -1,57 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=batman-advanced-III
-PKG_VERSION:=r342
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/batman
-PKG_MD5SUM:=59662fa2c7ac80f5d1235c8e4ae0a80b
-PKG_CAT:=bzcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/batman-advanced
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +kmod-tun
-  TITLE:=B.A.T.M.A.N. Better Approach To Mobile Ad-hoc Networking (L2 Version)
-  URL:=https://www.open-mesh.net/
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               $(TARGET_CONFIGURE_OPTS) \
-               NODEBUG=1 \
-               OFLAGS="$(TARGET_CFLAGS)" \
-               UNAME="Linux" \
-               INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-               STRIP="/bin/true" \
-               batmand install
-endef
-
-define Package/batman-advanced/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
-endef
-
-
-$(eval $(call BuildPackage,batman-advanced))