From 182c21eddc7eac25d2e76b05c564af45f2703a8f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 24 Sep 2016 02:05:01 +0200
Subject: [PATCH] gluon-site: convert site.conf to JSON in compile instead of
install step
---
package/gluon-site/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile
index a7084ad0b..a0d120e80 100644
--- a/package/gluon-site/Makefile
+++ b/package/gluon-site/Makefile
@@ -28,12 +28,13 @@ define Build/Configure
endef
define Build/Compile
+ lua -e 'print(require("cjson").encode(assert(dofile("$(GLUONDIR)/scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json
$(call GluonBuildI18N,gluon-site,$(GLUON_SITEDIR)/i18n)
endef
define Package/gluon-site/install
$(INSTALL_DIR) $(1)/lib/gluon
- lua -e 'print(require("cjson").encode(assert(dofile("$(GLUONDIR)/scripts/site_config.lua"))))' > $(1)/lib/gluon/site.json
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/site.json $(1)/lib/gluon/
echo "$(GLUON_RELEASE)" > $(1)/lib/gluon/release
$(call GluonInstallI18N,gluon-site,$(1))
--
GitLab