Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
113e06b8
Commit
113e06b8
authored
Jul 23, 2022
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Beremiz-ide: fix missing cmake while running tests
parent
b7d638e3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
3 deletions
+11
-3
software/beremiz-ide/buildout.hash.cfg
software/beremiz-ide/buildout.hash.cfg
+2
-2
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
+1
-1
software/beremiz-ide/instance.cfg.in
software/beremiz-ide/instance.cfg.in
+1
-0
software/beremiz-ide/software.cfg
software/beremiz-ide/software.cfg
+2
-0
software/beremiz-ide/test.cfg
software/beremiz-ide/test.cfg
+5
-0
No files found.
software/beremiz-ide/buildout.hash.cfg
View file @
113e06b8
...
...
@@ -15,11 +15,11 @@
[instance]
filename = instance.cfg.in
md5sum =
c4079d70ab3268234651bf6c36234b2f
md5sum =
fd556a0cb44610f0b0898b7126bd77b2
[template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in
md5sum =
51071494633f4ffba700baf935dc6955
md5sum =
c92317d0d754f62d3259136d1a0df1ac
[template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in
...
...
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
View file @
113e06b8
...
...
@@ -179,7 +179,7 @@ wrapper-path = ${directory:services}/fluxbox
recipe = slapos.recipe.template
inline =
export LD_LIBRARY_PATH={{ mesa_location }}/lib
export PATH=${directory:bin}:{{ git_bin_dir }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH
export PATH=${directory:bin}:{{ git_bin_dir }}:{{
cmake_bin }}:{{
autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH
export XDG_DATA_DIR={{ gtk3_location }}/share
export GSETTINGS_SCHEMA_DIR={{ gtk3_location }}/share/glib-2.0/schemas
export FONTCONFIG_FILE=${font-config:output}
...
...
software/beremiz-ide/instance.cfg.in
View file @
113e06b8
...
...
@@ -46,6 +46,7 @@ filename = instance-beremiz.cfg
extra-context =
raw autoconf_bin {{ autoconf_location }}/bin
raw automake_bin {{ automake_location }}/bin
raw cmake_bin {{ cmake_location }}/bin
raw bash_bin {{ bash_location }}/bin/bash
raw beremiz_location {{ beremiz_location }}
raw bison_location {{ bison_location }}
...
...
software/beremiz-ide/software.cfg
View file @
113e06b8
...
...
@@ -3,6 +3,7 @@
extends =
../../stack/slapos.cfg
../../component/autoconf/buildout.cfg
../../component/cmake/buildout.cfg
../../component/flex/buildout.cfg
../../component/fonts/buildout.cfg
../../component/noVNC/buildout.cfg
...
...
@@ -108,6 +109,7 @@ type = beremiz
context =
key autoconf_location autoconf:location
key automake_location automake:location
key cmake_location cmake:location
key bash_location bash:location
key beremiz_location beremiz-setup:setup
key bin_directory buildout:bin-directory
...
...
software/beremiz-ide/test.cfg
View file @
113e06b8
...
...
@@ -32,6 +32,11 @@ eggs +=
[instance]
type = beremiz-test
# Download only open62541 sources because beremiz test needs
# sources and will rebuild it anyway.
[open62541]
recipe = slapos.recipe.build:download-unpacked
[gen-nxdtest.sh]
recipe = slapos.recipe.template
output = ${buildout:parts-directory}/gennxdtest.sh
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment