Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into bmx6_testing

Browse source
This commit is contained in:
Axel Neumann 2014-03-08 21:36:23 +01:00
commit 30118d92bc
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bmx6/Makefile
View file

@ -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))

4
hnetd/Makefile
View file

@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hnetd
PKG_SOURCE_VERSION:=1031619a9319baeee68ddd2bcb76c8d74089ba27
PKG_VERSION:=2014-03-01-$(PKG_SOURCE_VERSION)
PKG_SOURCE_VERSION:=f99aee38aa4deb1e159f211f15c44a4d14bef516
PKG_VERSION:=2014-03-05-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git