diff --git a/bmx7/Makefile b/bmx7/Makefile index 82006ee..ca24f4f 100644 --- a/bmx7/Makefile +++ b/bmx7/Makefile @@ -28,12 +28,12 @@ PKG_NAME:=bmx7 PKG_SOURCE_PROTO:=git -#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git +PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git -PKG_SOURCE_URL:=git://github.com/axn/bmx6.git +#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git -PKG_REV:=d0841d4bf42ae406cd5319a857dc294badb1ac8d -PKG_VERSION:=r2016011801 +PKG_REV:=0d2da286a19219caebf55a4234ab612fefac65ce +PKG_VERSION:=r2016021001 PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0 @@ -61,7 +61,7 @@ define Package/bmx7/Default TITLE:=BMX7 layer 3 routing daemon URL:=http://bmx6.net/ MAINTAINER:=Axel Neumann - DEPENDS:=+zlib +libpolarssl @!bmx6 + DEPENDS:=+zlib +libpolarssl endef define Package/bmx7/description @@ -97,12 +97,6 @@ define Package/bmx7-tun TITLE:=ipip-based tunnel plugin (recommended!) endef -#define Package/bmx7-quagga -# $(call Package/bmx7/Default) -# DEPENDS:=bmx7 +bmx7-tun +qmp-quagga @BROKEN -# TITLE:=bmx7 quagga plugin to redistribute/export routes (needs manet/bmx patched quagga 0.99.21) -#endef - define Package/bmx7-table $(call Package/bmx7/Default) DEPENDS:=bmx7 +bmx7-tun @@ -119,60 +113,55 @@ endef define Package/bmx7/install $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx7 $(1)/usr/sbin/bmx7 endef define Package/bmx7/postinst #!/bin/sh # # check if we are on real system if [ -z "$${IPKG_INSTROOT}" ]; then - if [ -f /etc/sysupgrade.conf ] && ! grep bmx6 /etc/sysupgrade.conf; then - echo /etc/bmx6 >> /etc/sysupgrade.conf + if [ -f /etc/sysupgrade.conf ] && ! grep bmx7 /etc/sysupgrade.conf; then + echo /etc/bmx7 >> /etc/sysupgrade.conf fi fi endef define Package/bmx7-uci-config/conffiles -/etc/config/bmx6 +/etc/config/bmx7 endef define Package/bmx7-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 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_uci_config/bmx7_config.so $(1)/usr/lib/bmx7_config.so + $(INSTALL_BIN) ./files/etc/init.d/bmx7 $(1)/etc/init.d/bmx7 + $(INSTALL_DATA) ./files/etc/config/bmx7 $(1)/etc/config/bmx7 endef define Package/bmx7-json/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_json/bmx6_json.so $(1)/usr/lib/bmx6_json.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_json/bmx7_json.so $(1)/usr/lib/bmx7_json.so endef define Package/bmx7-sms/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_sms/bmx7_sms.so $(1)/usr/lib/bmx7_sms.so endef define Package/bmx7-tun/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_tun/bmx6_tun.so $(1)/usr/lib/bmx6_tun.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_tun/bmx7_tun.so $(1)/usr/lib/bmx7_tun.so endef define Package/bmx7-table/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_table/bmx7_table.so $(1)/usr/lib/bmx7_table.so endef -#define Package/bmx7-quagga/install -# $(INSTALL_DIR) $(1)/usr/lib -# $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_quagga/bmx6_quagga.so $(1)/usr/lib/bmx6_quagga.so -#endef $(eval $(call BuildPackage,bmx7)) $(eval $(call BuildPackage,bmx7-uci-config)) $(eval $(call BuildPackage,bmx7-json)) $(eval $(call BuildPackage,bmx7-sms)) -#$(eval $(call BuildPackage,bmx7-quagga)) $(eval $(call BuildPackage,bmx7-table)) $(eval $(call BuildPackage,bmx7-tun)) diff --git a/bmx7/files/etc/config/bmx6 b/bmx7/files/etc/config/bmx7 similarity index 65% rename from bmx7/files/etc/config/bmx6 rename to bmx7/files/etc/config/bmx7 index 26d691c..7593ede 100644 --- a/bmx7/files/etc/config/bmx6 +++ b/bmx7/files/etc/config/bmx7 @@ -1,21 +1,20 @@ # for more information: # http://bmx6.net/projects/bmx6/wiki -# options execute: bmx6 --help - -config 'bmx6' 'general' -# option 'runtimeDir' '/var/run/bmx6' +# options execute: bmx7 --help +config 'bmx7' 'general' +# option 'runtimeDir' '/var/run/bmx7' +# option 'trustedNodesDir' '/etc/bmx7/trustedNodes' #config 'plugin' -# option 'plugin' 'bmx6_config.so' +# option 'plugin' 'bmx7_config.so' #config 'plugin' -# option 'plugin' 'bmx6_json.so' - +# option 'plugin' 'bmx7_json.so' #config 'plugin' -# option 'plugin' 'bmx6_sms.so' +# option 'plugin' 'bmx7_sms.so' config 'dev' 'mesh_1' @@ -27,10 +26,10 @@ config 'dev' 'mesh_2' #config 'plugin' -# option 'plugin' 'bmx6_tun.so' +# option 'plugin' 'bmx7_tun.so' #config 'plugin' -# option 'plugin' 'bmx6_table.so' +# option 'plugin' 'bmx7_table.so' #config 'tunDev' default diff --git a/bmx7/files/etc/init.d/bmx6 b/bmx7/files/etc/init.d/bmx7 similarity index 94% rename from bmx7/files/etc/init.d/bmx6 rename to bmx7/files/etc/init.d/bmx7 index cb2d5b3..6886739 100755 --- a/bmx7/files/etc/init.d/bmx6 +++ b/bmx7/files/etc/init.d/bmx7 @@ -20,9 +20,9 @@ START=91 -BIN=/usr/sbin/bmx6 -CONF=/etc/config/bmx6 -PID=/var/run/bmx6/pid +BIN=/usr/sbin/bmx7 +CONF=/etc/config/bmx7 +PID=/var/run/bmx7/pid start() { diff --git a/bmx7/patches/001-json-c.patch b/bmx7/patches/001-json-c.patch index 5d29dae..794bd9e 100644 --- a/bmx7/patches/001-json-c.patch +++ b/bmx7/patches/001-json-c.patch @@ -1,7 +1,7 @@ -Index: bmx6-r2014112401/lib/bmx6_json/json.c +Index: bmx7-r2014112401/lib/bmx7_json/json.c =================================================================== ---- bmx6-r2014112401.orig/lib/bmx6_json/json.c -+++ bmx6-r2014112401/lib/bmx6_json/json.c +--- bmx7-r2014112401.orig/lib/bmx7_json/json.c ++++ bmx7-r2014112401/lib/bmx7_json/json.c @@ -27,7 +27,7 @@ #include #include