Merge r4367-r4369
This commit is contained in:
parent
90e80d9f06
commit
49454b8334
3 changed files with 4441 additions and 2 deletions
|
@ -82,7 +82,7 @@ if arg[1] then
|
|||
{ ListValue, "BmfMechanism", { "UnicastPromiscuous", "Broadcast" } },
|
||||
{ Value, "BroadcastRetransmitCount", "2" },
|
||||
{ Value, "FanOutLimit", "4" },
|
||||
{ DynamicList, "NonOlsrIf", "eth1" }
|
||||
{ DynamicList, "NonOlsrIf", "br-lan" }
|
||||
},
|
||||
|
||||
["olsrd_dyn_gw.so.0.4"] = {
|
||||
|
@ -139,6 +139,10 @@ if arg[1] then
|
|||
{ Value, "interval", "30" }
|
||||
},
|
||||
|
||||
["olsrd_mdns.so.1.0.0"] = {
|
||||
{ DynamicList, "NonOlsrIf", "br-lan" }
|
||||
},
|
||||
|
||||
["olsrd_arprefresh.so.0.1"] = {},
|
||||
["olsrd_dot_draw.so.0.3"] = {},
|
||||
["olsrd_dyn_gw_plain.so.0.4"] = {},
|
||||
|
|
|
@ -126,6 +126,13 @@ define Package/olsrd-luci-mod-watchdog
|
|||
DEPENDS:=olsrd-luci
|
||||
endef
|
||||
|
||||
define Package/olsrd-luci-mod-mdns
|
||||
$(call Package/olsrd-luci/common_info)
|
||||
MENU:=1
|
||||
TITLE:=OLSR - mDNS Plugin
|
||||
DEPENDS:=olsrd-luci
|
||||
endef
|
||||
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
|
||||
define Build/Compile
|
||||
|
@ -141,7 +148,7 @@ define Build/Compile
|
|||
MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
|
||||
STRIP="true" \
|
||||
INSTALL_LIB="true" \
|
||||
SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo quagga watchdog"
|
||||
SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo quagga watchdog mdns"
|
||||
endef
|
||||
|
||||
define Package/olsrd-luci/install
|
||||
|
@ -208,6 +215,11 @@ define Package/olsrd-luci-mod-watchdog/install
|
|||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/watchdog/olsrd_watchdog.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Package/olsrd-luci-mod-mdns/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mdns/olsrd_mdns.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
|
||||
$(eval $(call BuildPackage,olsrd-luci))
|
||||
$(eval $(call BuildPackage,olsrd-luci-mod-arprefresh))
|
||||
|
@ -221,3 +233,4 @@ $(eval $(call BuildPackage,olsrd-luci-mod-secure))
|
|||
$(eval $(call BuildPackage,olsrd-luci-mod-txtinfo))
|
||||
$(eval $(call BuildPackage,olsrd-luci-mod-quagga))
|
||||
$(eval $(call BuildPackage,olsrd-luci-mod-watchdog))
|
||||
$(eval $(call BuildPackage,olsrd-luci-mod-mdns))
|
||||
|
|
4422
contrib/package/olsrd-luci/patches/160-add-mdns.patch
Normal file
4422
contrib/package/olsrd-luci/patches/160-add-mdns.patch
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue