nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase and so on

Browse Source
This commit is contained in:
lemoer 2020-05-01 14:36:58 +02:00
parent 5aa1ea448a
commit e577c7e9c4
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/user/getting_started.rst
View File

@ -212,11 +212,11 @@ GLUON_DEBUG
Setting ``GLUON_DEBUG=1`` will provide firmware images including debugging symbols usable with GDB or Setting ``GLUON_DEBUG=1`` will provide firmware images including debugging symbols usable with GDB or
similar tools. Requires a device or target with at least 16 MB of flash space, e.g. `x86-64`. Unset by default. similar tools. Requires a device or target with at least 16 MB of flash space, e.g. `x86-64`. Unset by default.
GLUON_DO_NOT_MINIFY GLUON_MINIFY
Setting ``GLUON_DO_NOT_MINIFY`` will omit the minification of scripts during the build process. Setting ``GLUON_MINIFY`` will minify scripts during the build process. This flag is enabled by
This setting is handy if human readable scripts on the devices are desired for development purposes. default. Disabling this flag is handy if human readable scripts on the devices are desired for
Be aware, that this will increase the size of the resulting images and is therefore not suitable development purposes. Be aware, that this will increase the size of the resulting images and
for devices with small flash chips. is therefore not suitable for devices with small flash chips.
GLUON_DEVICES GLUON_DEVICES
List of devices to build. The list contains the Gluon profile name of a device, the profile List of devices to build. The list contains the Gluon profile name of a device, the profile

5
package/gluon-core/Config.in
View File

@ -348,5 +348,6 @@ config GLUON_SPECIALIZE_KERNEL
select KERNEL_IP_NF_TARGET_MASQUERADE select KERNEL_IP_NF_TARGET_MASQUERADE
select KERNEL_IP_NF_TARGET_REDIRECT select KERNEL_IP_NF_TARGET_REDIRECT
config GLUON_DO_NOT_MINIFY config GLUON_MINIFY
bool "Disables minification of gluon scripts during build" bool "Minify Gluon scripts"
default y

6
package/gluon-status-page/Makefile
View File

@ -10,12 +10,18 @@ define Package/gluon-status-page
DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua
endef endef
PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
define Package/gluon-status-page/install define Package/gluon-status-page/install
$(Gluon/Build/Install) $(Gluon/Build/Install)
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers $(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/
ifndef GLUON_MINIFY
$(CP) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js
endif
$(INSTALL_DIR) $(1)/lib/gluon/status-page/view/ $(INSTALL_DIR) $(1)/lib/gluon/status-page/view/
$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/status-page/ $(LN) /lib/gluon/web/i18n $(1)/lib/gluon/status-page/
$(LN) /lib/gluon/web/view/error $(1)/lib/gluon/status-page/view/ $(LN) /lib/gluon/web/view/error $(1)/lib/gluon/status-page/view/

9
package/gluon.mk
View File

@ -3,6 +3,13 @@ PKG_FILE_DEPENDS += $(GLUON_MK)
PKG_BUILD_DEPENDS += luasrcdiet/host PKG_BUILD_DEPENDS += luasrcdiet/host
<<<<<<< HEAD
=======
ifneq ($(wildcard ./luasrc/.),)
PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
endif
>>>>>>> 51dde9fa... rebase and so on
ifneq ($(wildcard ./src/respondd.c),) ifneq ($(wildcard ./src/respondd.c),)
PKG_BUILD_DEPENDS += respondd PKG_BUILD_DEPENDS += respondd
endif endif
@ -57,12 +64,14 @@ endef
define GluonSrcDiet define GluonSrcDiet
rm -rf $(2) rm -rf $(2)
$(CP) $(1) $(2) $(CP) $(1) $(2)
ifdef GLUON_MINIFY
$(FIND) $(2) -type f | while read src; do \ $(FIND) $(2) -type f | while read src; do \
if luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; then \ if luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; then \
chmod $$$$(stat -c%a "$$$$src") "$$$$src.o"; \ chmod $$$$(stat -c%a "$$$$src") "$$$$src.o"; \
mv "$$$$src.o" "$$$$src"; \ mv "$$$$src.o" "$$$$src"; \
fi; \ fi; \
done done
endif
endef endef

4
targets/generic
View File

@ -60,8 +60,8 @@ if istrue(env.GLUON_DEBUG) then
try_config 'CONFIG_TARGET_ROOTFS_PARTSIZE=500' try_config 'CONFIG_TARGET_ROOTFS_PARTSIZE=500'
end end
if envtrue.GLUON_DO_NOT_MINIFY then if istrue(env.GLUON_MINIFY) then
config 'CONFIG_GLUON_DO_NOT_MINIFY=y' config 'CONFIG_GLUON_MINIFY=y'
end end
packages { packages {