[Dev] [PATCH] Prepare all gluon packages there contains lua code with the call command to minify lua code

7 Jul 2016

---
 package/gluon-alfred/Makefile                                  |  5 ++++-
 .../{files => luasrc}/lib/gluon/upgrade/500-enable-alfred      |  0
 package/gluon-authorized-keys/Makefile                         |  4 +++-
 .../{files => luasrc}/lib/gluon/upgrade/100-authorized-keys    |  0
 package/gluon-autoupdater/Makefile                             |  8 +++++++-
 .../{files => luasrc}/lib/gluon/upgrade/500-autoupdater        |  0
 package/gluon-client-bridge/Makefile                           |  5 ++++-
 .../lib/gluon/upgrade/300-gluon-client-bridge-network          |  0
 .../lib/gluon/upgrade/320-gluon-client-bridge-wireless         |  0
 package/gluon-config-mode-autoupdater/Makefile                 |  6 ++++--
 .../lib/gluon/config-mode/wizard/0050-autoupdater-info.lua     |  0
 package/gluon-config-mode-contact-info/Makefile                |  4 +++-
 .../lib/gluon/config-mode/wizard/0500-contact-info.lua         |  0
 package/gluon-config-mode-core/Makefile                        |  5 ++++-
 .../lib/gluon/config-mode/reboot/0900-msg-reboot.lua           |  0
 .../usr/lib/lua/luci/controller/gluon-config-mode/index.lua    |  0
 .../usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua    |  0
 package/gluon-config-mode-geo-location/Makefile                |  5 +++--
 .../lib/gluon/config-mode/wizard/0400-geo-location.lua         |  0
 package/gluon-config-mode-hostname/Makefile                    |  5 +++--
 .../lib/gluon/config-mode/wizard/0100-hostname.lua             |  0
 package/gluon-config-mode-mesh-vpn/Makefile                    |  5 +++--
 .../lib/gluon/config-mode/reboot/0100-mesh-vpn.lua             |  0
 .../lib/gluon/config-mode/wizard/0300-mesh-vpn.lua             |  0
 package/gluon-core/Makefile                                    |  4 +++-
 .../gluon-core/{files => luasrc}/lib/gluon/upgrade/001-upgrade |  0
 .../{files => luasrc}/lib/gluon/upgrade/010-primary-mac        |  0
 .../{files => luasrc}/lib/gluon/upgrade/020-interfaces         |  0
 .../gluon-core/{files => luasrc}/lib/gluon/upgrade/030-system  |  0
 .../gluon-core/{files => luasrc}/lib/gluon/upgrade/110-network |  0
 .../{files => luasrc}/lib/gluon/upgrade/120-ntp-servers        |  0
 .../{files => luasrc}/lib/gluon/upgrade/130-reboot-on-oom      |  0
 .../{files => luasrc}/lib/gluon/upgrade/140-firewall-rules     |  0
 .../{files => luasrc}/lib/gluon/upgrade/200-wireless           |  0
 .../gluon-core/{files => luasrc}/lib/gluon/upgrade/500-opkg    |  0
 .../gluon-core/{files => luasrc}/lib/gluon/upgrade/999-version |  0
 .../{files => luasrc}/usr/lib/lua/gluon/platform.lua           |  0
 .../{files => luasrc}/usr/lib/lua/gluon/site_config.lua        |  0
 .../{files => luasrc}/usr/lib/lua/gluon/sysconfig.lua          |  0
 .../gluon-core/{files => luasrc}/usr/lib/lua/gluon/sysctl.lua  |  0
 .../gluon-core/{files => luasrc}/usr/lib/lua/gluon/users.lua   |  0
 .../gluon-core/{files => luasrc}/usr/lib/lua/gluon/util.lua    |  0
 package/gluon-legacy/Makefile                                  |  4 +++-
 .../{files => luasrc}/lib/gluon/upgrade/000-legacy             |  0
 .../{files => luasrc}/lib/gluon/upgrade/019-legacy-interfaces  |  0
 .../{files => luasrc}/lib/gluon/upgrade/210-legacy-wireless    |  0
 .../{files => luasrc}/lib/gluon/upgrade/290-legacy-setup-mode  |  0
 .../{files => luasrc}/lib/gluon/upgrade/290-legacy-simple-tc   |  0
 .../lib/gluon/upgrade/390-legacy-mesh-vpn-fastd                |  0
 .../{files => luasrc}/lib/gluon/upgrade/990-legacy-late        |  0
 package/gluon-luci-admin/Makefile                              |  3 +++
 .../usr/lib/lua/luci/controller/admin/index.lua                |  0
 .../usr/lib/lua/luci/controller/admin/upgrade.lua              |  0
 .../usr/lib/lua/luci/model/cbi/admin/info.lua                  |  0
 .../usr/lib/lua/luci/model/cbi/admin/remote.lua                |  0
 package/gluon-luci-autoupdater/Makefile                        |  4 +++-
 .../usr/lib/lua/luci/controller/admin/autoupdater.lua          |  0
 .../usr/lib/lua/luci/model/cbi/admin/autoupdater.lua           |  0
 package/gluon-luci-mesh-vpn-fastd/Makefile                     |  3 +++
 .../usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua       |  0
 .../usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua        |  0
 package/gluon-luci-node-role/Makefile                          |  4 +++-
 .../usr/lib/lua/luci/controller/admin/noderole.lua             |  0
 .../usr/lib/lua/luci/model/cbi/admin/noderole.lua              |  0
 package/gluon-luci-portconfig/Makefile                         |  4 +++-
 .../usr/lib/lua/luci/controller/admin/portconfig.lua           |  0
 .../usr/lib/lua/luci/model/cbi/admin/portconfig.lua            |  0
 package/gluon-luci-private-wifi/Makefile                       |  4 +++-
 .../usr/lib/lua/luci/controller/admin/privatewifi.lua          |  0
 .../usr/lib/lua/luci/model/cbi/admin/privatewifi.lua           |  0
 package/gluon-luci-wifi-config/Makefile                        |  4 +++-
 .../usr/lib/lua/luci/controller/admin/wifi-config.lua          |  0
 .../usr/lib/lua/luci/model/cbi/admin/wifi-config.lua           |  0
 package/gluon-mesh-batman-adv-14/Makefile                      |  3 +++
 .../lib/gluon/upgrade/350-gluon-mesh-batman-adv-14             |  0
 package/gluon-mesh-batman-adv-15/Makefile                      |  3 +++
 .../lib/gluon/upgrade/350-gluon-mesh-batman-adv-15             |  0
 package/gluon-mesh-batman-adv-core/Makefile                    | 10 +++++++---
 .../lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan       |  0
 .../lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh      |  0
 .../lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless  |  0
 .../gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan   |  0
 .../gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan   |  0
 .../lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid     |  0
 package/gluon-mesh-vpn-fastd/Makefile                          |  9 +++++++--
 .../{files => luasrc}/lib/gluon/upgrade/400-mesh-vpn-fastd     |  0
 .../lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret       |  0
 .../lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc             |  0
 package/gluon-neighbour-info/Makefile                          |  7 ++++---
 .../lib/gluon/upgrade/400-neighbour-info-firewall              |  0
 package/gluon-radvd/Makefile                                   |  5 ++++-
 .../{files => luasrc}/lib/gluon/upgrade/500-radvd-remove-user  |  0
 package/gluon-respondd/Makefile                                | 10 ++++++++--
 .../{files => luasrc}/lib/gluon/upgrade/400-respondd-firewall  |  0
 package/gluon-setup-mode/Makefile                              |  3 +++
 .../{files => luasrc}/lib/gluon/setup-mode/www/cgi-bin/luci    |  0
 .../{files => luasrc}/lib/gluon/upgrade/300-setup-mode         |  0
 .../{files => luasrc}/lib/gluon/upgrade/310-setup-mode-migrate |  0
 .../{files => luasrc}/lib/gluon/upgrade/320-setup-ifname       |  0
 package/gluon-status-page-api/Makefile                         | 10 ++++++++--
 .../lib/gluon/status-page/www/cgi-bin/interfaces               |  0
 package/gluon-wan-dnsmasq/Makefile                             |  5 ++++-
 .../{files => luasrc}/lib/gluon/wan-dnsmasq/update.lua         |  0
 103 files changed, 116 insertions(+), 35 deletions(-)
 rename package/gluon-alfred/{files => luasrc}/lib/gluon/upgrade/500-enable-alfred (100%)
 rename package/gluon-authorized-keys/{files => luasrc}/lib/gluon/upgrade/100-authorized-keys (100%)
 rename package/gluon-autoupdater/{files => luasrc}/lib/gluon/upgrade/500-autoupdater (100%)
 rename package/gluon-client-bridge/{files => luasrc}/lib/gluon/upgrade/300-gluon-client-bridge-network (100%)
 rename package/gluon-client-bridge/{files => luasrc}/lib/gluon/upgrade/320-gluon-client-bridge-wireless (100%)
 rename package/gluon-config-mode-autoupdater/{files => luasrc}/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua (100%)
 rename package/gluon-config-mode-contact-info/{files => luasrc}/lib/gluon/config-mode/wizard/0500-contact-info.lua (100%)
 rename package/gluon-config-mode-core/{files => luasrc}/lib/gluon/config-mode/reboot/0900-msg-reboot.lua (100%)
 rename package/gluon-config-mode-core/{files => luasrc}/usr/lib/lua/luci/controller/gluon-config-mode/index.lua (100%)
 rename package/gluon-config-mode-core/{files => luasrc}/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua (100%)
 rename package/gluon-config-mode-geo-location/{files => luasrc}/lib/gluon/config-mode/wizard/0400-geo-location.lua (100%)
 rename package/gluon-config-mode-hostname/{files => luasrc}/lib/gluon/config-mode/wizard/0100-hostname.lua (100%)
 rename package/gluon-config-mode-mesh-vpn/{files => luasrc}/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua (100%)
 rename package/gluon-config-mode-mesh-vpn/{files => luasrc}/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/001-upgrade (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/010-primary-mac (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/020-interfaces (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/030-system (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/110-network (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/120-ntp-servers (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/130-reboot-on-oom (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/140-firewall-rules (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/200-wireless (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/500-opkg (100%)
 rename package/gluon-core/{files => luasrc}/lib/gluon/upgrade/999-version (100%)
 rename package/gluon-core/{files => luasrc}/usr/lib/lua/gluon/platform.lua (100%)
 rename package/gluon-core/{files => luasrc}/usr/lib/lua/gluon/site_config.lua (100%)
 rename package/gluon-core/{files => luasrc}/usr/lib/lua/gluon/sysconfig.lua (100%)
 rename package/gluon-core/{files => luasrc}/usr/lib/lua/gluon/sysctl.lua (100%)
 rename package/gluon-core/{files => luasrc}/usr/lib/lua/gluon/users.lua (100%)
 rename package/gluon-core/{files => luasrc}/usr/lib/lua/gluon/util.lua (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/000-legacy (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/019-legacy-interfaces (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/210-legacy-wireless (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/290-legacy-setup-mode (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/290-legacy-simple-tc (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd (100%)
 rename package/gluon-legacy/{files => luasrc}/lib/gluon/upgrade/990-legacy-late (100%)
 rename package/gluon-luci-admin/{files => luasrc}/usr/lib/lua/luci/controller/admin/index.lua (100%)
 rename package/gluon-luci-admin/{files => luasrc}/usr/lib/lua/luci/controller/admin/upgrade.lua (100%)
 rename package/gluon-luci-admin/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/info.lua (100%)
 rename package/gluon-luci-admin/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/remote.lua (100%)
 rename package/gluon-luci-autoupdater/{files => luasrc}/usr/lib/lua/luci/controller/admin/autoupdater.lua (100%)
 rename package/gluon-luci-autoupdater/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua (100%)
 rename package/gluon-luci-mesh-vpn-fastd/{files => luasrc}/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua (100%)
 rename package/gluon-luci-mesh-vpn-fastd/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua (100%)
 rename package/gluon-luci-node-role/{files => luasrc}/usr/lib/lua/luci/controller/admin/noderole.lua (100%)
 rename package/gluon-luci-node-role/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/noderole.lua (100%)
 rename package/gluon-luci-portconfig/{files => luasrc}/usr/lib/lua/luci/controller/admin/portconfig.lua (100%)
 rename package/gluon-luci-portconfig/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/portconfig.lua (100%)
 rename package/gluon-luci-private-wifi/{files => luasrc}/usr/lib/lua/luci/controller/admin/privatewifi.lua (100%)
 rename package/gluon-luci-private-wifi/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua (100%)
 rename package/gluon-luci-wifi-config/{files => luasrc}/usr/lib/lua/luci/controller/admin/wifi-config.lua (100%)
 rename package/gluon-luci-wifi-config/{files => luasrc}/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua (100%)
 rename package/gluon-mesh-batman-adv-14/{files => luasrc}/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 (100%)
 rename package/gluon-mesh-batman-adv-15/{files => luasrc}/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 (100%)
 rename package/gluon-mesh-batman-adv-core/{files => luasrc}/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan (100%)
 rename package/gluon-mesh-batman-adv-core/{files => luasrc}/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh (100%)
 rename package/gluon-mesh-batman-adv-core/{files => luasrc}/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless (100%)
 rename package/gluon-mesh-batman-adv-core/{files => luasrc}/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan (100%)
 rename package/gluon-mesh-batman-adv-core/{files => luasrc}/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan (100%)
 rename package/gluon-mesh-batman-adv-core/{files => luasrc}/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid (100%)
 rename package/gluon-mesh-vpn-fastd/{files => luasrc}/lib/gluon/upgrade/400-mesh-vpn-fastd (100%)
 rename package/gluon-mesh-vpn-fastd/{files => luasrc}/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret (100%)
 rename package/gluon-mesh-vpn-fastd/{files => luasrc}/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc (100%)
 rename package/gluon-neighbour-info/{files => luasrc}/lib/gluon/upgrade/400-neighbour-info-firewall (100%)
 rename package/gluon-radvd/{files => luasrc}/lib/gluon/upgrade/500-radvd-remove-user (100%)
 rename package/gluon-respondd/{files => luasrc}/lib/gluon/upgrade/400-respondd-firewall (100%)
 rename package/gluon-setup-mode/{files => luasrc}/lib/gluon/setup-mode/www/cgi-bin/luci (100%)
 rename package/gluon-setup-mode/{files => luasrc}/lib/gluon/upgrade/300-setup-mode (100%)
 rename package/gluon-setup-mode/{files => luasrc}/lib/gluon/upgrade/310-setup-mode-migrate (100%)
 rename package/gluon-setup-mode/{files => luasrc}/lib/gluon/upgrade/320-setup-ifname (100%)
 rename package/gluon-status-page-api/{files => luasrc}/lib/gluon/status-page/www/cgi-bin/interfaces (100%)
 rename package/gluon-wan-dnsmasq/{files => luasrc}/lib/gluon/wan-dnsmasq/update.lua (100%)

diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile
index ca3ae32..394ebd5 100644
--- a/package/gluon-alfred/Makefile
+++ b/package/gluon-alfred/Makefile
@@ -5,8 +5,9 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
-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))
diff --git a/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred b/package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred
similarity index 100%
rename from package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
rename to package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred
diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile
index 6ef90da..d881b46 100644
--- a/package/gluon-authorized-keys/Makefile
+++ b/package/gluon-authorized-keys/Makefile
@@ -4,6 +4,7 @@ PKG_NAME:=gluon-authorized-keys
 PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-authorized-keys/files/lib/gluon/upgrade/100-authorized-keys b/package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys
similarity index 100%
rename from package/gluon-authorized-keys/files/lib/gluon/upgrade/100-authorized-keys
rename to package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys
diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile
index 40120fa..c53b9b3 100644
--- a/package/gluon-autoupdater/Makefile
+++ b/package/gluon-autoupdater/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=4
 PKG_RELEASE:=$(GLUON_BRANCH)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_DEPENDS := respondd
+PKG_BUILD_DEPENDS += respondd luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -21,8 +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-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
diff --git a/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater b/package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater
similarity index 100%
rename from package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
rename to package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater
diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile
index 6bbfed6..e0a0677 100644
--- a/package/gluon-client-bridge/Makefile
+++ b/package/gluon-client-bridge/Makefile
@@ -5,6 +5,8 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
+
 include $(GLUONDIR)/include/package.mk
define Package/gluon-client-bridge
@@ -22,10 +24,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
diff --git a/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
similarity index 100%
rename from package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
rename to package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
diff --git a/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
similarity index 100%
rename from package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
rename to package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile
index 4303940..40df2d3 100644
--- a/package/gluon-config-mode-autoupdater/Makefile
+++ b/package/gluon-config-mode-autoupdater/Makefile
@@ -5,11 +5,12 @@ PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
+
 include $(GLUONDIR)/include/package.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-config-mode-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -30,10 +31,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
diff --git a/package/gluon-config-mode-autoupdater/files/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua b/package/gluon-config-mode-autoupdater/luasrc/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua
similarity index 100%
rename from package/gluon-config-mode-autoupdater/files/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua
rename to package/gluon-config-mode-autoupdater/luasrc/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua
diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile
index ff9cb57..029e4e2 100644
--- a/package/gluon-config-mode-contact-info/Makefile
+++ b/package/gluon-config-mode-contact-info/Makefile
@@ -4,6 +4,7 @@ PKG_NAME:=gluon-config-mode-contact-info
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -26,10 +27,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
diff --git a/package/gluon-config-mode-contact-info/files/lib/gluon/config-mode/wizard/0500-contact-info.lua b/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua
similarity index 100%
rename from package/gluon-config-mode-contact-info/files/lib/gluon/config-mode/wizard/0500-contact-info.lua
rename to package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua
diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index 5d700f7..a3dbf86 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -8,11 +8,12 @@ PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
+
 include $(GLUONDIR)/include/package.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-config-mode-core
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -30,10 +31,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
diff --git a/package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua
similarity index 100%
rename from package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua
rename to package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua
diff --git a/package/gluon-config-mode-core/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua b/package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
similarity index 100%
rename from package/gluon-config-mode-core/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
rename to package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
diff --git a/package/gluon-config-mode-core/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua b/package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
similarity index 100%
rename from package/gluon-config-mode-core/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
rename to package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile
index 03812e5..30c216b 100644
--- a/package/gluon-config-mode-geo-location/Makefile
+++ b/package/gluon-config-mode-geo-location/Makefile
@@ -4,12 +4,12 @@ PKG_NAME:=gluon-config-mode-geo-location
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-config-mode-geo-location
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -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
diff --git a/package/gluon-config-mode-geo-location/files/lib/gluon/config-mode/wizard/0400-geo-location.lua b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
similarity index 100%
rename from package/gluon-config-mode-geo-location/files/lib/gluon/config-mode/wizard/0400-geo-location.lua
rename to package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile
index 803f018..d10ad3f 100644
--- a/package/gluon-config-mode-hostname/Makefile
+++ b/package/gluon-config-mode-hostname/Makefile
@@ -4,12 +4,12 @@ PKG_NAME:=gluon-config-mode-hostname
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += respondd luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-config-mode-hostname
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -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
diff --git a/package/gluon-config-mode-hostname/files/lib/gluon/config-mode/wizard/0100-hostname.lua b/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
similarity index 100%
rename from package/gluon-config-mode-hostname/files/lib/gluon/config-mode/wizard/0100-hostname.lua
rename to package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile
index 35d53ea..9f6564e 100644
--- a/package/gluon-config-mode-mesh-vpn/Makefile
+++ b/package/gluon-config-mode-mesh-vpn/Makefile
@@ -4,12 +4,12 @@ PKG_NAME:=gluon-config-mode-mesh-vpn
 PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
 define Package/gluon-config-mode-mesh-vpn
   SECTION:=gluon
   CATEGORY:=Gluon
@@ -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
diff --git a/package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
similarity index 100%
rename from package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
rename to package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
diff --git a/package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
similarity index 100%
rename from package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
rename to package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 725fb73..8139107 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -5,6 +5,7 @@ PKG_VERSION:=3
 PKG_RELEASE:=$(GLUON_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-core/files/lib/gluon/upgrade/001-upgrade b/package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/001-upgrade
rename to package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade
diff --git a/package/gluon-core/files/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/010-primary-mac
rename to package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
diff --git a/package/gluon-core/files/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/020-interfaces
rename to package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
diff --git a/package/gluon-core/files/lib/gluon/upgrade/030-system b/package/gluon-core/luasrc/lib/gluon/upgrade/030-system
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/030-system
rename to package/gluon-core/luasrc/lib/gluon/upgrade/030-system
diff --git a/package/gluon-core/files/lib/gluon/upgrade/110-network b/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/110-network
rename to package/gluon-core/luasrc/lib/gluon/upgrade/110-network
diff --git a/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers b/package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
rename to package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers
diff --git a/package/gluon-core/files/lib/gluon/upgrade/130-reboot-on-oom b/package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/130-reboot-on-oom
rename to package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
diff --git a/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules b/package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
rename to package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules
diff --git a/package/gluon-core/files/lib/gluon/upgrade/200-wireless b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/200-wireless
rename to package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
diff --git a/package/gluon-core/files/lib/gluon/upgrade/500-opkg b/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/500-opkg
rename to package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
diff --git a/package/gluon-core/files/lib/gluon/upgrade/999-version b/package/gluon-core/luasrc/lib/gluon/upgrade/999-version
similarity index 100%
rename from package/gluon-core/files/lib/gluon/upgrade/999-version
rename to package/gluon-core/luasrc/lib/gluon/upgrade/999-version
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/platform.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
similarity index 100%
rename from package/gluon-core/files/usr/lib/lua/gluon/platform.lua
rename to package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/site_config.lua
similarity index 100%
rename from package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
rename to package/gluon-core/luasrc/usr/lib/lua/gluon/site_config.lua
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/sysconfig.lua
similarity index 100%
rename from package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
rename to package/gluon-core/luasrc/usr/lib/lua/gluon/sysconfig.lua
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/sysctl.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/sysctl.lua
similarity index 100%
rename from package/gluon-core/files/usr/lib/lua/gluon/sysctl.lua
rename to package/gluon-core/luasrc/usr/lib/lua/gluon/sysctl.lua
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/users.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/users.lua
similarity index 100%
rename from package/gluon-core/files/usr/lib/lua/gluon/users.lua
rename to package/gluon-core/luasrc/usr/lib/lua/gluon/users.lua
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/util.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
similarity index 100%
rename from package/gluon-core/files/usr/lib/lua/gluon/util.lua
rename to package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
diff --git a/package/gluon-legacy/Makefile b/package/gluon-legacy/Makefile
index 7320fba..ae0e21a 100644
--- a/package/gluon-legacy/Makefile
+++ b/package/gluon-legacy/Makefile
@@ -4,6 +4,7 @@ PKG_NAME:=gluon-legacy
 PKG_VERSION:=2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/000-legacy b/package/gluon-legacy/luasrc/lib/gluon/upgrade/000-legacy
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/000-legacy
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/000-legacy
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces b/package/gluon-legacy/luasrc/lib/gluon/upgrade/019-legacy-interfaces
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/019-legacy-interfaces
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless b/package/gluon-legacy/luasrc/lib/gluon/upgrade/210-legacy-wireless
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/210-legacy-wireless
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode b/package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-setup-mode
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-setup-mode
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc b/package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-simple-tc
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-simple-tc
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd b/package/gluon-legacy/luasrc/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/990-legacy-late b/package/gluon-legacy/luasrc/lib/gluon/upgrade/990-legacy-late
similarity index 100%
rename from package/gluon-legacy/files/lib/gluon/upgrade/990-legacy-late
rename to package/gluon-legacy/luasrc/lib/gluon/upgrade/990-legacy-late
diff --git a/package/gluon-luci-admin/Makefile b/package/gluon-luci-admin/Makefile
index 3e20d17..c2e9dcd 100644
--- a/package/gluon-luci-admin/Makefile
+++ b/package/gluon-luci-admin/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/index.lua
similarity index 100%
rename from package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua
rename to package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/index.lua
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/upgrade.lua b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/upgrade.lua
similarity index 100%
rename from package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/upgrade.lua
rename to package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/upgrade.lua
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/info.lua b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/info.lua
similarity index 100%
rename from package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/info.lua
rename to package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/info.lua
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua
similarity index 100%
rename from package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua
rename to package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua
diff --git a/package/gluon-luci-autoupdater/Makefile b/package/gluon-luci-autoupdater/Makefile
index 650c469..66a570e 100644
--- a/package/gluon-luci-autoupdater/Makefile
+++ b/package/gluon-luci-autoupdater/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-autoupdater/files/usr/lib/lua/luci/controller/admin/autoupdater.lua b/package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/controller/admin/autoupdater.lua
similarity index 100%
rename from package/gluon-luci-autoupdater/files/usr/lib/lua/luci/controller/admin/autoupdater.lua
rename to package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/controller/admin/autoupdater.lua
diff --git a/package/gluon-luci-autoupdater/files/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua b/package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua
similarity index 100%
rename from package/gluon-luci-autoupdater/files/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua
rename to package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua
diff --git a/package/gluon-luci-mesh-vpn-fastd/Makefile b/package/gluon-luci-mesh-vpn-fastd/Makefile
index 1be12cc..20e28cc 100644
--- a/package/gluon-luci-mesh-vpn-fastd/Makefile
+++ b/package/gluon-luci-mesh-vpn-fastd/Makefile
@@ -5,6 +5,7 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-mesh-vpn-fastd/files/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua b/package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua
similarity index 100%
rename from package/gluon-luci-mesh-vpn-fastd/files/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua
rename to package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/controller/admin/mesh_vpn_fastd.lua
diff --git a/package/gluon-luci-mesh-vpn-fastd/files/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua b/package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua
similarity index 100%
rename from package/gluon-luci-mesh-vpn-fastd/files/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua
rename to package/gluon-luci-mesh-vpn-fastd/luasrc/usr/lib/lua/luci/model/cbi/admin/mesh_vpn_fastd.lua
diff --git a/package/gluon-luci-node-role/Makefile b/package/gluon-luci-node-role/Makefile
index ded7bd3..c3252b6 100644
--- a/package/gluon-luci-node-role/Makefile
+++ b/package/gluon-luci-node-role/Makefile
@@ -5,6 +5,7 @@ PKG_VERSION:=0.1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-node-role/files/usr/lib/lua/luci/controller/admin/noderole.lua b/package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/controller/admin/noderole.lua
similarity index 100%
rename from package/gluon-luci-node-role/files/usr/lib/lua/luci/controller/admin/noderole.lua
rename to package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/controller/admin/noderole.lua
diff --git a/package/gluon-luci-node-role/files/usr/lib/lua/luci/model/cbi/admin/noderole.lua b/package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/model/cbi/admin/noderole.lua
similarity index 100%
rename from package/gluon-luci-node-role/files/usr/lib/lua/luci/model/cbi/admin/noderole.lua
rename to package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/model/cbi/admin/noderole.lua
diff --git a/package/gluon-luci-portconfig/Makefile b/package/gluon-luci-portconfig/Makefile
index 007c5fe..af3e1f8 100644
--- a/package/gluon-luci-portconfig/Makefile
+++ b/package/gluon-luci-portconfig/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-portconfig/files/usr/lib/lua/luci/controller/admin/portconfig.lua b/package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/controller/admin/portconfig.lua
similarity index 100%
rename from package/gluon-luci-portconfig/files/usr/lib/lua/luci/controller/admin/portconfig.lua
rename to package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/controller/admin/portconfig.lua
diff --git a/package/gluon-luci-portconfig/files/usr/lib/lua/luci/model/cbi/admin/portconfig.lua b/package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
similarity index 100%
rename from package/gluon-luci-portconfig/files/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
rename to package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
diff --git a/package/gluon-luci-private-wifi/Makefile b/package/gluon-luci-private-wifi/Makefile
index 604929d..545e7a5 100644
--- a/package/gluon-luci-private-wifi/Makefile
+++ b/package/gluon-luci-private-wifi/Makefile
@@ -5,6 +5,7 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-private-wifi/files/usr/lib/lua/luci/controller/admin/privatewifi.lua b/package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/controller/admin/privatewifi.lua
similarity index 100%
rename from package/gluon-luci-private-wifi/files/usr/lib/lua/luci/controller/admin/privatewifi.lua
rename to package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/controller/admin/privatewifi.lua
diff --git a/package/gluon-luci-private-wifi/files/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua b/package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua
similarity index 100%
rename from package/gluon-luci-private-wifi/files/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua
rename to package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/model/cbi/admin/privatewifi.lua
diff --git a/package/gluon-luci-wifi-config/Makefile b/package/gluon-luci-wifi-config/Makefile
index 462eab9..70d8614 100644
--- a/package/gluon-luci-wifi-config/Makefile
+++ b/package/gluon-luci-wifi-config/Makefile
@@ -5,6 +5,7 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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
diff --git a/package/gluon-luci-wifi-config/files/usr/lib/lua/luci/controller/admin/wifi-config.lua b/package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/controller/admin/wifi-config.lua
similarity index 100%
rename from package/gluon-luci-wifi-config/files/usr/lib/lua/luci/controller/admin/wifi-config.lua
rename to package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/controller/admin/wifi-config.lua
diff --git a/package/gluon-luci-wifi-config/files/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua b/package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua
similarity index 100%
rename from package/gluon-luci-wifi-config/files/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua
rename to package/gluon-luci-wifi-config/luasrc/usr/lib/lua/luci/model/cbi/admin/wifi-config.lua
diff --git a/package/gluon-mesh-batman-adv-14/Makefile b/package/gluon-mesh-batman-adv-14/Makefile
index be65caf..1638c9d 100644
--- a/package/gluon-mesh-batman-adv-14/Makefile
+++ b/package/gluon-mesh-batman-adv-14/Makefile
@@ -4,6 +4,7 @@ PKG_NAME:=gluon-mesh-batman-adv-14
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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))
diff --git a/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 b/package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
similarity index 100%
rename from package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
rename to package/gluon-mesh-batman-adv-14/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
diff --git a/package/gluon-mesh-batman-adv-15/Makefile b/package/gluon-mesh-batman-adv-15/Makefile
index 14a39a6..5f77fac 100644
--- a/package/gluon-mesh-batman-adv-15/Makefile
+++ b/package/gluon-mesh-batman-adv-15/Makefile
@@ -4,6 +4,7 @@ PKG_NAME:=gluon-mesh-batman-adv-15
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -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))
diff --git a/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 b/package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
similarity index 100%
rename from package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
rename to package/gluon-mesh-batman-adv-15/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
diff --git a/package/gluon-mesh-batman-adv-core/Makefile b/package/gluon-mesh-batman-adv-core/Makefile
index 7ae7c30..d07df32 100644
--- a/package/gluon-mesh-batman-adv-core/Makefile
+++ b/package/gluon-mesh-batman-adv-core/Makefile
@@ -4,7 +4,7 @@ PKG_NAME:=gluon-mesh-batman-adv-core
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_DEPENDS := respondd
+PKG_BUILD_DEPENDS += respondd luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -20,9 +20,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
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
similarity index 100%
rename from package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile
index bb33257..41442c9 100644
--- a/package/gluon-mesh-vpn-fastd/Makefile
+++ b/package/gluon-mesh-vpn-fastd/Makefile
@@ -4,7 +4,7 @@ PKG_NAME:=gluon-mesh-vpn-fastd
 PKG_VERSION:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_DEPENDS := respondd
+PKG_BUILD_DEPENDS += luci-base/host lua/host respondd
include $(GLUONDIR)/include/package.mk
@@ -20,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-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
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
similarity index 100%
rename from package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
rename to package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
similarity index 100%
rename from package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
rename to package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
similarity index 100%
rename from package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
rename to package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile
index 6358692..d5f0207 100644
--- a/package/gluon-neighbour-info/Makefile
+++ b/package/gluon-neighbour-info/Makefile
@@ -5,8 +5,9 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
-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
diff --git a/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall b/package/gluon-neighbour-info/luasrc/lib/gluon/upgrade/400-neighbour-info-firewall
similarity index 100%
rename from package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
rename to package/gluon-neighbour-info/luasrc/lib/gluon/upgrade/400-neighbour-info-firewall
diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile
index 6695673..27b21ca 100644
--- a/package/gluon-radvd/Makefile
+++ b/package/gluon-radvd/Makefile
@@ -4,8 +4,9 @@ PKG_NAME:=gluon-radvd
 PKG_VERSION:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
-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))
diff --git a/package/gluon-radvd/files/lib/gluon/upgrade/500-radvd-remove-user b/package/gluon-radvd/luasrc/lib/gluon/upgrade/500-radvd-remove-user
similarity index 100%
rename from package/gluon-radvd/files/lib/gluon/upgrade/500-radvd-remove-user
rename to package/gluon-radvd/luasrc/lib/gluon/upgrade/500-radvd-remove-user
diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile
index df9f257..9b507ac 100644
--- a/package/gluon-respondd/Makefile
+++ b/package/gluon-respondd/Makefile
@@ -4,8 +4,9 @@ PKG_NAME:=gluon-respondd
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
-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
diff --git a/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall b/package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd-firewall
similarity index 100%
rename from package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
rename to package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd-firewall
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index 55370ab..54002a6 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -7,6 +7,7 @@ PKG_NAME:=gluon-setup-mode
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
include $(GLUONDIR)/include/package.mk
@@ -30,10 +31,12 @@ define Build/Configure
 endef
define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
define Package/gluon-setup-mode/install
    $(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
define Package/gluon-setup-mode/postinst
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/www/cgi-bin/luci b/package/gluon-setup-mode/luasrc/lib/gluon/setup-mode/www/cgi-bin/luci
similarity index 100%
rename from package/gluon-setup-mode/files/lib/gluon/setup-mode/www/cgi-bin/luci
rename to package/gluon-setup-mode/luasrc/lib/gluon/setup-mode/www/cgi-bin/luci
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/300-setup-mode
similarity index 100%
rename from package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
rename to package/gluon-setup-mode/luasrc/lib/gluon/upgrade/300-setup-mode
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/310-setup-mode-migrate
similarity index 100%
rename from package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
rename to package/gluon-setup-mode/luasrc/lib/gluon/upgrade/310-setup-mode-migrate
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/320-setup-ifname b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
similarity index 100%
rename from package/gluon-setup-mode/files/lib/gluon/upgrade/320-setup-ifname
rename to package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
diff --git a/package/gluon-status-page-api/Makefile b/package/gluon-status-page-api/Makefile
index 174e2e8..08e7ce3 100644
--- a/package/gluon-status-page-api/Makefile
+++ b/package/gluon-status-page-api/Makefile
@@ -5,9 +5,9 @@ PKG_VERSION:=1
 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_DEPENDS := respondd
+PKG_BUILD_DEPENDS += luci-base/host lua/host respondd
-include $(INCLUDE_DIR)/package.mk
+include $(GLUONDIR)/include/package.mk
define Package/gluon-status-page-api
   SECTION:=gluon
@@ -21,6 +21,11 @@ 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-status-page-api/install
    $(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
    $(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-batadv $(1)/lib/gluon/status-page/providers/
@@ -30,6 +35,7 @@ define Package/gluon-status-page-api/install
    $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/status-page-api.so
$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
$(eval $(call BuildPackage,gluon-status-page-api))
diff --git a/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/interfaces b/package/gluon-status-page-api/luasrc/lib/gluon/status-page/www/cgi-bin/interfaces
similarity index 100%
rename from package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/interfaces
rename to package/gluon-status-page-api/luasrc/lib/gluon/status-page/www/cgi-bin/interfaces
diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile
index 3722210..4de1fba 100644
--- a/package/gluon-wan-dnsmasq/Makefile
+++ b/package/gluon-wan-dnsmasq/Makefile
@@ -4,8 +4,9 @@ PKG_NAME:=gluon-wan-dnsmasq
 PKG_VERSION:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS += luci-base/host lua/host
-include $(INCLUDE_DIR)/package.mk
+include $(GLUONDIR)/include/package.mk
define Package/gluon-wan-dnsmasq
   SECTION:=gluon
@@ -26,10 +27,12 @@ define Build/Configure
 endef
define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
define Package/gluon-wan-dnsmasq/install
    $(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
$(eval $(call BuildPackage,gluon-wan-dnsmasq))
diff --git a/package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua b/package/gluon-wan-dnsmasq/luasrc/lib/gluon/wan-dnsmasq/update.lua
similarity index 100%
rename from package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua
rename to package/gluon-wan-dnsmasq/luasrc/lib/gluon/wan-dnsmasq/update.lua
-- 
2.9.0


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

[Dev] [PATCH] Prepare all gluon packages there contains lua code with the call command to minify lua code