Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon
Commits
182c21ed
Unverified
Commit
182c21ed
authored
8 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
gluon-site: convert site.conf to JSON in compile instead of install step
parent
ff0ad207
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
package/gluon-site/Makefile
+2
-1
2 additions, 1 deletion
package/gluon-site/Makefile
with
2 additions
and
1 deletion
package/gluon-site/Makefile
+
2
−
1
View file @
182c21ed
...
@@ -28,12 +28,13 @@ define Build/Configure
...
@@ -28,12 +28,13 @@ define Build/Configure
endef
endef
define
Build/Compile
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
)
$(
call
GluonBuildI18N,gluon-site,
$(
GLUON_SITEDIR
)
/i18n
)
endef
endef
define
Package/gluon-site/install
define
Package/gluon-site/install
$(INSTALL_DIR)
$(1)/lib/gluon
$(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
echo
"$(GLUON_RELEASE)"
>
$(1)/lib/gluon/release
$(
call
GluonInstallI18N,gluon-site,
$(
1
))
$(
call
GluonInstallI18N,gluon-site,
$(
1
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment