Merge d7414e30dc into fbc11086c0

2017-05-31 09:31:00 +00:00 · 2017-05-31 09:31:00 +00:00 · 0ea4f5ff20
commit 0ea4f5ff20
parent fbc11086c0 d7414e30dc
5 changed files with 8 additions and 0 deletions
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/radvd/arguments
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/radvd/arguments
@ -0,0 +1,3 @@
+#!/usr/bin/lua
+local site = require "gluon.site_config"
+print("-i local-node -p " .. site.prefix6)
--- a/package/gluon-node-info/Makefile
+++ b/package/gluon-node-info/Makefile
@ -22,8 +22,13 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef

+define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+endef
+
 define Package/gluon-node-info/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/

 	$(INSTALL_DIR) $(1)/lib/gluon/respondd
 	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/node-info.so
--- a/package/gluon-node-info/luasrc/lib/gluon/upgrade/500-node-info-system
+++ b/package/gluon-node-info/luasrc/lib/gluon/upgrade/500-node-info-system
--- a/package/gluon-node-info/luasrc/lib/gluon/upgrade/510-node-info-role
+++ b/package/gluon-node-info/luasrc/lib/gluon/upgrade/510-node-info-role
--- a/package/gluon-node-info/luasrc/lib/gluon/upgrade/520-node-info-whitespace-fix
+++ b/package/gluon-node-info/luasrc/lib/gluon/upgrade/520-node-info-whitespace-fix