mirror of
https://git.openwrt.org/feed/routing.git
synced 2024-06-18 05:03:57 +02:00
vis: Extract vis package from batmand
The batmand and vis sources are actually stored in two different repositories. It therefore makes more sense to have these two packages also split in two different OpenWrt packages. This also allows to get the vis sources directly from the git repository. The SVN version of vis r1439 was actually r1346. The git export of revision r1346 is referenced by this commit. Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
parent
c48460940d
commit
4eb57b4298
|
@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
|
||||||
PKG_NAME:=batmand
|
PKG_NAME:=batmand
|
||||||
PKG_REV:=1439
|
PKG_REV:=1439
|
||||||
PKG_VERSION:=r$(PKG_REV)
|
PKG_VERSION:=r$(PKG_REV)
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=4
|
||||||
PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
|
PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
|
||||||
|
|
||||||
PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
|
PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
|
||||||
|
@ -42,19 +42,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
|
||||||
|
@ -81,18 +68,6 @@ MAKE_BATMAND_ARGS += \
|
||||||
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)" \
|
||||||
ARCH="$(LINUX_KARCH)" \
|
ARCH="$(LINUX_KARCH)" \
|
||||||
|
@ -109,17 +84,12 @@ ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
|
||||||
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
|
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
|
|
||||||
BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
|
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
|
||||||
BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
|
BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
|
||||||
endif
|
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 +105,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))
|
||||||
|
|
73
vis/Makefile
Normal file
73
vis/Makefile
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
#
|
||||||
|
# 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_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
Block a user