component/osie-coupler: use C_INCLUDE_PATH

component/open62541/buildout.cfg

@@ -53,7 +53,3 @@ post-install =
 environment =
   PATH=${gcc:prefix}/bin:${python3:location}/bin:${patch:location}/bin:%(PATH)s
   LDFLAGS=-L${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib
-# we need open62541's sources even after compiling and linking in [open62541]
-# section. Reasons is that coupler's C application depends on it.
-keep-compile-dir = true
-source-location = @@LOCATION@@/.build/open62541-pack-${open62541:tag}

component/osie-coupler/buildout.cfg

@@ -15,7 +15,7 @@ max_version = 0
 recipe  = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
 repository = https://lab.nexedi.com/nexedi/osie.git
-revision = ef9516a
+revision = dd9aea8
 
 [osie-coupler]
 recipe = slapos.recipe.cmmi
@@ -23,7 +23,6 @@ path = ${osie-repository:location}/coupler
 bin_dir = ${:path}/bin/
 environment =
   PATH=${gcc:prefix}/bin:/usr/bin
-  OPEN62541_SOURCE_HOME = ${open62541:source-location}
-  C_COMPILER_EXTRA_FLAGS =-I${open62541:location}/include -I${open62541:source-location}/src/pubsub/ -I${open62541:source-location}/deps
+  C_INCLUDE_PATH=${open62541:location}/include:${open62541:location}/deps:${open62541:location}/src/pubsub
   LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib
 configure-command = true

software/osie-coupler/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 17549c62b5ad20cfe2520fb2ef133c22
+md5sum = 5bff4e422a2b22bec348bc5e4cb2f3b7

software/osie-coupler/instance.cfg.in

@@ -16,8 +16,6 @@ extends = {{ template_monitor }}
 
 [coupler-opc-ua]
 recipe = slapos.cookbook:wrapper
-environment =
-  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ open62541_location }}/lib:{{ mbedtls_location }}/lib
 command-line =
     {{ coupler_location }}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} -m ${instance-parameter:configuration.mode} -j ${instance-parameter:configuration.network_interface}
 wrapper-path = ${directory:service}/coupler-opc-ua

software/osie-coupler/software.cfg

@@ -18,6 +18,4 @@ extensions = jinja2.ext.do
 context =
   section buildout buildout
   raw template_monitor ${monitor2-template:output}
-  key open62541_location open62541:location
-  key mbedtls_location mbedtls:location
   key coupler_location osie-coupler:bin_dir