From 2ed939450cbb6ad8262404cf682d06ecdb78aed0 Mon Sep 17 00:00:00 2001 From: lemoer Date: Sat, 2 May 2020 21:29:29 +0200 Subject: [PATCH] fixup2 --- package/gluon-status-page/Makefile | 2 +- package/gluon.mk | 2 +- targets/generic | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile index 04d5b119..c30229e3 100644 --- a/package/gluon-status-page/Makefile +++ b/package/gluon-status-page/Makefile @@ -18,7 +18,7 @@ define Package/gluon-status-page/install $(INSTALL_DIR) $(1)/lib/gluon/status-page/providers $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/ -ifndef GLUON_MINIFY +ifndef CONFIG_GLUON_MINIFY $(CP) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js endif diff --git a/package/gluon.mk b/package/gluon.mk index ce02f09f..b69caa81 100644 --- a/package/gluon.mk +++ b/package/gluon.mk @@ -61,7 +61,7 @@ endef define GluonSrcDiet rm -rf $(2) $(CP) $(1) $(2) -ifdef GLUON_MINIFY +ifdef CONFIG_GLUON_MINIFY $(FIND) $(2) -type f | while read src; do \ if luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; then \ chmod $$$$(stat -c%a "$$$$src") "$$$$src.o"; \ diff --git a/targets/generic b/targets/generic index 562d1850..7672833d 100644 --- a/targets/generic +++ b/targets/generic @@ -60,8 +60,8 @@ if istrue(env.GLUON_DEBUG) then try_config 'CONFIG_TARGET_ROOTFS_PARTSIZE=500' end -if istrue(env.GLUON_MINIFY) then - config 'CONFIG_GLUON_MINIFY=y' +if not istrue(env.GLUON_MINIFY) then + config '# CONFIG_GLUON_MINIFY is not set' end packages {