Minify all Lua code

2016-07-10 20:08:44 +02:00 · 2016-07-10 20:08:44 +02:00 · 1c1f490527
parent 42910c0606
commit 1c1f490527
112 changed files with 117 additions and 27 deletions
--- a/package/gluon-alfred/Makefile
+++ b/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))
--- a/package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred
+++ b/package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred
--- a/package/gluon-authorized-keys/Makefile
+++ b/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
--- a/package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys
+++ b/package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys
--- a/package/gluon-autoupdater/Makefile
+++ b/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
--- a/package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater
+++ b/package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater
--- a/package/gluon-client-bridge/Makefile
+++ b/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
--- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
+++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
--- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
+++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
--- a/package/gluon-config-mode-autoupdater/Makefile
+++ b/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

--- a/package/gluon-config-mode-autoupdater/luasrc/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
--- a/package/gluon-config-mode-contact-info/Makefile
+++ b/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

--- a/package/gluon-config-mode-contact-info/luasrc/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
--- a/package/gluon-config-mode-core/Makefile
+++ b/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

--- a/package/gluon-config-mode-core/luasrc/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
--- a/package/gluon-config-mode-core/luasrc/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
--- a/package/gluon-config-mode-core/luasrc/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
--- a/package/gluon-config-mode-geo-location/Makefile
+++ b/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

--- a/package/gluon-config-mode-geo-location/luasrc/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
--- a/package/gluon-config-mode-hostname/Makefile
+++ b/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

--- a/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
+++ b/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
--- a/package/gluon-config-mode-mesh-vpn/Makefile
+++ b/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

--- a/package/gluon-config-mode-mesh-vpn/luasrc/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
--- a/package/gluon-config-mode-mesh-vpn/luasrc/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
--- a/package/gluon-core/Makefile
+++ b/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
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/030-system
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/030-system
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/999-version
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/999-version
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/site_config.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/site_config.lua
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/sysconfig.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/sysconfig.lua
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/sysctl.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/sysctl.lua
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/users.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/users.lua
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
--- a/package/gluon-ebtables-filter-multicast/Makefile
+++ b/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
--- a/package/gluon-ebtables-filter-ra-dhcp/Makefile
+++ b/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
--- a/package/gluon-ebtables/Makefile
+++ b/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
--- a/package/gluon-legacy/Makefile
+++ b/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
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/000-legacy
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/000-legacy
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/019-legacy-interfaces
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/019-legacy-interfaces
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/210-legacy-wireless
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/210-legacy-wireless
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-setup-mode
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-setup-mode
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-simple-tc
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/290-legacy-simple-tc
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
--- a/package/gluon-legacy/luasrc/lib/gluon/upgrade/990-legacy-late
+++ b/package/gluon-legacy/luasrc/lib/gluon/upgrade/990-legacy-late
--- a/package/gluon-lock-password/Makefile
+++ b/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
--- a/package/gluon-luci-admin/Makefile
+++ b/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

--- a/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/index.lua
+++ b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/index.lua
--- a/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/upgrade.lua
+++ b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/controller/admin/upgrade.lua
--- a/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/info.lua
+++ b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/info.lua
--- a/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua
+++ b/package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua
--- a/package/gluon-luci-autoupdater/Makefile
+++ b/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

--- a/package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/controller/admin/autoupdater.lua
+++ b/package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/controller/admin/autoupdater.lua
--- a/package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua
+++ b/package/gluon-luci-autoupdater/luasrc/usr/lib/lua/luci/model/cbi/admin/autoupdater.lua
--- a/package/gluon-luci-mesh-vpn-fastd/Makefile
+++ b/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

--- a/package/gluon-luci-mesh-vpn-fastd/luasrc/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
--- a/package/gluon-luci-mesh-vpn-fastd/luasrc/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
--- a/package/gluon-luci-node-role/Makefile
+++ b/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

--- a/package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/controller/admin/noderole.lua
+++ b/package/gluon-luci-node-role/luasrc/usr/lib/lua/luci/controller/admin/noderole.lua
--- a/package/gluon-luci-node-role/luasrc/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
--- a/package/gluon-luci-portconfig/Makefile
+++ b/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

--- a/package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/controller/admin/portconfig.lua
+++ b/package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/controller/admin/portconfig.lua
--- a/package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
+++ b/package/gluon-luci-portconfig/luasrc/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
--- a/package/gluon-luci-private-wifi/Makefile
+++ b/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

--- a/package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/controller/admin/privatewifi.lua
+++ b/package/gluon-luci-private-wifi/luasrc/usr/lib/lua/luci/controller/admin/privatewifi.lua
--- a/package/gluon-luci-private-wifi/luasrc/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
--- a/package/gluon-luci-theme/Makefile
+++ b/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
--- a/package/gluon-luci-wifi-config/Makefile
+++ b/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

--- a/package/gluon-luci-wifi-config/luasrc/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
--- a/package/gluon-luci-wifi-config/luasrc/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
--- a/package/gluon-mesh-batman-adv-14/Makefile
+++ b/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))
--- a/package/gluon-mesh-batman-adv-14/luasrc/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
--- a/package/gluon-mesh-batman-adv-15/Makefile
+++ b/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))
--- a/package/gluon-mesh-batman-adv-15/luasrc/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
--- a/package/gluon-mesh-batman-adv-core/Makefile
+++ b/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
--- a/package/gluon-mesh-batman-adv-core/luasrc/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
--- a/package/gluon-mesh-batman-adv-core/luasrc/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
--- a/package/gluon-mesh-batman-adv-core/luasrc/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
--- a/package/gluon-mesh-batman-adv-core/luasrc/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
--- a/package/gluon-mesh-batman-adv-core/luasrc/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
--- a/package/gluon-mesh-batman-adv-core/luasrc/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
--- a/package/gluon-mesh-vpn-fastd/Makefile
+++ b/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
--- a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
+++ b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
--- a/package/gluon-mesh-vpn-fastd/luasrc/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
--- a/package/gluon-mesh-vpn-fastd/luasrc/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
--- a/package/gluon-neighbour-info/Makefile
+++ b/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
--- a/package/gluon-neighbour-info/luasrc/lib/gluon/upgrade/400-neighbour-info-firewall
+++ b/package/gluon-neighbour-info/luasrc/lib/gluon/upgrade/400-neighbour-info-firewall
--- a/package/gluon-next-node/Makefile
+++ b/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
--- a/package/gluon-node-info/Makefile
+++ b/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
--- a/package/gluon-radvd/Makefile
+++ b/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))
--- a/package/gluon-radvd/luasrc/lib/gluon/upgrade/500-radvd-remove-user
+++ b/package/gluon-radvd/luasrc/lib/gluon/upgrade/500-radvd-remove-user
--- a/package/gluon-respondd/Makefile
+++ b/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
--- a/Show More
+++ b/Show More