Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
ab6abffd
Commit
ab6abffd
authored
Mar 26, 2024
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Use gcc-10.2 for beremiz-ide."
This reverts commit 5814aadb7234c6772e855c5549afbb09feeb1f5e.
parent
77411007
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
8 deletions
+14
-8
component/open62541/buildout.cfg
component/open62541/buildout.cfg
+5
-2
software/beremiz-runtime/buildout.hash.cfg
software/beremiz-runtime/buildout.hash.cfg
+1
-1
software/beremiz-runtime/instance.cfg.in
software/beremiz-runtime/instance.cfg.in
+2
-3
software/beremiz-runtime/software.cfg
software/beremiz-runtime/software.cfg
+6
-2
No files found.
component/open62541/buildout.cfg
View file @
ab6abffd
# Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/
# Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/
[buildout]
[buildout]
parts = open62541
parts =
open62541
gcc-10.2
extends =
extends =
../cmake/buildout.cfg
../cmake/buildout.cfg
../patch/buildout.cfg
../patch/buildout.cfg
../python3/buildout.cfg
../python3/buildout.cfg
../gcc/buildout.cfg
../defaults.cfg
../defaults.cfg
[gcc]
[gcc]
...
@@ -35,4 +38,4 @@ configure-options =
...
@@ -35,4 +38,4 @@ configure-options =
post-install =
post-install =
cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
environment =
environment =
PATH=${python3:location}/bin:${patch:location}/bin:%(PATH)s
PATH=${
gcc-10.2:location}/bin:${
python3:location}/bin:${patch:location}/bin:%(PATH)s
software/beremiz-runtime/buildout.hash.cfg
View file @
ab6abffd
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
e68998b1dc1c851303be5df6f2c2a84a
md5sum =
4b7e36bbb077f91cdde5a4a05502cf71
software/beremiz-runtime/instance.cfg.in
View file @
ab6abffd
...
@@ -53,9 +53,8 @@ recipe = slapos.cookbook:wrapper
...
@@ -53,9 +53,8 @@ recipe = slapos.cookbook:wrapper
# needed libraries and tools inside SlapOS context
# needed libraries and tools inside SlapOS context
environment =
environment =
BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
PATH=$PATH:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin
PATH={{ gcc_location }}/bin
LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu/:/lib:/usr/lib/x86_64-linux-gnu/:{{ openssl_location }}/lib
LIBRARY_PATH={{ openssl_location }}/lib
COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/
command-line =
command-line =
{{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run
{{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run
...
...
software/beremiz-runtime/software.cfg
View file @
ab6abffd
...
@@ -7,6 +7,7 @@ extends =
...
@@ -7,6 +7,7 @@ extends =
../../component/numpy/buildout.cfg
../../component/numpy/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/python-sslpsk/buildout.cfg
../../component/python-sslpsk/buildout.cfg
../../component/gcc/buildout.cfg
../../stack/monitor/buildout.cfg
../../stack/monitor/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
...
@@ -17,10 +18,14 @@ parts =
...
@@ -17,10 +18,14 @@ parts =
python-interpreter
python-interpreter
matiec
matiec
open62541
open62541
gcc-10.2
[python]
[python]
part = python2.7
part = python2.7
[gcc]
part = gcc-10.2
[open62541]
[open62541]
configure-options =
configure-options =
-DBUILD_SHARED_LIBS=OFF
-DBUILD_SHARED_LIBS=OFF
...
@@ -90,8 +95,7 @@ context =
...
@@ -90,8 +95,7 @@ context =
section buildout buildout
section buildout buildout
raw template_monitor ${monitor2-template:output}
raw template_monitor ${monitor2-template:output}
key openssl_location openssl:location
key openssl_location openssl:location
# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
key gcc_location gcc-10.2:location
# calling update-hash
[versions]
[versions]
Twisted = 20.3.0
Twisted = 20.3.0
...
...
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