Merge pull request #261 from ecsv/batmand-git
batman: Switch maintainers and get batmand/vis packages from git
This commit is contained in:
commit
713ea82014
|
@ -27,7 +27,7 @@ define Package/batctl
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
DEPENDS:=+kmod-batman-adv +libnl-tiny +libc +librt
|
DEPENDS:=+kmod-batman-adv +libnl-tiny +libc +librt
|
||||||
TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl
|
TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl
|
||||||
MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
|
MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/batctl/description
|
define Package/batctl/description
|
||||||
|
|
|
@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
define KernelPackage/batman-adv
|
define KernelPackage/batman-adv
|
||||||
URL:=https://www.open-mesh.org/
|
URL:=https://www.open-mesh.org/
|
||||||
MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
|
MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
|
||||||
SUBMENU:=Network Support
|
SUBMENU:=Network Support
|
||||||
DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
|
DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
|
||||||
TITLE:=B.A.T.M.A.N. Adv
|
TITLE:=B.A.T.M.A.N. Adv
|
||||||
|
|
|
@ -9,24 +9,29 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=batmand
|
PKG_NAME:=batmand
|
||||||
PKG_REV:=1439
|
|
||||||
PKG_VERSION:=r$(PKG_REV)
|
|
||||||
PKG_RELEASE:=3
|
|
||||||
PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
|
|
||||||
|
|
||||||
PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
PKG_SOURCE_URL:=git://git.open-mesh.org/batmand.git
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e
|
||||||
PKG_SOURCE_URL:=https://sources.lede-project.org https://downloads.openwrt.org/sources
|
PKG_VERSION:=1440
|
||||||
|
PKG_RELEASE:=0
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules
|
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||||
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
|
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
|
||||||
|
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
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
define Package/batmand/Default
|
define Package/batmand/Default
|
||||||
URL:=http://www.open-mesh.org/
|
URL:=https://www.open-mesh.org/
|
||||||
MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
|
MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/batmand
|
define Package/batmand
|
||||||
|
@ -42,19 +47,6 @@ define Package/batmand/description
|
||||||
B.A.T.M.A.N. layer 3 routing daemon
|
B.A.T.M.A.N. layer 3 routing daemon
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/vis
|
|
||||||
$(call Package/batmand/Default)
|
|
||||||
SECTION:=net
|
|
||||||
CATEGORY:=Network
|
|
||||||
SUBMENU:=Routing and Redirection
|
|
||||||
DEPENDS:=+libpthread
|
|
||||||
TITLE:=visualization server for B.A.T.M.A.N. layer 3
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/vis/description
|
|
||||||
visualization server for B.A.T.M.A.N. layer 3
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/batgat
|
define KernelPackage/batgat
|
||||||
$(call Package/batmand/Default)
|
$(call Package/batmand/Default)
|
||||||
SUBMENU:=Network Support
|
SUBMENU:=Network Support
|
||||||
|
@ -80,18 +72,6 @@ MAKE_BATMAND_ARGS += \
|
||||||
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
|
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
|
||||||
STRIP="/bin/true" \
|
STRIP="/bin/true" \
|
||||||
batmand install
|
batmand install
|
||||||
|
|
||||||
MAKE_VIS_ARGS += \
|
|
||||||
EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_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" \
|
|
||||||
vis install
|
|
||||||
|
|
||||||
MAKE_BATGAT_ARGS += \
|
MAKE_BATGAT_ARGS += \
|
||||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||||
|
@ -106,11 +86,7 @@ define Build/Configure
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
|
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
|
||||||
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
|
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_BATMAND_ARGS)
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
|
|
||||||
BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
|
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
|
||||||
|
@ -119,7 +95,6 @@ endif
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(BUILD_BATMAND)
|
$(BUILD_BATMAND)
|
||||||
$(BUILD_VIS)
|
|
||||||
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
|
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
|
||||||
$(BUILD_BATGAT)
|
$(BUILD_BATGAT)
|
||||||
endef
|
endef
|
||||||
|
@ -135,17 +110,5 @@ define Package/batmand/conffiles
|
||||||
/etc/config/batmand
|
/etc/config/batmand
|
||||||
endef
|
endef
|
||||||
|
|
||||||
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) ./files/etc/init.d/vis $(1)/etc/init.d
|
|
||||||
$(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/vis/conffiles
|
|
||||||
/etc/config/vis
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,batmand))
|
$(eval $(call BuildPackage,batmand))
|
||||||
$(eval $(call BuildPackage,vis))
|
|
||||||
$(eval $(call KernelPackage,batgat))
|
$(eval $(call KernelPackage,batgat))
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
batman/linux/modules/gateway.c | 19 +++++++++++++++++++
|
batman/linux/modules/gateway.c | 19 +++++++++++++++++++
|
||||||
1 file changed, 19 insertions(+)
|
1 file changed, 19 insertions(+)
|
||||||
|
|
||||||
--- batmand-r1439.orig/batman/linux/modules/gateway.c
|
--- batmand-r1439.orig/linux/modules/gateway.c
|
||||||
+++ batmand-r1439/batman/linux/modules/gateway.c
|
+++ batmand-r1439/linux/modules/gateway.c
|
||||||
@@ -29,6 +29,7 @@ static struct class *batman_class;
|
@@ -29,6 +29,7 @@ static struct class *batman_class;
|
||||||
static int batgat_open(struct inode *inode, struct file *filp);
|
static int batgat_open(struct inode *inode, struct file *filp);
|
||||||
static int batgat_release(struct inode *inode, struct file *file);
|
static int batgat_release(struct inode *inode, struct file *file);
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
#
|
||||||
|
# Copyright (C) 2008-2011 OpenWrt.org
|
||||||
|
#
|
||||||
|
# This is free software, licensed under the GNU General Public License v2.
|
||||||
|
# See /LICENSE for more information.
|
||||||
|
#
|
||||||
|
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=vis
|
||||||
|
|
||||||
|
PKG_SOURCE_PROTO:=git
|
||||||
|
PKG_SOURCE_URL:=git://git.open-mesh.org/vis.git
|
||||||
|
PKG_REV:=e141311c6a4fc824efbad536c137ed279905d825
|
||||||
|
PKG_VERSION:=1440
|
||||||
|
PKG_RELEASE:=0
|
||||||
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||||
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
|
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
|
||||||
|
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
|
||||||
|
SECTION:=net
|
||||||
|
CATEGORY:=Network
|
||||||
|
SUBMENU:=Routing and Redirection
|
||||||
|
DEPENDS:=+libpthread
|
||||||
|
TITLE:=visualization server for B.A.T.M.A.N. layer 3
|
||||||
|
URL:=https://www.open-mesh.org/
|
||||||
|
MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/vis/description
|
||||||
|
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)" \
|
||||||
|
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
|
||||||
|
|
||||||
|
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) ./files/etc/init.d/vis $(1)/etc/init.d
|
||||||
|
$(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/vis/conffiles
|
||||||
|
/etc/config/vis
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call BuildPackage,vis))
|
Loading…
Reference in New Issue