X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=blobdiff_plain;f=bmx6%2FMakefile;h=d6e224afe8e73b653b3dd0276b1e56c25eb8a141;hp=533b56f07deb1aaa50b44cc6e415aef0e6e97471;hb=679f780747dc74a3040d841c3d89116aff7a5f4a;hpb=21cb637b0f9940d8069057f40ca472b29fa2ffc7

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 533b56f..d6e224a 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -28,12 +28,13 @@ PKG_NAME:=bmx6
 
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx6.git
+#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx6.git
 
-PKG_REV:=1d022e3f0ae0a2954c90b18fdfbcc178d7437605
-PKG_VERSION:=r2013080406
-PKG_RELEASE:=4
+PKG_REV:=4016a1980d900309771e432d1f7c741d6c48d477
+PKG_VERSION:=r2018010201
+PKG_RELEASE:=5
+PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -48,7 +49,7 @@ TARGET_CFLAGS += $(FPIC)
 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)" \
+	GIT_REV="$(PKG_REV)" \
 	CC="$(TARGET_CC)" \
 	INSTALL_DIR="$(PKG_INSTALL_DIR)" \
 	STRIP="/bin/false" \
@@ -79,11 +80,10 @@ define Package/bmx6-uci-config
   TITLE:=configuration plugin based on uci (recommended!)
 endef
 
-
 define Package/bmx6-json
   $(call Package/bmx6/Default)
-  DEPENDS:=bmx6 +libjson
-  TITLE:=json plugin based on jsonc
+  DEPENDS:=bmx6 +libjson-c
+  TITLE:=json plugin based on json-c
 endef
 
 define Package/bmx6-sms
@@ -92,10 +92,16 @@ define Package/bmx6-sms
   TITLE:=sms plugin
 endef
 
-define Package/bmx6-quagga
+#define Package/bmx6-quagga
+#  $(call Package/bmx6/Default)
+#  DEPENDS:=bmx6 +qmp-quagga @BROKEN
+#  TITLE:=bmx6 quagga plugin to redistribute/export routes (needs manet/bmx6 patched quagga 0.99.21)
+#endef
+
+define Package/bmx6-table
   $(call Package/bmx6/Default)
-  DEPENDS:=bmx6 +qmp-quagga @BROKEN
-  TITLE:=bmx6 quagga plugin to redistribute/export routes (needs manet/bmx6 patched quagga 0.99.21)
+  DEPENDS:=bmx6
+  TITLE:=bmx6 table plugin to automatic announce routing-table routes via ip6ip tunnels
 endef
 
 define Build/Configure
@@ -106,18 +112,15 @@ 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
@@ -135,14 +138,19 @@ define Package/bmx6-sms/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so
 endef
 
-define Package/bmx6-quagga/install
+define Package/bmx6-table/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_quagga/bmx6_quagga.so $(1)/usr/lib/bmx6_quagga.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so
 endef
 
+#define Package/bmx6-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,bmx6))
 $(eval $(call BuildPackage,bmx6-uci-config))
 $(eval $(call BuildPackage,bmx6-json))
 $(eval $(call BuildPackage,bmx6-sms))
-$(eval $(call BuildPackage,bmx6-quagga))
-
+#$(eval $(call BuildPackage,bmx6-quagga))
+$(eval $(call BuildPackage,bmx6-table))