component/open62541: update configure options

Update component to be suitable for osie-coupler

component/open62541/buildout.cfg

@@ -5,9 +5,10 @@ parts =
   open62541
 extends =
   ../cmake/buildout.cfg
+  ../git/buildout.cfg
+  ../mbedtls/buildout.cfg
   ../patch/buildout.cfg
   ../python3/buildout.cfg
-  ../gcc/buildout.cfg
   ../defaults.cfg
 
 [gcc]
@@ -27,6 +28,7 @@ pre-configure =
   # remove old FindPython3 which does not know about python > 3.8 to
   # use FindPython3 bundled with slapos' cmake
   rm tools/cmake/FindPython3.cmake tools/cmake/FindPython/Support.cmake
+  ${git:location}/bin/git clone -b v1.1.6 https://github.com/LiamBindle/MQTT-C.git deps/mqtt-c
 configure-command =
   ${cmake:location}/bin/cmake
 configure-options =
@@ -34,9 +36,24 @@ configure-options =
   -DCMAKE_BUILD_TYPE=Release
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_PUBSUB_MONITORING=ON
+  -DUA_ENABLE_PUBSUB_ETH_UADP=ON
   -DUA_ENABLE_SUBSCRIPTIONS=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
 post-install =
   cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
 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

@@ -11,32 +11,6 @@ parts = osie-coupler
 # 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