From 2bffa855def4c541e4f0be5aaa8377fbb315c045 Mon Sep 17 00:00:00 2001
From: meta-aws-maintainer <meta-aws-maintainer@users.noreply.github.com>
Date: Fri, 3 Jul 2026 02:30:50 +0000
Subject: [PATCH]  BACKPORT-CONFLICT

---
 .../python/python3-botocore_1.43.19.bb        |  4 ++
 .../python/python3-botocore_1.43.40.bb        | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 recipes-devtools/python/python3-botocore_1.43.40.bb

diff --git a/recipes-devtools/python/python3-botocore_1.43.19.bb b/recipes-devtools/python/python3-botocore_1.43.19.bb
index a45b5c7f57..44b378c320 100644
--- a/recipes-devtools/python/python3-botocore_1.43.19.bb
+++ b/recipes-devtools/python/python3-botocore_1.43.19.bb
@@ -12,7 +12,11 @@ SRC_URI = "\
     file://python_dependency_test.py \
     "
 
+<<<<<<<< HEAD:recipes-devtools/python/python3-botocore_1.43.19.bb
 SRCREV = "8fdb47d1636e7f7ae0cacdd4584ffd339f88c546"
+========
+SRCREV = "c1894c100916579eef4df96e2b330973b9d715f0"
+>>>>>>>> 8b92e2695 (python3-botocore: upgrade 1.43.39 -> 1.43.40):recipes-devtools/python/python3-botocore_1.43.40.bb
 
 inherit setuptools3 ptest
 
diff --git a/recipes-devtools/python/python3-botocore_1.43.40.bb b/recipes-devtools/python/python3-botocore_1.43.40.bb
new file mode 100644
index 0000000000..44b378c320
--- /dev/null
+++ b/recipes-devtools/python/python3-botocore_1.43.40.bb
@@ -0,0 +1,41 @@
+SUMMARY = "python3 botocore"
+DESCRIPTION = "The low-level, core functionality of boto3 and the AWS CLI."
+HOMEPAGE = "https://github.com/boto/botocore"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/../files:"
+
+SRC_URI = "\
+    git://github.com/boto/botocore.git;protocol=https;branch=master \
+    file://run-ptest \
+    file://python_dependency_test.py \
+    "
+
+<<<<<<<< HEAD:recipes-devtools/python/python3-botocore_1.43.19.bb
+SRCREV = "8fdb47d1636e7f7ae0cacdd4584ffd339f88c546"
+========
+SRCREV = "c1894c100916579eef4df96e2b330973b9d715f0"
+>>>>>>>> 8b92e2695 (python3-botocore: upgrade 1.43.39 -> 1.43.40):recipes-devtools/python/python3-botocore_1.43.40.bb
+
+inherit setuptools3 ptest
+
+RDEPENDS:${PN} += "\
+    python3-dateutil \
+    python3-jmespath \
+    python3-logging \
+    python3-html \
+    "
+
+RDEPENDS:${PN}-ptest += "\
+        python3 \
+        python3-pytest \
+        python3-urllib3 \
+        ${PYTHON_PN}-setuptools \
+"
+
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+        install -m 0755 ${UNPACKDIR}/python_dependency_test.py ${D}${PTEST_PATH}/
+}