From 97f3f521a3a17763e43c5cb18dec9f88fb061beb Mon Sep 17 00:00:00 2001 From: Jari Nippula Date: Fri, 10 May 2024 13:05:30 +0300 Subject: [PATCH] Add fw updater submodules New submodules: src/modules/px4_fw_update_client src/lib/secure_udp Update clone_public to skip new private modules --- .gitmodules | 6 ++++++ clone_public.sh | 2 ++ src/lib/CMakeLists.txt | 3 +++ src/lib/secure_udp | 1 + src/modules/px4_fw_update_client | 1 + 5 files changed, 13 insertions(+) create mode 160000 src/lib/secure_udp create mode 160000 src/modules/px4_fw_update_client diff --git a/.gitmodules b/.gitmodules index 2f789aaeff5e..525328b71596 100644 --- a/.gitmodules +++ b/.gitmodules @@ -94,3 +94,9 @@ [submodule "Tools/simulation/gz/plugins/px4-gzsim-plugins"] path = Tools/simulation/gz/plugins/px4-gzsim-plugins url = https://github.com/tiiuae/px4-gzsim-plugins.git +[submodule "src/modules/px4_fw_update_client"] + path = src/modules/px4_fw_update_client + url = git@github.com:tiiuae/px4-fw-update-client.git +[submodule "src/lib/secure_udp"] + path = src/lib/secure_udp + url = git@github.com:tiiuae/px4-lib-secure-udp.git diff --git a/clone_public.sh b/clone_public.sh index c5ed7d21e599..447382303a97 100755 --- a/clone_public.sh +++ b/clone_public.sh @@ -9,6 +9,8 @@ do [[ "${repo}" == *pfsoc_crypto ]] || \ [[ "${repo}" == *pfsoc_keystore ]] || \ [[ "${repo}" == *pf_crypto ]] || \ + [[ "${repo}" == *px4_fw_update_client ]] || \ + [[ "${repo}" == *secure_udp ]] || \ [[ "${repo}" == *process ]] && continue git submodule update --init --recursive "${repo}" done <<< "$(git submodule status | awk '{print $2}')" diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 479b0fa141f2..58473f866634 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -75,3 +75,6 @@ add_subdirectory(version EXCLUDE_FROM_ALL) add_subdirectory(weather_vane EXCLUDE_FROM_ALL) add_subdirectory(wind_estimator EXCLUDE_FROM_ALL) add_subdirectory(world_magnetic_model EXCLUDE_FROM_ALL) +if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/secure_udp/CMakeLists.txt") + add_subdirectory(secure_udp EXCLUDE_FROM_ALL) +endif() diff --git a/src/lib/secure_udp b/src/lib/secure_udp new file mode 160000 index 000000000000..6a12f0e3a15f --- /dev/null +++ b/src/lib/secure_udp @@ -0,0 +1 @@ +Subproject commit 6a12f0e3a15f64cfd8cfafaf2441b20ebed0456b diff --git a/src/modules/px4_fw_update_client b/src/modules/px4_fw_update_client new file mode 160000 index 000000000000..c7cc4248a74b --- /dev/null +++ b/src/modules/px4_fw_update_client @@ -0,0 +1 @@ +Subproject commit c7cc4248a74b27b7007bf79a7f68e60e3ec9f02f