Merge b29488cd49 into 97f44c208b

2017-05-18 22:07:49 +00:00 · 2017-05-18 22:07:49 +00:00 · 0b80720e22
commit 0b80720e22
parent 97f44c208b b29488cd49
7 changed files with 7 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
--- a/package/gluon-next-node/Makefile
+++ b/package/gluon-next-node/Makefile
@ -27,10 +27,12 @@ define Build/Configure
 endef

 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef

 define Package/gluon-next-node/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef

 define Package/gluon-next-node/postinst
--- a/package/gluon-next-node/luasrc/lib/gluon/upgrade/400-next-node
+++ b/package/gluon-next-node/luasrc/lib/gluon/upgrade/400-next-node
--- 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