Browse Source

Minify all Lua code

Jan-Tarek Butt 7 years ago
parent
commit
1c1f490527
100 changed files with 99 additions and 24 deletions
  1. 4 1
      package/gluon-alfred/Makefile
  2. 0 0
      package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred
  3. 3 1
      package/gluon-authorized-keys/Makefile
  4. 0 0
      package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys
  5. 7 0
      package/gluon-autoupdater/Makefile
  6. 0 0
      package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater
  7. 3 1
      package/gluon-client-bridge/Makefile
  8. 0 0
      package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
  9. 0 0
      package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
  10. 2 1
      package/gluon-config-mode-autoupdater/Makefile
  11. 0 0
      package/gluon-config-mode-autoupdater/luasrc/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua
  12. 2 1
      package/gluon-config-mode-contact-info/Makefile
  13. 0 0
      package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua
  14. 2 0
      package/gluon-config-mode-core/Makefile
  15. 0 0
      package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua
  16. 0 0
      package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
  17. 0 0
      package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
  18. 2 1
      package/gluon-config-mode-geo-location/Makefile
  19. 0 0
      package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
  20. 2 1
      package/gluon-config-mode-hostname/Makefile
  21. 0 0
      package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
  22. 2 1
      package/gluon-config-mode-mesh-vpn/Makefile
  23. 0 0
      package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
  24. 0 0
      package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
  25. 3 1
      package/gluon-core/Makefile
  26. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade
  27. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
  28. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
  29. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/030-system
  30. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/110-network
  31. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers
  32. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
  33. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules
  34. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
  35. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
  36. 0 0
      package/gluon-core/luasrc/lib/gluon/upgrade/999-version
  37. 0 0
      package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
  38. 0 0
      package/gluon-core/luasrc/usr/lib/lua/gluon/site_config.lua
  39. 0 0
      package/gluon-core/luasrc/usr/lib/lua/gluon/sysconfig.lua
  40. 0 0
      package/gluon-core/luasrc/usr/lib/lua/gluon/sysctl.lua
  41. 0 0
      package/gluon-core/luasrc/usr/lib/lua/gluon/users.lua
  42. 0 0
      package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
  43. 1 0
      package/gluon-ebtables-filter-multicast/Makefile
  44. 1 0
      package/gluon-ebtables-filter-ra-dhcp/Makefile
  45. 1 0
      package/gluon-ebtables/Makefile
  46. 3 1
      package/gluon-legacy/Makefile
  47. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/000-legacy
  48. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/019-legacy-interfaces
  49. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/210-legacy-wireless
  50. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-setup-mode
  51. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-simple-tc
  52. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
  53. 0 0
      package/gluon-legacy/luasrc/lib/gluon/upgrade/990-legacy-late
  54. 1 0
      package/gluon-lock-password/Makefile
  55. 3 0
      package/gluon-luci-admin/Makefile
  56. 0 0
      package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/index.lua
  57. 0 0
      package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/upgrade.lua
  58. 0 0
      package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/info.lua
  59. 0 0
      package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua
  60. 3 1
      package/gluon-luci-autoupdater/Makefile
  61. 0 0
      package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/controller/admin/autoupdater.lua
  62. 0 0
      package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua
  63. 3 0
      package/gluon-luci-mesh-vpn-fastd/Makefile
  64. 0 0
      package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua
  65. 0 0
      package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua
  66. 3 1
      package/gluon-luci-node-role/Makefile
  67. 0 0
      package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/controller/admin/noderole.lua
  68. 0 0
      package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/model/cbi/admin/noderole.lua
  69. 3 1
      package/gluon-luci-portconfig/Makefile
  70. 0 0
      package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/controller/admin/portconfig.lua
  71. 0 0
      package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
  72. 3 1
      package/gluon-luci-private-wifi/Makefile
  73. 0 0
      package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/controller/admin/privatewifi.lua
  74. 0 0
      package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua
  75. 1 0
      package/gluon-luci-theme/Makefile
  76. 3 1
      package/gluon-luci-wifi-config/Makefile
  77. 0 0
      package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/controller/admin/wifi-config.lua
  78. 0 0
      package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua
  79. 3 0
      package/gluon-mesh-batman-adv-14/Makefile
  80. 0 0
      package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
  81. 3 0
      package/gluon-mesh-batman-adv-15/Makefile
  82. 0 0
      package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
  83. 7 2
      package/gluon-mesh-batman-adv-core/Makefile
  84. 0 0
      package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
  85. 0 0
      package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
  86. 0 0
      package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
  87. 0 0
      package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
  88. 0 0
      package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
  89. 0 0
      package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
  90. 7 1
      package/gluon-mesh-vpn-fastd/Makefile
  91. 0 0
      package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
  92. 0 0
      package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
  93. 0 0
      package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
  94. 4 3
      package/gluon-neighbour-info/Makefile
  95. 0 0
      package/gluon-neighbour-info/luasrc/lib/gluon/upgrade/400-neighbour-info-firewall
  96. 1 0
      package/gluon-next-node/Makefile
  97. 1 0
      package/gluon-node-info/Makefile
  98. 4 1
      package/gluon-radvd/Makefile
  99. 0 0
      package/gluon-radvd/luasrc/lib/gluon/upgrade/500-radvd-remove-user
  100. 8 2
      package/gluon-respondd/Makefile

+ 4 - 1
package/gluon-alfred/Makefile

@@ -6,7 +6,8 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include $(GLUONDIR)/include/package.mk
+
 
 define Package/gluon-alfred
   SECTION:=gluon
@@ -23,10 +24,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-alfred/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 $(eval $(call BuildPackage,gluon-alfred))

+ 0 - 0
package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred → package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred


+ 3 - 1
package/gluon-authorized-keys/Makefile

@@ -7,6 +7,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-authorized-keys
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -22,10 +23,11 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-authorized-keys/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 define Package/gluon-authorized-keys/postinst

+ 0 - 0
package/gluon-authorized-keys/files/lib/gluon/upgrade/100-authorized-keys → package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys


+ 7 - 0
package/gluon-autoupdater/Makefile

@@ -9,6 +9,7 @@ PKG_BUILD_DEPENDS := respondd
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -21,8 +22,14 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+endef
+
 define Package/gluon-autoupdater/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/autoupdater.so

+ 0 - 0
package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater → package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater


+ 3 - 1
package/gluon-client-bridge/Makefile

@@ -7,6 +7,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-client-bridge
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -22,10 +23,11 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-client-bridge/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 define Package/gluon-client-bridge/postinst

+ 0 - 0
package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network → package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network


+ 0 - 0
package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless → package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless


+ 2 - 1
package/gluon-config-mode-autoupdater/Makefile

@@ -30,10 +30,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-autoupdater,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-autoupdater/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-autoupdater,$(1))
 endef
 

+ 0 - 0
package/gluon-config-mode-autoupdater/files/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua → package/gluon-config-mode-autoupdater/luasrc/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua


+ 2 - 1
package/gluon-config-mode-contact-info/Makefile

@@ -26,10 +26,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-contact-info,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-contact-info/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-contact-info,$(1))
 endef
 

+ 0 - 0
package/gluon-config-mode-contact-info/files/lib/gluon/config-mode/wizard/0500-contact-info.lua → package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua


+ 2 - 0
package/gluon-config-mode-core/Makefile

@@ -30,10 +30,12 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-core,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-core/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-core,$(1))
 endef
 

+ 0 - 0
package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua → package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua


+ 0 - 0
package/gluon-config-mode-core/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua → package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/controller/gluon-config-mode/index.lua


+ 0 - 0
package/gluon-config-mode-core/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua → package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua


+ 2 - 1
package/gluon-config-mode-geo-location/Makefile

@@ -26,10 +26,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-geo-location,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-geo-location/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-geo-location,$(1))
 endef
 

+ 0 - 0
package/gluon-config-mode-geo-location/files/lib/gluon/config-mode/wizard/0400-geo-location.lua → package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua


+ 2 - 1
package/gluon-config-mode-hostname/Makefile

@@ -26,10 +26,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-hostname,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-hostname/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-hostname,$(1))
 endef
 

+ 0 - 0
package/gluon-config-mode-hostname/files/lib/gluon/config-mode/wizard/0100-hostname.lua → package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua


+ 2 - 1
package/gluon-config-mode-mesh-vpn/Makefile

@@ -26,10 +26,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-mesh-vpn,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-mesh-vpn/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-mesh-vpn,$(1))
 endef
 

+ 0 - 0
package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua → package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua


+ 0 - 0
package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua → package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua


+ 3 - 1
package/gluon-core/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-core
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -15,7 +16,6 @@ define Package/gluon-core
   DEPENDS:=+gluon-site +libgluonutil +lua-platform-info +lua-hash +luci-base +luci-lib-jsonc +odhcp6c +firewall
 endef
 
-
 define Package/gluon-core/description
 	Gluon community wifi mesh firmware framework: core
 endef
@@ -28,10 +28,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-core/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(SED) 's/__GLUON_OPENWRT_FEEDS__/{$(GLUON_OPENWRT_FEEDS:%="%",)}/' $(1)/lib/gluon/upgrade/500-opkg
 
 	$(INSTALL_DIR) $(1)/lib/gluon

+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/001-upgrade → package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/010-primary-mac → package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/020-interfaces → package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/030-system → package/gluon-core/luasrc/lib/gluon/upgrade/030-system


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/110-network → package/gluon-core/luasrc/lib/gluon/upgrade/110-network


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers → package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/130-reboot-on-oom → package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules → package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/200-wireless → package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/500-opkg → package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg


+ 0 - 0
package/gluon-core/files/lib/gluon/upgrade/999-version → package/gluon-core/luasrc/lib/gluon/upgrade/999-version


+ 0 - 0
package/gluon-core/files/usr/lib/lua/gluon/platform.lua → package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua


+ 0 - 0
package/gluon-core/files/usr/lib/lua/gluon/site_config.lua → package/gluon-core/luasrc/usr/lib/lua/gluon/site_config.lua


+ 0 - 0
package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua → package/gluon-core/luasrc/usr/lib/lua/gluon/sysconfig.lua


+ 0 - 0
package/gluon-core/files/usr/lib/lua/gluon/sysctl.lua → package/gluon-core/luasrc/usr/lib/lua/gluon/sysctl.lua


+ 0 - 0
package/gluon-core/files/usr/lib/lua/gluon/users.lua → package/gluon-core/luasrc/usr/lib/lua/gluon/users.lua


+ 0 - 0
package/gluon-core/files/usr/lib/lua/gluon/util.lua → package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua


+ 1 - 0
package/gluon-ebtables-filter-multicast/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/gluon-ebtables-filter-multicast
   SECTION:=gluon
   CATEGORY:=Gluon

+ 1 - 0
package/gluon-ebtables-filter-ra-dhcp/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/gluon-ebtables-filter-ra-dhcp
   SECTION:=gluon
   CATEGORY:=Gluon

+ 1 - 0
package/gluon-ebtables/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/gluon-ebtables
   SECTION:=gluon
   CATEGORY:=Gluon

+ 3 - 1
package/gluon-legacy/Makefile

@@ -7,6 +7,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-legacy
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -26,10 +27,11 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-legacy/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 define Package/gluon-legacy/postinst

+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/000-legacy → package/gluon-legacy/luasrc/lib/gluon/upgrade/000-legacy


+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces → package/gluon-legacy/luasrc/lib/gluon/upgrade/019-legacy-interfaces


+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless → package/gluon-legacy/luasrc/lib/gluon/upgrade/210-legacy-wireless


+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode → package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-setup-mode


+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc → package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-simple-tc


+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd → package/gluon-legacy/luasrc/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd


+ 0 - 0
package/gluon-legacy/files/lib/gluon/upgrade/990-legacy-late → package/gluon-legacy/luasrc/lib/gluon/upgrade/990-legacy-late


+ 1 - 0
package/gluon-lock-password/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/gluon-lock-password
   SECTION:=gluon
   CATEGORY:=Gluon

+ 3 - 0
package/gluon-luci-admin/Makefile

@@ -13,6 +13,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-admin
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -29,10 +30,12 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-luci-admin,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-admin/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-luci-admin,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua → package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/index.lua


+ 0 - 0
package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/upgrade.lua → package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/upgrade.lua


+ 0 - 0
package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/info.lua → package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/info.lua


+ 0 - 0
package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua → package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua


+ 3 - 1
package/gluon-luci-autoupdater/Makefile

@@ -13,6 +13,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -29,10 +30,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-luci-autoupdater,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-autoupdater/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-luci-autoupdater,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-autoupdater/files/usr/lib/lua/luci/controller/admin/autoupdater.lua → package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/controller/admin/autoupdater.lua


+ 0 - 0
package/gluon-luci-autoupdater/files/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua → package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua


+ 3 - 0
package/gluon-luci-mesh-vpn-fastd/Makefile

@@ -10,6 +10,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-mesh-vpn-fastd
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -26,10 +27,12 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-mesh-vpn-fastd,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-mesh-vpn-fastd/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-mesh-vpn-fastd,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-mesh-vpn-fastd/files/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua → package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua


+ 0 - 0
package/gluon-luci-mesh-vpn-fastd/files/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua → package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua


+ 3 - 1
package/gluon-luci-node-role/Makefile

@@ -10,6 +10,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-node-role
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -26,10 +27,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-luci-node-role,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-node-role/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-luci-node-role,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-node-role/files/usr/lib/lua/luci/controller/admin/noderole.lua → package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/controller/admin/noderole.lua


+ 0 - 0
package/gluon-luci-node-role/files/usr/lib/lua/luci/model/cbi/admin/noderole.lua → package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/model/cbi/admin/noderole.lua


+ 3 - 1
package/gluon-luci-portconfig/Makefile

@@ -13,6 +13,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-portconfig
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -29,10 +30,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-luci-portconfig,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-portconfig/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-luci-portconfig,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-portconfig/files/usr/lib/lua/luci/controller/admin/portconfig.lua → package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/controller/admin/portconfig.lua


+ 0 - 0
package/gluon-luci-portconfig/files/usr/lib/lua/luci/model/cbi/admin/portconfig.lua → package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/model/cbi/admin/portconfig.lua


+ 3 - 1
package/gluon-luci-private-wifi/Makefile

@@ -10,6 +10,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-private-wifi
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -26,10 +27,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-luci-private-wifi,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-private-wifi/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-luci-private-wifi,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-private-wifi/files/usr/lib/lua/luci/controller/admin/privatewifi.lua → package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/controller/admin/privatewifi.lua


+ 0 - 0
package/gluon-luci-private-wifi/files/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua → package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua


+ 1 - 0
package/gluon-luci-theme/Makefile

@@ -11,6 +11,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/gluon-luci-theme
   SECTION:=gluon
   CATEGORY:=Gluon

+ 3 - 1
package/gluon-luci-wifi-config/Makefile

@@ -10,6 +10,7 @@ include $(GLUONDIR)/include/package.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
+
 define Package/gluon-luci-wifi-config
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -26,10 +27,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-luci-wifi-config,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-luci-wifi-config/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-luci-wifi-config,$(1))
 endef
 

+ 0 - 0
package/gluon-luci-wifi-config/files/usr/lib/lua/luci/controller/admin/wifi-config.lua → package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/controller/admin/wifi-config.lua


+ 0 - 0
package/gluon-luci-wifi-config/files/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua → package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua


+ 3 - 0
package/gluon-mesh-batman-adv-14/Makefile

@@ -7,6 +7,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-mesh-batman-adv-14
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -23,10 +24,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-mesh-batman-adv-14/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 $(eval $(call BuildPackage,gluon-mesh-batman-adv-14))

+ 0 - 0
package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 → package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14


+ 3 - 0
package/gluon-mesh-batman-adv-15/Makefile

@@ -7,6 +7,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-mesh-batman-adv-15
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -23,10 +24,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-mesh-batman-adv-15/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 $(eval $(call BuildPackage,gluon-mesh-batman-adv-15))

+ 0 - 0
package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 → package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15


+ 7 - 2
package/gluon-mesh-batman-adv-core/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DEPENDS := respondd
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-mesh-batman-adv-core
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -20,9 +21,13 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
-define Package/gluon-mesh-batman-adv-core/install
-	$(CP) ./files/* $(1)/
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+endef
 
+define Package/gluon-mesh-batman-adv-core/install
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(INSTALL_DIR) $(1)/lib/gluon/respondd
 	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-batman-adv-core.so
 endef

+ 0 - 0
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan → package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan


+ 0 - 0
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh → package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh


+ 0 - 0
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless → package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless


+ 0 - 0
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan → package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan


+ 0 - 0
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan → package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan


+ 0 - 0
package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid → package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid


+ 7 - 1
package/gluon-mesh-vpn-fastd/Makefile

@@ -8,6 +8,7 @@ PKG_BUILD_DEPENDS := respondd
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-mesh-vpn-fastd
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -20,9 +21,14 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+endef
+
 define Package/gluon-mesh-vpn-fastd/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/mesh-vpn-fastd.so
 endef

+ 0 - 0
package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd → package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd


+ 0 - 0
package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret → package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret


+ 0 - 0
package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc → package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc


+ 4 - 3
package/gluon-neighbour-info/Makefile

@@ -6,7 +6,8 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include $(GLUONDIR)/include/package.mk
+
 
 define Package/gluon-neighbour-info
   SECTION:=gluon
@@ -29,11 +30,11 @@ endef
 
 define Build/Compile
 	CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-neighbour-info/install
-	$(CP) ./files/* $(1)/
-
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gluon-neighbour-info $(1)/usr/bin/
 endef

+ 0 - 0
package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall → package/gluon-neighbour-info/luasrc/lib/gluon/upgrade/400-neighbour-info-firewall


+ 1 - 0
package/gluon-next-node/Makefile

@@ -7,6 +7,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-next-node
   SECTION:=gluon
   CATEGORY:=Gluon

+ 1 - 0
package/gluon-node-info/Makefile

@@ -9,6 +9,7 @@ PKG_BUILD_DEPENDS := respondd
 
 include $(GLUONDIR)/include/package.mk
 
+
 define Package/gluon-node-info
   SECTION:=gluon
   CATEGORY:=Gluon

+ 4 - 1
package/gluon-radvd/Makefile

@@ -5,7 +5,8 @@ PKG_VERSION:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include $(GLUONDIR)/include/package.mk
+
 
 define Package/gluon-radvd
   SECTION:=gluon
@@ -26,10 +27,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-radvd/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 $(eval $(call BuildPackage,gluon-radvd))

+ 0 - 0
package/gluon-radvd/files/lib/gluon/upgrade/500-radvd-remove-user → package/gluon-radvd/luasrc/lib/gluon/upgrade/500-radvd-remove-user


+ 8 - 2
package/gluon-respondd/Makefile

@@ -5,7 +5,8 @@ PKG_VERSION:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include $(GLUONDIR)/include/package.mk
+
 
 define Package/gluon-respondd
   SECTION:=gluon
@@ -19,9 +20,14 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+endef
+
 define Package/gluon-respondd/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/respondd.so
 endef

Some files were not shown because too many files changed in this diff