Commit ab8807f9 authored by Ivan Tyagov's avatar Ivan Tyagov

Use SlapOS's open62541's shared library (same one against which coupler

was built against) and not system wide one in /usr/local/lib which
was the case recently.
parent c509c041
...@@ -3,7 +3,7 @@ filename = instance-modbus.cfg.in ...@@ -3,7 +3,7 @@ filename = instance-modbus.cfg.in
md5sum = 8637c6b714a0bb9f27c86f3928049b98 md5sum = 8637c6b714a0bb9f27c86f3928049b98
filename = instance-opc-ua.cfg.in filename = instance-opc-ua.cfg.in
md5sum = 542fca1e0708b70229a700965e1db989 md5sum = 71be79d7e6fa350efb34d0c79bc88bee
filename = instance-opc-ua-virtual.cfg.in filename = instance-opc-ua-virtual.cfg.in
md5sum = d10c8e58066b944058489b1b59b2bb53 md5sum = d10c8e58066b944058489b1b59b2bb53
...@@ -19,7 +19,8 @@ extends = {{ template_monitor }} ...@@ -19,7 +19,8 @@ extends = {{ template_monitor }}
[coupler-opc-ua] [coupler-opc-ua]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
# start with defaults environment =
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ open62541_location }}/lib
command-line = command-line =
{{ buildout['bin-directory'] }}/server -d ${instance-parameter:configuration.coupler_block_device} -s ${instance-parameter:configuration.coupler_i2c_slave_list} -p ${instance-parameter:configuration.opc_ua_port} -u ${instance-parameter:configuration.username} -w ${instance-parameter:configuration.password} -b ${instance-parameter:configuration.heart_beat} -t ${instance-parameter:configuration.heart_beat_interval} -l ${instance-parameter:configuration.heart_beat_id_list} -n ${instance-parameter:configuration.network_address_url_data_type} -o ${instance-parameter:configuration.heart_beat_timeout_interval} -i ${instance-parameter:configuration.id} {{ buildout['bin-directory'] }}/server -d ${instance-parameter:configuration.coupler_block_device} -s ${instance-parameter:configuration.coupler_i2c_slave_list} -p ${instance-parameter:configuration.opc_ua_port} -u ${instance-parameter:configuration.username} -w ${instance-parameter:configuration.password} -b ${instance-parameter:configuration.heart_beat} -t ${instance-parameter:configuration.heart_beat_interval} -l ${instance-parameter:configuration.heart_beat_id_list} -n ${instance-parameter:configuration.network_address_url_data_type} -o ${instance-parameter:configuration.heart_beat_timeout_interval} -i ${instance-parameter:configuration.id}
......
...@@ -15,11 +15,6 @@ extends = ...@@ -15,11 +15,6 @@ extends =
https://lab.nexedi.com/nexedi/slapos/raw/master/component/mbedtls/buildout.cfg https://lab.nexedi.com/nexedi/slapos/raw/master/component/mbedtls/buildout.cfg
# we need to have bootstrap Python for buildout in Python3 due to
# https://bugs.kde.org/show_bug.cgi?id=344802
#[python]
#part = python3
# use latest 2.xx release # use latest 2.xx release
[mbedtls] [mbedtls]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -80,5 +75,6 @@ extensions = jinja2.ext.do ...@@ -80,5 +75,6 @@ extensions = jinja2.ext.do
context = context =
section buildout buildout section buildout buildout
raw template_monitor ${monitor2-template:output} raw template_monitor ${monitor2-template:output}
key open62541_location open62541:location
# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by # md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
# calling update-hash # calling update-hash
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment