From cb75a1e0275b0b2a7e14770480c7f74c3037222d Mon Sep 17 00:00:00 2001 From: Amin Ben Romdhane Date: Thu, 10 Apr 2025 23:50:54 +0200 Subject: [PATCH] Register wifidmd as unified daemon --- gitlab-ci/micro_service.conf | 2 +- gitlab-ci/shared.sh | 6 +++--- test/files/etc/bbfdm/services/wifidmd.json | 2 +- tools/tools_input.json | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gitlab-ci/micro_service.conf b/gitlab-ci/micro_service.conf index 24511b18..75b79c73 100644 --- a/gitlab-ci/micro_service.conf +++ b/gitlab-ci/micro_service.conf @@ -8,7 +8,7 @@ command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-netmngr [program:wifidmd] priority=7 -command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-wifidmd-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/dm-service -m wifidmd" +command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-wifidmd-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/wifidmd" [program:core] priority=8 diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh index 56a15b75..5f69ec49 100755 --- a/gitlab-ci/shared.sh +++ b/gitlab-ci/shared.sh @@ -98,10 +98,10 @@ function install_wifidmd_as_micro_service() { [ -d "/opt/dev/wifidmd" ] && return 0 - exec_cmd git clone -b devel https://dev.iopsys.eu/bbf/wifidmd.git /opt/dev/wifidmd + exec_cmd git clone https://dev.iopsys.eu/bbf/wifidmd.git /opt/dev/wifidmd - exec_cmd make -C /opt/dev/wifidmd/src/ clean && make -C /opt/dev/wifidmd/src/ CFLAGS="-D'BBF_VENDOR_PREFIX=\"X_IOWRT_EU_\"'" WIFIDMD_WIFI_DATAELEMENTS='y' - install_ms /opt/dev/wifidmd/src/libwifi.so wifidmd + exec_cmd make -C /opt/dev/wifidmd/src/ clean && make -C /opt/dev/wifidmd/src/ WIFIDMD_ENABLE_WIFI_DATAELEMENTS='y' + exec_cmd cp -f /opt/dev/wifidmd/src/wifidmd /usr/sbin/ } function install_libeasy() diff --git a/test/files/etc/bbfdm/services/wifidmd.json b/test/files/etc/bbfdm/services/wifidmd.json index 83e1f9c3..329d60b2 100644 --- a/test/files/etc/bbfdm/services/wifidmd.json +++ b/test/files/etc/bbfdm/services/wifidmd.json @@ -2,7 +2,7 @@ "daemon": { "enable": "1", "service_name": "wifidmd", - "unified_daemon": false, + "unified_daemon": true, "services": [ { "parent_dm": "Device.", diff --git a/tools/tools_input.json b/tools/tools_input.json index eb7f3549..ad539ff1 100644 --- a/tools/tools_input.json +++ b/tools/tools_input.json @@ -358,10 +358,12 @@ "proto": "git", "version": "devel", "dm_files": [ + "src/wifidmd.c", "src/wifi.c", "src/dataelements.c" ], "extra_dependencies": [ + "-DWIFIDMD_ENABLE_WIFI_DATAELEMENTS", "-lm" ] },