From 30dee5dc51e3aea1ead28ab9731b218574299afc Mon Sep 17 00:00:00 2001 From: Axel Neumann Date: Sun, 1 May 2016 17:03:21 +0200 Subject: [PATCH] bmx7: bump to latest code version --- bmx7/Makefile | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/bmx7/Makefile b/bmx7/Makefile index 665956a..b626bce 100644 --- a/bmx7/Makefile +++ b/bmx7/Makefile @@ -28,12 +28,12 @@ PKG_NAME:=bmx7 PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://bmx6.net/bmx6.git +#PKG_SOURCE_URL:=git://github.com/axn/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_REV:=60143a195478a98e73089566bbfde78cf193ed67 -PKG_VERSION:=r2016021505 +PKG_REV:=b2e3f4439a4b676c2b9c13b82706907fabb67059 +PKG_VERSION:=r2016050108 PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0 @@ -47,8 +47,8 @@ include $(INCLUDE_DIR)/package.mk TARGET_CFLAGS += $(FPIC) MAKE_ARGS += \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS" \ - EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib " \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO" \ + EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -liwinfo" \ GIT_REV="$(PKG_REV)" \ CC="$(TARGET_CC)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ @@ -61,7 +61,7 @@ define Package/bmx7/Default TITLE:=BMX7 layer 3 routing daemon URL:=http://bmx6.net/ MAINTAINER:=Axel Neumann - DEPENDS:=+zlib +libpolarssl + DEPENDS:=+zlib +libpolarssl +libiwinfo endef define Package/bmx7/description @@ -79,6 +79,18 @@ define Package/bmx7-uci-config TITLE:=configuration plugin based on uci (recommended!) endef +define Package/bmx7-iwinfo + $(call Package/bmx7/Default) + DEPENDS:=bmx7 +libiwinfo + TITLE:=link characteristics plugin based on libiwinfo +endef + +define Package/bmx7-topology + $(call Package/bmx7/Default) + DEPENDS:=bmx7 + TITLE:=topology plugin +endef + define Package/bmx7-json $(call Package/bmx7/Default) DEPENDS:=bmx7 +libjson-c @@ -138,6 +150,16 @@ define Package/bmx7-uci-config/install $(INSTALL_DATA) ./files/etc/config/bmx7 $(1)/etc/config/bmx7 endef +define Package/bmx7-iwinfo/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_iwinfo/bmx7_iwinfo.so $(1)/usr/lib/bmx7_iwinfo.so +endef + +define Package/bmx7-topology/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_topology/bmx7_topology.so $(1)/usr/lib/bmx7_topology.so +endef + define Package/bmx7-json/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_json/bmx7_json.so $(1)/usr/lib/bmx7_json.so @@ -161,6 +183,8 @@ endef $(eval $(call BuildPackage,bmx7)) $(eval $(call BuildPackage,bmx7-uci-config)) +$(eval $(call BuildPackage,bmx7-iwinfo)) +$(eval $(call BuildPackage,bmx7-topology)) $(eval $(call BuildPackage,bmx7-json)) $(eval $(call BuildPackage,bmx7-sms)) $(eval $(call BuildPackage,bmx7-table)) -- 2.30.2