diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25196d82..d3213ad7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,8 @@ run_tools_test: allow_failure: false script: - "./gitlab-ci/pipeline_setup.sh" + - "./gitlab-ci/install-unified-dependencies.sh" + - "./gitlab-ci/setup.sh ms" - "./gitlab-ci/tools-test.sh" - "./gitlab-ci/generate_supported_dm.sh" diff --git a/gitlab-ci/install-unified-dependencies.sh b/gitlab-ci/install-unified-dependencies.sh new file mode 100755 index 00000000..ad41e0be --- /dev/null +++ b/gitlab-ci/install-unified-dependencies.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +echo "install unified daemon dependencies" + +source ./gitlab-ci/shared.sh + +dst=$(pwd) + +# libeasy for ethmngr +cd /opt/dev +rm -fr libeasy +mkdir -p /usr/include/easy +git clone -b devel https://dev.iopsys.eu/iopsys/libeasy.git +cd libeasy +make +cp -a libeasy*.so* /usr/lib +cp -a *.h /usr/include/easy/ + +# libethernet for ethmngr +cd /opt/dev +rm -fr libethernet +git clone -b devel https://dev.iopsys.eu/iopsys/libethernet.git +cd libethernet +make PLATFORM=TEST +cp ethernet.h /usr/include +cp -a libethernet*.so* /usr/lib +sudo ldconfig + +cd ${dst} +pwd diff --git a/tools/tools_input.json b/tools/tools_input.json index af169535..f7411e6e 100644 --- a/tools/tools_input.json +++ b/tools/tools_input.json @@ -260,26 +260,22 @@ ] }, { - "repo": "https://dev.iopsys.eu/hal/ethmngr.git", - "proto": "git", - "version": "devel", - "dm_info_file": "bbf_plugin/datamodel_description.json", - "dm_files": [ - "bbf_plugin/ethernet.c", - "bbf_plugin/dmlayer.c" - ] - }, - { - "repo": "https://dev.iopsys.eu/hal/ethmngr.git", - "proto": "git", - "version": "devel", - "dm_files": [ - "bbf_plugin/vendor_ethernet.c", - "bbf_plugin/dmlayer.c" - ], - "extra_dependencies": [ - "-DTR181_VENDOR_EXTENSIONS_MACVLAN" - ] + "repo": "https://dev.iopsys.eu/hal/ethmngr.git", + "proto": "git", + "version": "devel", + "dm_info_file": "src/datamodel_description.json", + "extra_dependencies": [ + "-DETHMNGR_MACVLAN_EXTENSION", + "-leasy", + "-lethernet" + ], + "dm_files": [ + "src/ethmngr.c", + "src/ethernet.c", + "src/dmlayer.c", + "src/helper.c", + "src/vendor_ethernet.c" + ] }, { "repo": "https://dev.iopsys.eu/system/usbmngr.git",