From: Jo-Philipp Wich Date: Thu, 18 Apr 2013 17:06:43 +0000 (+0200) Subject: move bmx6 files to subdirectory X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=186fbe6dde0ac3cd471e539ec8817b8046622c7f;ds=sidebyside move bmx6 files to subdirectory --- diff --git a/Makefile b/Makefile deleted file mode 100644 index bdcdbbf..0000000 --- a/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org, bmx6.net -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=bmx6 - - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://git.bmx6.net/bmx6.git -PKG_REV:=c3ef7d76292a765c5e578bd4113030dc34ee3b9a - -PKG_VERSION:=r2011031602 - -#PKG_RELEASE:=1 -#PKG_INSTALL:=1 # this tries to install straight to /usr/sbin/bmx6 - -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) - -include $(INCLUDE_DIR)/package.mk - - -TARGET_CFLAGS += $(FPIC) - -#-DNO_TRAFFIC_DUMP -DNO_DYN_PLUGIN -DNO_DEBUG_DUMP -DNO_DEBUG_ALL -DNO_DEBUG_TRACK -DNO_DEBUG_SYS - -MAKE_ARGS += \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ - EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ - REVISION_VERSION="$(PKG_REV)" \ - CC="$(TARGET_CC)" \ - INSTALL_DIR="$(PKG_INSTALL_DIR)" \ - STRIP="/bin/true" \ - build_all - - -define Package/bmx6/Default - SECTION:=net - CATEGORY:=Network - SUBMENU:=Routing and Redirection - TITLE:=BMX6 layer 3 routing daemon - URL:=http://bmx6.net/ - MAINTAINER:=Axel Neumann -endef - -define Package/bmx6/description -BMX6 layer 3 routing daemon supporting IPv4, IPv6, and IPv4 over IPv6 - http://www.bmx6.net -endef - -define Package/bmx6 - $(call Package/bmx6/Default) - MENU:=1 -endef - -define Package/bmx6-uci-config - $(call Package/bmx6/Default) - DEPENDS:=bmx6 +libuci - TITLE:=configuration plugin based on uci (recommended!) -endef - - - - -define Build/Configure - mkdir -p $(PKG_INSTALL_DIR) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) -endef - - -define Package/bmx6/install - $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6 -endef - - -define Package/bmx6-uci-config/conffiles -/etc/config/bmx6 -endef - - -define Package/bmx6-uci-config/install - $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so - $(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6 - $(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6 -endef - - -$(eval $(call BuildPackage,bmx6)) -$(eval $(call BuildPackage,bmx6-uci-config)) - diff --git a/bmx6/Makefile b/bmx6/Makefile new file mode 100644 index 0000000..bdcdbbf --- /dev/null +++ b/bmx6/Makefile @@ -0,0 +1,102 @@ +# +# Copyright (C) 2011 OpenWrt.org, bmx6.net +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=bmx6 + + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://git.bmx6.net/bmx6.git +PKG_REV:=c3ef7d76292a765c5e578bd4113030dc34ee3b9a + +PKG_VERSION:=r2011031602 + +#PKG_RELEASE:=1 +#PKG_INSTALL:=1 # this tries to install straight to /usr/sbin/bmx6 + +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) + +include $(INCLUDE_DIR)/package.mk + + +TARGET_CFLAGS += $(FPIC) + +#-DNO_TRAFFIC_DUMP -DNO_DYN_PLUGIN -DNO_DEBUG_DUMP -DNO_DEBUG_ALL -DNO_DEBUG_TRACK -DNO_DEBUG_SYS + +MAKE_ARGS += \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ + EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ + REVISION_VERSION="$(PKG_REV)" \ + CC="$(TARGET_CC)" \ + INSTALL_DIR="$(PKG_INSTALL_DIR)" \ + STRIP="/bin/true" \ + build_all + + +define Package/bmx6/Default + SECTION:=net + CATEGORY:=Network + SUBMENU:=Routing and Redirection + TITLE:=BMX6 layer 3 routing daemon + URL:=http://bmx6.net/ + MAINTAINER:=Axel Neumann +endef + +define Package/bmx6/description +BMX6 layer 3 routing daemon supporting IPv4, IPv6, and IPv4 over IPv6 - http://www.bmx6.net +endef + +define Package/bmx6 + $(call Package/bmx6/Default) + MENU:=1 +endef + +define Package/bmx6-uci-config + $(call Package/bmx6/Default) + DEPENDS:=bmx6 +libuci + TITLE:=configuration plugin based on uci (recommended!) +endef + + + + +define Build/Configure + mkdir -p $(PKG_INSTALL_DIR) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) +endef + + +define Package/bmx6/install + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6 +endef + + +define Package/bmx6-uci-config/conffiles +/etc/config/bmx6 +endef + + +define Package/bmx6-uci-config/install + $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so + $(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6 + $(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6 +endef + + +$(eval $(call BuildPackage,bmx6)) +$(eval $(call BuildPackage,bmx6-uci-config)) + diff --git a/bmx6/files/etc/config/bmx6 b/bmx6/files/etc/config/bmx6 new file mode 100644 index 0000000..d593e74 --- /dev/null +++ b/bmx6/files/etc/config/bmx6 @@ -0,0 +1,23 @@ +# for more options execute: bmx6 --help + +config 'bmx6' 'general' +# option 'runtime_dir' '/var/run/bmx6' +# option 'niit_source' '10.202.0.116' + +#config 'ip_version' 'ip_version' +# option 'ip_version' '6' # default is 4 +# option 'throw_rules' '0' + +config 'dev' 'mesh_1' + option 'dev' 'eth0.12' + +config 'dev' 'mesh_2' + option 'dev' 'ath0.12' + +#config 'unicast_hna' 'my_global_prefix' +# option 'unicast_hna' '2012:0:0:74:0:0:0:0/64' + +#config 'unicast_hna' 'niit6to4' +# option 'unicast_hna' '0:0:0:0:0:ffff:10.202.0.116/128' + + diff --git a/bmx6/files/etc/init.d/bmx6 b/bmx6/files/etc/init.d/bmx6 new file mode 100644 index 0000000..c584718 --- /dev/null +++ b/bmx6/files/etc/init.d/bmx6 @@ -0,0 +1,20 @@ +#!/bin/sh /etc/rc.common +START=91 + +BIN=/usr/sbin/bmx6 +CONF=/etc/config/bmx6 +PID=/var/run/bmx6/pid + + +start() { + #$BIN -f $CONF -d0 > /dev/null & + start-stop-daemon -b -x $BIN -S -- -f $CONF +} + +stop() { + start-stop-daemon -p $PID -K +} + +restart() { + stop; sleep 3; start +} diff --git a/files/etc/config/bmx6 b/files/etc/config/bmx6 deleted file mode 100644 index d593e74..0000000 --- a/files/etc/config/bmx6 +++ /dev/null @@ -1,23 +0,0 @@ -# for more options execute: bmx6 --help - -config 'bmx6' 'general' -# option 'runtime_dir' '/var/run/bmx6' -# option 'niit_source' '10.202.0.116' - -#config 'ip_version' 'ip_version' -# option 'ip_version' '6' # default is 4 -# option 'throw_rules' '0' - -config 'dev' 'mesh_1' - option 'dev' 'eth0.12' - -config 'dev' 'mesh_2' - option 'dev' 'ath0.12' - -#config 'unicast_hna' 'my_global_prefix' -# option 'unicast_hna' '2012:0:0:74:0:0:0:0/64' - -#config 'unicast_hna' 'niit6to4' -# option 'unicast_hna' '0:0:0:0:0:ffff:10.202.0.116/128' - - diff --git a/files/etc/init.d/bmx6 b/files/etc/init.d/bmx6 deleted file mode 100644 index c584718..0000000 --- a/files/etc/init.d/bmx6 +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh /etc/rc.common -START=91 - -BIN=/usr/sbin/bmx6 -CONF=/etc/config/bmx6 -PID=/var/run/bmx6/pid - - -start() { - #$BIN -f $CONF -d0 > /dev/null & - start-stop-daemon -b -x $BIN -S -- -f $CONF -} - -stop() { - start-stop-daemon -p $PID -K -} - -restart() { - stop; sleep 3; start -}