software/osie-coupler: move coupler in a component

component/osie-coupler/buildout.cfg

+[buildout]
+extends =
+  ../git/buildout.cfg
+  ../mbedtls/buildout.cfg
+  ../open62541/buildout.cfg
+  ../defaults.cfg
+
+parts = osie-coupler
+
+[gcc]
+# we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
+max_version = 0
+
+[open62541]
+pre-configure +=
+  ${git:location}/bin/git clone -b v1.1.6 https://github.com/LiamBindle/MQTT-C.git deps/mqtt-c
+configure-options =
+  -DBUILD_SHARED_LIBS=ON
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_PUBSUB_MONITORING=ON
+  -DUA_ENABLE_PUBSUB_ETH_UADP=ON
+  -DUA_NAMESPACE_ZERO=REDUCED
+  -DUA_ENABLE_ENCRYPTION=MBEDTLS
+  -DUA_ENABLE_ENCRYPTION_MBEDTLS=ON
+  -DMBEDTLS_INCLUDE_DIRS=${mbedtls:location}/include
+  -DMBEDTLS_LIBRARY=${mbedtls:location}/lib/libmbedtls.so
+  -DMBEDX509_LIBRARY=${mbedtls:location}/lib/libmbedx509.so
+  -DMBEDCRYPTO_LIBRARY=${mbedtls:location}/lib/libmbedcrypto.so
+  -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON
+  -DUA_ENABLE_PUBSUB_MQTT=ON
+environment +=
+  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}
+
+[osie-repository]
+recipe  = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+repository = https://lab.nexedi.com/nexedi/osie.git
+revision = 136840d
+
+[osie-coupler]
+recipe = slapos.recipe.cmmi
+path = ${osie-repository:location}/coupler
+bin_dir = ${:path}/bin/
+environment =
+  PATH=${gcc:prefix}/bin:/usr/bin
+  OPEN62541_HOME = ${open62541:location}
+  OPEN62541_SOURCE_HOME = ${open62541:source-location}
+  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib -l:libopen62541.so -L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -I${open62541:location}/include -I${open62541:source-location}/src/pubsub/ -I${open62541:source-location}/deps
+configure-command = true

software/osie-coupler/software.cfg

 [buildout]
 parts =
-  open62541
-  compile-coupler
   slapos-cookbook
   instance-profile
 
 extends =
-  ../../component/git/buildout.cfg
-  ../../component/mbedtls/buildout.cfg
-  ../../component/open62541/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
-  ../../component/defaults.cfg
+  ../../component/osie-coupler/buildout.cfg
 
-[gcc]
-# we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
-max_version = 0
-
-[open62541]
-pre-configure +=
-  ${git:location}/bin/git clone -b v1.1.6 https://github.com/LiamBindle/MQTT-C.git deps/mqtt-c
-configure-options =
-  -DBUILD_SHARED_LIBS=ON
-  -DCMAKE_BUILD_TYPE=Release
-  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-  -DUA_ENABLE_PUBSUB=ON
-  -DUA_ENABLE_PUBSUB_MONITORING=ON
-  -DUA_ENABLE_PUBSUB_ETH_UADP=ON
-  -DUA_NAMESPACE_ZERO=REDUCED
-  -DUA_ENABLE_ENCRYPTION=MBEDTLS
-  -DUA_ENABLE_ENCRYPTION_MBEDTLS=ON
-  -DMBEDTLS_INCLUDE_DIRS=${mbedtls:location}/include
-  -DMBEDTLS_LIBRARY=${mbedtls:location}/lib/libmbedtls.so
-  -DMBEDX509_LIBRARY=${mbedtls:location}/lib/libmbedx509.so
-  -DMBEDCRYPTO_LIBRARY=${mbedtls:location}/lib/libmbedcrypto.so
-  -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON
-  -DUA_ENABLE_PUBSUB_MQTT=ON
-environment +=
-  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}
-
-[osie-repository]
-recipe  = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-repository = https://lab.nexedi.com/nexedi/osie.git
-revision = 5d193e57b50a7ebb3df147e403917201eb9cb6c6
-
-[compile-coupler]
-recipe = slapos.recipe.cmmi
-path = ${osie-repository:location}/coupler
-bin_dir = ${:path}/bin/
-environment =
-  PATH=${gcc:prefix}/bin:/usr/bin
-  OPEN62541_HOME = ${open62541:location}
-  OPEN62541_SOURCE_HOME = ${open62541:source-location}
-  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib -l:libopen62541.so -L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -I${open62541:location}/include -I${open62541:source-location}/src/pubsub/ -I${open62541:source-location}/deps
-configure-command = true
 
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
@@ -71,4 +20,4 @@ context =
   raw template_monitor ${monitor2-template:output}
   key open62541_location open62541:location
   key mbedtls_location mbedtls:location
-  key coupler_location compile-coupler:bin_dir
+  key coupler_location osie-coupler:bin_dir