scarthgap-next: sync 14 recipes with master versions

rpcme · rpcme · commit 82ea4974f109 · 2026-04-14T19:42:56.000Z
Upgrade 14 recipes to match master branch versions:

- amazon-cloudwatch-agent: 1.300054.0 → 1.300060.0
- amazon-kvs-webrtc-sdk: 1.15.0 → 1.18.0
- amazon-ssm-agent: 3.3.1957.0 → 3.3.4177.0
- aws-c-mqtt: 0.15.0 → 0.15.2
- aws-cli: 1.44.59 → 1.44.79
- aws-cli-v2: 2.34.10 → 2.34.30
- aws-crt-cpp: 0.36.1 → 0.38.5
- aws-lc: 1.68.0+1.71.0 → 1.72.0
- aws-sdk-cpp: 1.11.754 → 1.11.790 (tinyxml2 patch dropped - upstreamed)
- python3-boto3: 1.42.51 → 1.42.89
- python3-botocore: 1.42.51 → 1.42.89
- python3-ruamel-yaml-clib: 0.2.12 → 0.2.15
- s2n: 1.7.0 → 1.7.2 (with ptest fix)

NOT included (requires separate rework):
- aws-greengrass-component-sdk: 0.4.0 → 1.0.1 (scarthgap has different
  patch set for older Rust toolchain - needs dedicated effort)

Signed-off-by: Richard Elberger &lt;elberger@amazon.com&gt;
diff --git a/.github/workflows/build-test-recipe.yml b/.github/workflows/build-test-recipe.yml
@@ -193,6 +193,15 @@ jobs:
           done
           export RECIPES="$FILTERED_RECIPES"
 
+          # Handle mutually exclusive recipes
+          # aws-cli v1 and v2 both install /usr/bin/aws (see #15435)
+          # aws-cli-v2 on scarthgap needs python3-urllib3-1.x which conflicts
+          # with python3-urllib3 2.x pulled by boto3/botocore/s3transfer
+          if echo "$RECIPES" | grep -qw "aws-cli-v2"; then
+            RECIPES=$(echo "$RECIPES" | tr ' ' '\n' | grep -v '^aws-cli$' | grep -v '^aws-cli-v2$' | tr '\n' ' ')
+            echo "Excluded aws-cli and aws-cli-v2 from ptest (file clash + urllib3 1.x/2.x conflict)"
+          fi
+
           echo RECIPES to build, test: "$RECIPES"
           echo "recipes=$RECIPES" >> $GITHUB_OUTPUT
       - name: Run build
diff --git a/recipes-devtools/python/python3-boto3_1.42.89.bb b/recipes-devtools/python/python3-boto3_1.42.89.bb
@@ -12,7 +12,7 @@ SRC_URI = "\
     file://python_dependency_test.py \
     "
 
-SRCREV = "bf41321e5f7500eef5427df0aab2e8c39e581b5f"
+SRCREV = "54a9dc1891d5e38110e5f77fc45fbc7e2e112bfe"
 S = "${WORKDIR}/git"
 
 inherit setuptools3 ptest
diff --git a/recipes-devtools/python/python3-botocore_1.42.89.bb b/recipes-devtools/python/python3-botocore_1.42.89.bb
@@ -12,7 +12,7 @@ SRC_URI = "\
     file://python_dependency_test.py \
     "
 
-SRCREV = "9d9af7311c4d4bc65e938c9f189e77f2b8a6ac64"
+SRCREV = "9b76a624ae6311605797bc0b4cdc7c3e064c1593"
 S = "${WORKDIR}/git"
 
 inherit setuptools3 ptest
diff --git a/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.18.0.bb b/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.18.0.bb
@@ -26,7 +26,7 @@ SRC_URI = "\
     file://ptest_result.py \
 "
 
-SRCREV = "057047ed6efe9320e7056f4f4b708b9b8934d51d"
+SRCREV = "ef4649473b2d1dc25215eca9d21cda6c802c06f2"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-sdk/aws-c-mqtt/aws-c-mqtt_0.15.2.bb b/recipes-sdk/aws-c-mqtt/aws-c-mqtt_0.15.2.bb
@@ -23,7 +23,7 @@ SRC_URI = "\
     file://run-ptest \
     "
 
-SRCREV = "dc2fe7be81070f7c5095ad386d9a23c180a4276b"
+SRCREV = "3c2ceee52b66db42228053a4fb55210c8f8433a0"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-sdk/aws-crt-cpp/aws-crt-cpp/001-shared-static-crt-libs.patch b/recipes-sdk/aws-crt-cpp/aws-crt-cpp/001-shared-static-crt-libs.patch
@@ -1,4 +1,4 @@
-From f023fcdde0dd96697cfb1a4840fc09f0244463ce Mon Sep 17 00:00:00 2001
+From 1c881640ef222f0f85e9f16d96862f155a94f264 Mon Sep 17 00:00:00 2001
 From: Thomas Roos <throos@amazon.de>
 Date: Tue, 20 May 2025 08:45:29 +0000
 Subject: [PATCH] aws-crt-cpp: change to build-deps as default
diff --git a/recipes-sdk/aws-crt-cpp/aws-crt-cpp/002-enable-tests-with-crosscompiling.patch b/recipes-sdk/aws-crt-cpp/aws-crt-cpp/002-enable-tests-with-crosscompiling.patch
@@ -1,19 +1,25 @@
-This enable the tests even when crosscompiling.
+From 2a28428bb2fbbf97d2324a66d63058510aef0f35 Mon Sep 17 00:00:00 2001
+From: Thomas Roos <throos@amazon.de>
+Date: Mon, 29 Sep 2025 12:51:03 +0000
+Subject: [PATCH] This enable the tests even when crosscompiling.
 
 Upstream-Status: Inappropriate [oe specific]
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
 
-Index: aws-crt-cpp-0.34.4/CMakeLists.txt
-===================================================================
---- aws-crt-cpp-0.34.4.orig/CMakeLists.txt
-+++ aws-crt-cpp-0.34.4/CMakeLists.txt
-@@ -412,7 +412,6 @@ install(FILES "${GENERATED_ROOT_DIR}/${P
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83bc66b..6862d8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -412,7 +412,6 @@ install(FILES "${GENERATED_ROOT_DIR}/${PROJECT_NAME}-config-version.cmake"
      DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
      COMPONENT Development)
-
+ 
 -if(NOT CMAKE_CROSSCOMPILING)
      if(BUILD_TESTING)
          add_subdirectory(tests)
-
+ 
 @@ -422,4 +421,3 @@ if(NOT CMAKE_CROSSCOMPILING)
              add_subdirectory(bin/mqtt5_canary)
          endif()
diff --git a/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.38.5.bb b/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.38.5.bb
@@ -28,7 +28,7 @@ SRC_URI = "\
     file://002-enable-tests-with-crosscompiling.patch \
     "
 
-SRCREV = "8923e174f20c39c647f25abb3e16d1418558ec55"
+SRCREV = "bca5d26fd37b0d39ba8fbffb3058560f0d4d193f"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.790.bb b/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.790.bb
@@ -19,10 +19,9 @@ SRC_URI = "\
     git://github.com/aws/aws-sdk-cpp.git;protocol=https;branch=main \
     file://run-ptest \
     file://ptest_result.py \
-    file://0001-tinyxml2-fix-null-format-string.patch \
     "
 
-SRCREV = "0cb8a3310a9783850b5faee77d7088c95184044e"
+SRCREV = "cad95407f1ec292e6b65fd5018edda49c680dab3"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-sdk/aws-sdk-cpp/files/0001-tinyxml2-fix-null-format-string.patch b/recipes-sdk/aws-sdk-cpp/files/0001-tinyxml2-fix-null-format-string.patch
diff --git a/recipes-sdk/s2n/s2n/run-ptest b/recipes-sdk/s2n/s2n/run-ptest
@@ -27,7 +27,6 @@ TESTS="\
 ./s2n_client_supported_groups_extension_test \
 ./s2n_connection_context_test \
 ./s2n_connection_preferences_test \
-./s2n_drbg_test \
 ./s2n_early_data_io_api_test \
 ./s2n_ecc_point_format_extension_test \
 ./s2n_ecc_preferences_test \
@@ -38,7 +37,6 @@ TESTS="\
 ./s2n_extension_list_process_test \
 ./s2n_extension_list_send_test \
 ./s2n_extension_type_lists_test \
-./s2n_fork_generation_number_test \
 ./s2n_fragmentation_coalescing_test \
 ./s2n_handshake_errno_test \
 ./s2n_handshake_hashes_test \
@@ -162,15 +160,13 @@ TESTS="\
 ./s2n_extension_type_test \
 ./s2n_handshake_partial_test \
 ./s2n_handshake_test \
-./s2n_mem_allocator_test \
 ./s2n_mem_test \
 ./s2n_mem_usage_test \
 ./s2n_mutual_auth_test \
 ./s2n_optional_client_auth_test \
 ./s2n_pem_rsa_dhe_test \
 ./s2n_pem_test \
 ./s2n_pkey_test \
-./s2n_post_handshake_recv_test \
 ./s2n_recv_test \
 ./s2n_release_non_empty_buffers_test \
 ./s2n_renegotiate_io_test \
diff --git a/recipes-sdk/s2n/s2n_1.7.2.bb b/recipes-sdk/s2n/s2n_1.7.2.bb
@@ -17,7 +17,7 @@ SRC_URI = "\
     file://run-ptest \
     "
 
-SRCREV = "f5e5e83031be60691f22442373fb8371274fcd56"
+SRCREV = "a71ea1f9764ee9ae91b47c34faa0447c4fe11d0a"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-support/aws-cli-v2/aws-cli-v2_2.34.30.bb b/recipes-support/aws-cli-v2/aws-cli-v2_2.34.30.bb
@@ -23,7 +23,7 @@ DEPENDS += "\
     python3-ruamel-yaml-clib-native \
     python3-ruamel-yaml-native \
     python3-s3transfer \
-    python3-urllib3-1.x-native \
+    python3-urllib3-native \
     python3-zipp-native \
 "
 
@@ -32,7 +32,7 @@ SRC_URI = "\
     file://run-ptest \
 "
 
-SRCREV = "7309c49d8d10a8232031c4baa6a020c505f2f06b"
+SRCREV = "7f985d7ae64be6d278fba26fc44773150b32f561"
 
 S = "${WORKDIR}/git"
 
@@ -70,7 +70,7 @@ RDEPENDS:${PN} += "\
     python3-ruamel-yaml \
     python3-sqlite3 \
     python3-unixadmin \
-    python3-urllib3-1.x \
+    python3-urllib3 \
     python3-zipp \
 "
 
diff --git a/recipes-support/aws-cli/aws-cli_1.44.79.bb b/recipes-support/aws-cli/aws-cli_1.44.79.bb
@@ -9,7 +9,7 @@ SRC_URI = "\
     file://run-ptest \
 "
 
-SRCREV = "395a8a986fab29ea48db3b83e905138c83c5c4e6"
+SRCREV = "7e8999e0ad0c6c0b89a25da5997eb10ae32e2de2"
 
 # version 2.x has got library link issues - so stick to version 1.x for now
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>1\.\d+(\.\d+)+)"

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ SRC_URI = "\`
`12`	`12`	`file://python_dependency_test.py \`
`13`	`13`	`"`
`14`	`14`
`15`		`-SRCREV = "bf41321e5f7500eef5427df0aab2e8c39e581b5f"`
	`15`	`+SRCREV = "54a9dc1891d5e38110e5f77fc45fbc7e2e112bfe"`
`16`	`16`	`S = "${WORKDIR}/git"`
`17`	`17`
`18`	`18`	`inherit setuptools3 ptest`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ SRC_URI = "\`
`26`	`26`	`file://ptest_result.py \`
`27`	`27`	`"`
`28`	`28`
`29`		`-SRCREV = "057047ed6efe9320e7056f4f4b708b9b8934d51d"`
	`29`	`+SRCREV = "ef4649473b2d1dc25215eca9d21cda6c802c06f2"`
`30`	`30`
`31`	`31`	`S = "${WORKDIR}/git"`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ SRC_URI = "\`
`23`	`23`	`file://run-ptest \`
`24`	`24`	`"`
`25`	`25`
`26`		`-SRCREV = "dc2fe7be81070f7c5095ad386d9a23c180a4276b"`
	`26`	`+SRCREV = "3c2ceee52b66db42228053a4fb55210c8f8433a0"`
`27`	`27`
`28`	`28`	`S = "${WORKDIR}/git"`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From f023fcdde0dd96697cfb1a4840fc09f0244463ce Mon Sep 17 00:00:00 2001`
	`1`	`+From 1c881640ef222f0f85e9f16d96862f155a94f264 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Thomas Roos <throos@amazon.de>`
`3`	`3`	`Date: Tue, 20 May 2025 08:45:29 +0000`
`4`	`4`	`Subject: [PATCH] aws-crt-cpp: change to build-deps as default`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ SRC_URI = "\`
`28`	`28`	`file://002-enable-tests-with-crosscompiling.patch \`
`29`	`29`	`"`
`30`	`30`
`31`		`-SRCREV = "8923e174f20c39c647f25abb3e16d1418558ec55"`
	`31`	`+SRCREV = "bca5d26fd37b0d39ba8fbffb3058560f0d4d193f"`
`32`	`32`
`33`	`33`	`S = "${WORKDIR}/git"`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,9 @@ SRC_URI = "\`
`19`	`19`	`git://github.com/aws/aws-sdk-cpp.git;protocol=https;branch=main \`
`20`	`20`	`file://run-ptest \`
`21`	`21`	`file://ptest_result.py \`
`22`		`- file://0001-tinyxml2-fix-null-format-string.patch \`
`23`	`22`	`"`
`24`	`23`
`25`		`-SRCREV = "0cb8a3310a9783850b5faee77d7088c95184044e"`
	`24`	`+SRCREV = "cad95407f1ec292e6b65fd5018edda49c680dab3"`
`26`	`25`
`27`	`26`	`S = "${WORKDIR}/git"`
`28`	`27`