diff --git a/recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.2.0.bb b/recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.2.1.bb similarity index 97% rename from recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.2.0.bb rename to recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.2.1.bb index 92997f95b..583789b5e 100644 --- a/recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.2.0.bb +++ b/recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.2.1.bb @@ -19,11 +19,10 @@ DEPENDS = "\ SRC_URI = "\ git://github.com/aws/aws-iot-fleetwise-edge.git;protocol=https;branch=main \ file://001-remove-cxx-standard.patch \ - file://002-fleetwise-config-test.patch \ file://run-ptest \ " -SRCREV = "4c74c61a5001037f3979f6dbe74a72abd2ec4e76" +SRCREV = "9c4d4be1857b7c5fd3687d7534c1b42f83f7354d" S = "${WORKDIR}/git" diff --git a/recipes-iot/aws-iot-fleetwise/files/001-remove-cxx-standard.patch b/recipes-iot/aws-iot-fleetwise/files/001-remove-cxx-standard.patch index 00c0fed69..da934580a 100644 --- a/recipes-iot/aws-iot-fleetwise/files/001-remove-cxx-standard.patch +++ b/recipes-iot/aws-iot-fleetwise/files/001-remove-cxx-standard.patch @@ -1,4 +1,4 @@ -From e761fd850f0004ad99c7ad69027c6c48f8dcf2ac Mon Sep 17 00:00:00 2001 +From 703bb617fffe17a1bc20cf327ada9947968d79ca Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Tue, 9 Jan 2024 15:01:35 +0000 Subject: [PATCH] aws-iot-fleetwise-edge: remove setting of cxx-standard @@ -9,12 +9,12 @@ Upstream-Status: Submitted [author] 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 100989c..23d0962 100644 +index 4c49025..8c4ef59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,6 @@ cmake_minimum_required(VERSION 3.10.2) - project(iotfleetwise VERSION 1.2.0) + project(iotfleetwise VERSION 1.2.1) -# FWE uses C++14 for compatibility reasons with Automotive middlewares (Adaptive AUTOSAR, ROS2) -# Note: When built with FWE_FEATURE_ROS2, colcon will override these settings diff --git a/recipes-iot/aws-iot-fleetwise/files/002-fleetwise-config-test.patch b/recipes-iot/aws-iot-fleetwise/files/002-fleetwise-config-test.patch deleted file mode 100644 index 893b756c6..000000000 --- a/recipes-iot/aws-iot-fleetwise/files/002-fleetwise-config-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted [author] - -Index: git/test/unit/IoTFleetWiseConfigTest.cpp -=================================================================== ---- git.orig/test/unit/IoTFleetWiseConfigTest.cpp -+++ git/test/unit/IoTFleetWiseConfigTest.cpp -@@ -6,6 +6,7 @@ - #include "Testing.h" - #include - #include -+#include - #include - #include - #include -Index: git/test/unit/RawDataManagerTest.cpp -=================================================================== ---- git.orig/test/unit/RawDataManagerTest.cpp -+++ git/test/unit/RawDataManagerTest.cpp -@@ -7,6 +7,7 @@ - #include "TimeTypes.h" - #include - #include -+#include - #include - #include - #include -Index: git/test/unit/ROS2DataSourceTest.cpp -=================================================================== ---- git.orig/test/unit/ROS2DataSourceTest.cpp -+++ git/test/unit/ROS2DataSourceTest.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include