Merge pull request #489 from ecsv/batmand-procd

batmand/vis: Convert to procd based init scripts

diff --combined batmand/Makefile
index 47d8741da2122157c3f370e69427695ba117c95a,4f0e5e19b1bcb4051188dd5adf8050a75337d8ca..a6afa469007f625165b401d55838ba59c834bfaa
--- 1/batmand/Makefile
--- 2/batmand/Makefile
+++ b/batmand/Makefile
@@@ -6,6 -6,7 +6,6 @@@
  #
  
  include $(TOPDIR)/rules.mk
 -include $(INCLUDE_DIR)/kernel.mk
  
  PKG_NAME:=batmand
  
@@@ -13,7 -14,7 +13,7 @@@ PKG_SOURCE_PROTO:=gi
  PKG_SOURCE_URL:=https://git.open-mesh.org/batmand.git
  PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e
  PKG_VERSION:=1440
- PKG_RELEASE:=0
+ PKG_RELEASE:=1
  PKG_LICENSE:=GPL-2.0
  
  PKG_SOURCE_VERSION:=$(PKG_REV)
@@@ -22,11 -23,19 +22,11 @@@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.g
  PKG_MIRROR_HASH:=ceb8e0e399f79b1b663594fcf9642e1efc40e696a7604daf709c77da9b6ec52f
  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
  
 -PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
 -
 -PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/linux/modules
 -
  include $(INCLUDE_DIR)/package.mk
  
 -define Package/batmand/Default
 +define Package/batmand
    URL:=https://www.open-mesh.org/
    MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
 -endef
 -
 -define Package/batmand
 -$(call Package/batmand/Default)
    SECTION:=net
    CATEGORY:=Network
    SUBMENU:=Routing and Redirection
@@@ -38,16 -47,61 +38,16 @@@ define Package/batmand/descriptio
  B.A.T.M.A.N. layer 3 routing daemon
  endef
  
 -define KernelPackage/batgat
 -$(call Package/batmand/Default)
 -  SUBMENU:=Network Support
 -  DEPENDS:=+batmand @BROKEN
 -  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. for better tunnel performance
 -endef
 -
 -MAKE_BATMAND_ARGS += \
 -      EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
 -      CCFLAGS="$(TARGET_CFLAGS)" \
 -      OFLAGS="$(TARGET_CFLAGS)" \
 +MAKE_FLAGS += \
 +      EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE' \
        REVISION="$(PKG_REV)" \
        CC="$(TARGET_CC)" \
 -      NODEBUG=1 \
        UNAME="Linux" \
 -      INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 -      STRIP="/bin/true" \
 -      batmand install
 -
 -MAKE_BATGAT_ARGS += \
 -      CROSS_COMPILE="$(TARGET_CROSS)" \
 -      ARCH="$(LINUX_KARCH)" \
 -      PATH="$(TARGET_PATH)" \
 -      SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
 -      LINUX_VERSION="$(LINUX_VERSION)" \
 -      REVISION="$(PKG_REV)" modules
 -
 -
 -define Build/Configure
 -endef
 -
 -ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
 -      BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_BATMAND_ARGS)
 -endif
 -
 -ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
 -      BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
 -endif
 -
 -define Build/Compile
 -      $(BUILD_BATMAND)
 -      cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
 -      $(BUILD_BATGAT)
 -endef
 +      batmand
  
  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) $(PKG_BUILD_DIR)/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
@@@ -57,3 -111,4 +57,3 @@@ define Package/batmand/conffile
  endef
  
  $(eval $(call BuildPackage,batmand))
 -$(eval $(call KernelPackage,batgat))

diff --combined vis/Makefile
index 5da78b8e71d689cf8ae370511dae307582c25219,abd0a605f8ae7a01e72a38d8c5abde675630cbd3..d806513d0e42bbf574c7606fc31055ef88fc953c
--- 1/vis/Makefile
--- 2/vis/Makefile
+++ b/vis/Makefile
@@@ -13,7 -13,7 +13,7 @@@ PKG_SOURCE_PROTO:=gi
  PKG_SOURCE_URL:=https://git.open-mesh.org/vis.git
  PKG_REV:=e141311c6a4fc824efbad536c137ed279905d825
  PKG_VERSION:=1440
- PKG_RELEASE:=0
+ PKG_RELEASE:=2
  PKG_LICENSE:=GPL-2.0
  
  PKG_SOURCE_VERSION:=$(PKG_REV)
@@@ -22,6 -22,8 +22,6 @@@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.g
  PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
  
 -PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
 -
  include $(INCLUDE_DIR)/package.mk
  
  define Package/vis
@@@ -38,15 -40,29 +38,15 @@@ define Package/vis/descriptio
  visualization server for B.A.T.M.A.N. layer 3
  endef
  
 -MAKE_VIS_ARGS += \
 -      EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
 -      CCFLAGS="$(TARGET_CFLAGS)" \
 -      OFLAGS="$(TARGET_CFLAGS)" \
 +MAKE_FLAGS += \
 +      EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE' \
        REVISION="$(PKG_REV)" \
        CC="$(TARGET_CC)" \
 -      NODEBUG=1 \
 -      UNAME="Linux" \
 -      INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 -      STRIP="/bin/true" \
 -      vis install
 -
 -
 -define Build/Configure
 -endef
 -
 -define Build/Compile
 -      $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_VIS_ARGS)
 -endef
 +      vis
  
  define Package/vis/install
        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
 -      $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/
 +      $(INSTALL_BIN) $(PKG_BUILD_DIR)/vis $(1)/usr/sbin/
        $(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d
        $(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
  endef