From 2770cb96dd8c193cfc3dbbaddc44594c3d4367e3 Mon Sep 17 00:00:00 2001
From: meta-aws-maintainer <meta-aws-maintainer@users.noreply.github.com>
Date: Thu, 2 Jul 2026 02:09:03 +0000
Subject: [PATCH]  BACKPORT-CONFLICT

---
 .../aws-cli-v2/aws-cli-v2_2.34.33.bb          |   4 +
 .../aws-cli-v2/aws-cli-v2_2.35.14.bb          | 105 ++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 recipes-support/aws-cli-v2/aws-cli-v2_2.35.14.bb

diff --git a/recipes-support/aws-cli-v2/aws-cli-v2_2.34.33.bb b/recipes-support/aws-cli-v2/aws-cli-v2_2.34.33.bb
index 7ea189ac32..4a48936aa7 100644
--- a/recipes-support/aws-cli-v2/aws-cli-v2_2.34.33.bb
+++ b/recipes-support/aws-cli-v2/aws-cli-v2_2.34.33.bb
@@ -32,9 +32,13 @@ SRC_URI = "\
     file://run-ptest \
 "
 
+<<<<<<<< HEAD:recipes-support/aws-cli-v2/aws-cli-v2_2.34.33.bb
 SRCREV = "1cc7be1dd47d8367a92f2563963c1a03304a1225"
 
 S = "${WORKDIR}/git"
+========
+SRCREV = "6378d3744183c1a2046330c325d4bd8caa7e419d"
+>>>>>>>> 2492a70aa (aws-cli-v2: upgrade 2.35.8 -> 2.35.14):recipes-support/aws-cli-v2/aws-cli-v2_2.35.14.bb
 
 # version 2.x
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>2\.\d+(\.\d+)+)"
diff --git a/recipes-support/aws-cli-v2/aws-cli-v2_2.35.14.bb b/recipes-support/aws-cli-v2/aws-cli-v2_2.35.14.bb
new file mode 100644
index 0000000000..4a48936aa7
--- /dev/null
+++ b/recipes-support/aws-cli-v2/aws-cli-v2_2.35.14.bb
@@ -0,0 +1,105 @@
+SUMMARY = "Universal Command Line Interface for Amazon Web Services v2"
+DESCRIPTION = "Universal Command Line Interface for Amazon Web Services and ptest scripts v2"
+HOMEPAGE = "https://github.com/aws/aws-cli/tree/v2"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ad764cee43b1595056063799f3f79a5"
+
+DEPENDS += "\
+    aws-crt-python-native \
+    groff \
+    openssl-native \
+    python3-botocore \
+    python3-colorama-native \
+    python3-cryptography-native \
+    python3-dateutil-native \
+    python3-distro-native \
+    python3-docutils-native \
+    python3-flit-core \
+    python3-jmespath-native \
+    python3-native \
+    python3-prompt-toolkit-native \
+    python3-pyyaml-native \
+    python3-rsa \
+    python3-ruamel-yaml-clib-native \
+    python3-ruamel-yaml-native \
+    python3-s3transfer \
+    python3-urllib3-native \
+    python3-zipp-native \
+"
+
+SRC_URI = "\
+    git://github.com/aws/aws-cli.git;protocol=https;branch=v2 \
+    file://run-ptest \
+"
+
+<<<<<<<< HEAD:recipes-support/aws-cli-v2/aws-cli-v2_2.34.33.bb
+SRCREV = "1cc7be1dd47d8367a92f2563963c1a03304a1225"
+
+S = "${WORKDIR}/git"
+========
+SRCREV = "6378d3744183c1a2046330c325d4bd8caa7e419d"
+>>>>>>>> 2492a70aa (aws-cli-v2: upgrade 2.35.8 -> 2.35.14):recipes-support/aws-cli-v2/aws-cli-v2_2.35.14.bb
+
+# version 2.x
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>2\.\d+(\.\d+)+)"
+
+inherit python_pep517 python3native python3-dir setuptools3-base ptest
+
+export CRYPTOGRAPHY_OPENSSL_NO_LEGACY = "true"
+
+# this package also contains aws help
+PACKAGES += "${PN}-examples"
+
+FILES:${PN}-examples += "${libdir}/${PYTHON_DIR}/site-packages/awscli/examples"
+
+RDEPENDS:${PN} += "\
+    aws-crt-python \
+    openssl \
+    python3-botocore \
+    python3-colorama \
+    python3-compression \
+    python3-core \
+    python3-dateutil \
+    python3-distro \
+    python3-docutils \
+    python3-elementpath \
+    python3-io \
+    python3-ipaddress \
+    python3-jmespath \
+    python3-json \
+    python3-logging \
+    python3-misc \
+    python3-prompt-toolkit \
+    python3-rsa \
+    python3-ruamel-yaml \
+    python3-sqlite3 \
+    python3-unixadmin \
+    python3-urllib3 \
+    python3-zipp \
+"
+
+do_patch() {
+    sed -i -E 's/(([a-zA-Z0-9_.-]+)(>=?[0-9.]+)?(,)?(<[0-9.]+\*|<=?[0-9.]+)?|([a-zA-Z0-9_.-]+)==[0-9.]+)/\2\3\6/' ${S}/pyproject.toml ${S}/requirements/bootstrap.txt
+}
+
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        # just install some tests with low memory (less than 4GB) consumption
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS:${PN}-ptest += "\
+        bash \
+        python3-mock \
+        python3-pytest \
+        python3-venv \
+"
+
+RDEPENDS:${PN}-examples += "\
+        groff \
+        less \
+"
+
+RRECOMMENDS:${PN} = "${PN}-examples"
+
+RCONFLICTS:${PN} = "awscli"