bmx: Use repos from https://github.com/bmx-routing and remove bmx7 json-c patch

[feed/routing.git] / bmx6 / Makefile

diff --git a/bmx6/Makefile b/bmx6/Makefile
index fc983f1b2635021ddfb2e28fb86daa166184c657..d6e224afe8e73b653b3dd0276b1e56c25eb8a141 100644 (file)
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -28,12 +28,13 @@ PKG_NAME:=bmx6
 
 PKG_SOURCE_PROTO:=git
 
 
 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)
 
 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 " \
 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" \
        CC="$(TARGET_CC)" \
        INSTALL_DIR="$(PKG_INSTALL_DIR)" \
        STRIP="/bin/false" \


@@ -81,8 +82,8 @@ endef
 
 define Package/bmx6-json
   $(call Package/bmx6/Default)
 
 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
 endef
 
 define Package/bmx6-sms


@@ -91,11 +92,11 @@ define Package/bmx6-sms
   TITLE:=sms plugin
 endef
 
   TITLE:=sms plugin
 endef
 

-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-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)
 
 define Package/bmx6-table
   $(call Package/bmx6/Default)


@@ -142,14 +143,14 @@ define Package/bmx6-table/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so
 endef
 
        $(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
+#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))
 $(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))
 $(eval $(call BuildPackage,bmx6-table))