Skip to content

Commit

Permalink
aws-iot-fleetwise-edge: upgrade 1.1.1 -> 1.1.2
Browse files Browse the repository at this point in the history
remove upstreamed, obsolete patch: boost_filesystem_extension.patch

(cherry picked from commit e949fb2)
  • Loading branch information
aws-iot-embedded-linux-ci authored and github-actions[bot] committed Oct 31, 2024
1 parent 708cc09 commit 54519d0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ DEPENDS = "\
SRC_URI = "\
git://github.com/aws/aws-iot-fleetwise-edge.git;protocol=https;branch=main \
file://remove-cxx-standard.patch \
file://boost_filesystem_extension.patch \
file://run-ptest \
"

SRCREV = "f4e85953bac2f99ed428ad69379e6c788ca10f78"
SRCREV = "aa07b246f089b1252e83c40eb2af1e43c3a99967"

S = "${WORKDIR}/git"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
Index: git/src/CacheAndPersist.cpp
From 1d32ae73e167912a016a69ec71a9d998cf615629 Mon Sep 17 00:00:00 2001
From: Thomas Roos <[email protected]>
Date: Mon, 17 Jun 2024 20:49:03 +0000
Subject: [PATCH] aws-iot-fleetwise-edge: Fix boost filesystem extension

Upstream-Status: Submitted [https://github.com/aws/aws-iot-fleetwise-edge/issues/90]
---
src/CacheAndPersist.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

===================================================================
--- git.orig/src/CacheAndPersist.cpp
+++ git/src/CacheAndPersist.cpp
diff --git a/src/CacheAndPersist.cpp b/src/CacheAndPersist.cpp
index a51320a..b55129a 100644
--- a/src/CacheAndPersist.cpp
+++ b/src/CacheAndPersist.cpp
@@ -517,7 +517,7 @@ CacheAndPersist::cleanupPersistedData()
// TODO: do not skip ion files but add the metadata for them so they don't get deleted
// coverity[misra_cpp_2008_rule_14_8_2_violation] - boost filesystem path header defines both
Expand Down
5 changes: 2 additions & 3 deletions recipes-iot/aws-iot-fleetwise/files/remove-cxx-standard.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
From 75e42cb04a6798322d7601004254ae2b42271a10 Mon Sep 17 00:00:00 2001
From be982a8f5ac9a289c955b1442b4ae582f81254bf Mon Sep 17 00:00:00 2001
From: Thomas Roos <[email protected]>
Date: Tue, 9 Jan 2024 15:01:35 +0000
Subject: [PATCH] aws-iot-fleetwise-edge: remove setting of cxx-standard

Upstream-Status: Submitted [author]

---
CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
Expand All @@ -15,7 +14,7 @@ index 1f6c041..8b74eae 100644
+++ b/CMakeLists.txt
@@ -4,11 +4,6 @@ cmake_minimum_required(VERSION 3.10.2)

project(iotfleetwise VERSION 1.1.1)
project(iotfleetwise VERSION 1.1.2)

-# 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
Expand Down

0 comments on commit 54519d0

Please sign in to comment.