From: Florian Fainelli Date: Wed, 12 Mar 2014 22:27:51 +0000 (-0700) Subject: Merge pull request #19 from ffainelli/master X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=f8eb2bd807b30972e700b2349180ed49807e751c;hp=725ad74b67e60387b2276fea5ccc115efd29cee4;p=lede-routing%2F.git Merge pull request #19 from ffainelli/master ahcpd: fix build with ARM VFP toolchains --- diff --git a/bmx6/Makefile b/bmx6/Makefile index afb7216..3b9bc8c 100644 --- a/bmx6/Makefile +++ b/bmx6/Makefile @@ -32,7 +32,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://github.com/axn/bmx6.git PKG_REV:=4d3819b255540915408b827ae03fd92cbd7b4bdd -PKG_VERSION:=r2014030101 +PKG_VERSION:=r2014030801 PKG_RELEASE:=4 PKG_SOURCE_VERSION:=$(PKG_REV) @@ -91,11 +91,11 @@ define Package/bmx6-sms 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) @@ -142,14 +142,14 @@ define Package/bmx6-table/install $(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-quagga)) +#$(eval $(call BuildPackage,bmx6-quagga)) $(eval $(call BuildPackage,bmx6-table))