Merge pull request #80 from tiiuae/rel_4_2

Rel 4 2

.gitmodules

@@ -78,7 +78,10 @@
 	url = https://github.com/tiiuae/fog_gazebo_resources.git
 [submodule "mission-data-recorder"]
 	path = mission-data-recorder
-	url = git@github.com:tiiuae/mission-data-recorder.git
+	url = https://github.com/tiiuae/mission-data-recorder.git
 [submodule "ros2_ws/src/mocap_pose"]
 	path = ros2_ws/src/mocap_pose
-	url = [email protected]:tiiuae/mocap_pose.git
+	url = https://github.com/tiiuae/mocap_pose.git
+[submodule "wpa"]
+	path = wpa
+	url = https://github.com/tiiuae/wpa.git

packaging/debian/control

@@ -5,24 +5,25 @@ Architecture: amd64
 Description: FOG SW meta package.
 Depends: agent-protocol-splitter (= 1.0.0-13~git20210419.ed16b42),
   communication-link (= 2.0.0-34~git20210714.48caad1),
-  fog-sw-systemd-services (= 1.0.0-40~git20210716.4341d9b),
+  fog-sw-systemd-services (= 1.0.0-42~git20210810.a41d199),
   libsurvive (= 1.0.0-3~git20210421.b966a6c),
   mavlink-router (= 1.0.0-6~git20210419.14c1368),
   mavsdk (= 0.34.0),
   mission-data-recorder (= 1.0.0-29~git20210713.3f87b16),
   mission-engine (= 2.0.0-16~git20210701.545ea2f),
   ros-foxy-depthai-ctrl (= 0.5.6-34~git20210624.1f5590e),
   ros-foxy-indoor-pos (= 1.0.0-12~git20210426.81d1987),
-  ros-foxy-mesh-com (= 0.3.3-42~git20210715.70a346d),
+  ros-foxy-mesh-com (= 0.3.4-51~git20210804.73acdb9),
   ros-foxy-mocap-pose (= 0.0.4-3~git20210617.713e012),
   ros-foxy-px4-msgs (= 2.0.1-5~git20210419.b4c4a12),
   ros-foxy-px4-ros-com (= 0.1.0-20~git20210708.a1147fa),
   rtl8812au-kmod (= 1.0.0-2~git20210614.dc56cff),
   ros-foxy-control-interface (= 0.0.3-17~git20210709.22ce14e),
   ros-foxy-fog-msgs (= 0.0.3-6~git20210621.90040f9),
-  ros-foxy-navigation (= 0.0.3-16~git20210709.f083eee),
+  ros-foxy-navigation (= 0.0.3-22~git20210810.97dc304),
   ros-foxy-octomap-server2 (= 0.0.1-6~git20210617.22fd119),
-  ros-foxy-rplidar-ros2 (= 1.10.0-10~git20210615.cbb80ba)
+  ros-foxy-rplidar-ros2 (= 1.10.0-10~git20210615.cbb80ba),
+  wpasupplicant (= 2.9.0-20-6~git20210701.43d8971)
 Conflicts: ros-foxy-px4-mavlink-ctrl
-Recomends: fogsw-configs (= 1.0.0-30~git20210716.63a4726),
+Recomends: fogsw-configs (= 1.0.0-40~git20210813.9ff7aa9),
   px4-firmware-updater (= 1.11.0-1.0.8-2-g03d44137d0)

packaging/package.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 get_version() {
-    version=4.1~$(git log --date=format:%Y%m%d --pretty=git%cd.%h -n 1)
+    version=4.2~$(git log --date=format:%Y%m%d --pretty=git%cd.%h -n 1)
     echo ${version}
 }
 

packaging/package_all.sh

@@ -60,30 +60,37 @@ function _make_ros_deb() {
 
 # Non-ROS packages
 pushd agent_protocol_splitter
-./package.sh
+  ./package.sh
 popd
 mv ./agent-protocol-splitter*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
 pushd fogsw_configs
-./package.sh
+  ./package.sh
 popd
 mv ./fogsw-configs*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
 pushd mavlink-router
-./package.sh
+  ./package.sh
 popd
 mv ./mavlink-router*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
 pushd mission-data-recorder
-./package.sh
+  ./package.sh
 popd
 mv ../mission-data-recorder/mission-data-recorder*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
 pushd systemd
-./package.sh
+  ./package.sh
 popd
 mv ./fog-sw-systemd*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
+# TODO: fix the package_wpa.sh under wpa repo in order to work in local builds.
+# Local build does not have build directory so package_wpa.sh fails.
+#pushd wpasupplicant
+#  ./package.sh
+#popd
+#mv ./wpasupplicant*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
+
 # Not needed yet.
 #pushd ../fogsw_secure_os
 #./package.sh
@@ -118,12 +125,12 @@ pushd ../ros2_ws/src/fog_msgs
 popd
 
 pushd communication_link
-./package.sh
+  ./package.sh
 popd
 mv ../ros2_ws/src/communication_link/communication-link*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
 pushd mission-engine
-./package.sh
+  ./package.sh
 popd
 mv ../ros2_ws/src/communication_link/mission-engine*.deb ${SCRIPT_PATH}/${DEBS_OUTPUT_DIR}/
 
@@ -140,10 +147,6 @@ pushd ../ros2_ws/src/mesh_com/
   echo "Done."
 popd
 
-pushd ../ros2_ws/src/px4_mavlink_ctrl
-  _make_ros_deb "px4-mavlink-ctrl"
-popd
-
 pushd ../ros2_ws/src/depthai_ctrl
   _make_ros_deb "depthai-ctrl"
 popd

packaging/wpasupplicant/package.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+pushd ../../wpa > /dev/null
+params="-m $(realpath .) -c $(git rev-parse HEAD) -g $(git log --date=format:%Y%m%d --pretty=~dirty~git%cd.%h -n 1) -b 0"
+./package_wpa.sh $params
+popd
+
+exit 0