Revert "revert UNPACKDIR to WORKDIR as this is breaking nightly updates"

thomas-roos · thomas-roos · commit 615a40a0ad6c · 2025-06-27T16:08:03.000+02:00
devtool now knows how to handle UNPACKDIR This reverts commit 5c48b02.
diff --git a/.github/workflows/oelint-adv.yml b/.github/workflows/oelint-adv.yml
@@ -28,4 +28,4 @@ jobs:
       - name: run oelint_adv
         if: ${{steps.changes.outputs.bb}}
         run: |
-          oelint-adv --suppress oelint.vars.unpackdir --nowarn --noinfo ${{steps.changes.outputs.bb}}
+          oelint-adv --nowarn --noinfo ${{steps.changes.outputs.bb}}
diff --git a/recipes-cloud/amazon-cloudwatch-agent/amazon-cloudwatch-agent_1.300054.0.bb b/recipes-cloud/amazon-cloudwatch-agent/amazon-cloudwatch-agent_1.300054.0.bb
@@ -19,7 +19,7 @@ SRC_URI = "\
 
 SRCREV = "01b3fbdbe2d2234a44b1219d4f71d11335b771f2"
 
-S = "${WORKDIR}/git/src/${GO_IMPORT}"
+S = "${UNPACKDIR}/git/src/${GO_IMPORT}"
 
 do_compile[network] = "1"
 
@@ -29,7 +29,7 @@ do_compile:prepend() {
     export BUILDTAGS="static_build"
     export GO_BUILD_FLAGS="-trimpath"
     export GOARCH="${TARGET_GOARCH}"
-    export GOPATH="${WORKDIR}/git/:${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go:${WORKDIR}/git/"
+    export GOPATH="${UNPACKDIR}/git/:${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go:${UNPACKDIR}/git/"
 }
 
 # nooelint: oelint.task.dash
diff --git a/recipes-cloud/amazon-cloudwatch-publisher/amazon-cloudwatch-publisher_1.2.4.bb b/recipes-cloud/amazon-cloudwatch-publisher/amazon-cloudwatch-publisher_1.2.4.bb
@@ -12,7 +12,6 @@ SRC_URI = "\
     file://run-ptest \
     "
 SRCREV = "9feebfa9facb6bfddade737de7a90bfbfd65cf6e"
-S = "${WORKDIR}/git"
 
 inherit systemd ptest
 
diff --git a/recipes-containers/firecracker-bin/firecracker-bin_1.10.1.bb b/recipes-containers/firecracker-bin/firecracker-bin_1.10.1.bb
@@ -27,7 +27,7 @@ SRC_URI:append = " \
     file://run-ptest \
 "
 
-S = "${WORKDIR}/release-v${PV}-${TARGET_ARCH}"
+S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"
 
 inherit bin_package ptest
 
diff --git a/recipes-containers/firecracker-bin/jailer-bin_1.10.1.bb b/recipes-containers/firecracker-bin/jailer-bin_1.10.1.bb
@@ -27,7 +27,7 @@ SRC_URI:append = " \
     file://run-ptest \
 "
 
-S = "${WORKDIR}/release-v${PV}-${TARGET_ARCH}"
+S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"
 
 inherit bin_package ptest
 
diff --git a/recipes-devtools/python/python3-boto3_1.38.36.bb b/recipes-devtools/python/python3-boto3_1.38.36.bb
@@ -9,7 +9,6 @@ SRC_URI = "\
     file://run-ptest"
 
 SRCREV = "a6598484538f4f70c084352ed1dc866a273a5063"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 ptest
 
diff --git a/recipes-devtools/python/python3-botocore_1.38.36.bb b/recipes-devtools/python/python3-botocore_1.38.36.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
     "
 
 SRCREV = "3e3d9b82d3a74ef3ba59b30aa5e2d955585c1746"
-S = "${WORKDIR}/git"
 
 inherit setuptools3 ptest
 
diff --git a/recipes-devtools/python/python3-s3transfer_0.13.0.bb b/recipes-devtools/python/python3-s3transfer_0.13.0.bb
@@ -10,7 +10,6 @@ SRC_URI = "\
     "
 SRCREV = "90a897be1a2be87e7a9b46bf4b1c12df81a4daf0"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3 ptest
 
diff --git a/recipes-devtools/python/python3-urllib3-1.x_1.26.20.bb b/recipes-devtools/python/python3-urllib3-1.x_1.26.20.bb
@@ -11,7 +11,6 @@ inherit setuptools3
 
 PIP_INSTALL_PACKAGE = "urllib3"
 
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/urllib3/urllib3.git;protocol=https;branch=1.26.x"
 SRCREV = "6f2ad7ca0cdde53751bab29cbc10bcc965bb4387"
 
diff --git a/recipes-external/python3-timeloop/python3-timeloop_1.0.2.bb b/recipes-external/python3-timeloop/python3-timeloop_1.0.2.bb
@@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=030635eb18c38d9fd120c13a324721b7"
 SRC_URI = "git://github.com/sankalpjonn/timeloop.git;protocol=https;branch=master"
 SRCREV = "36ec5cbb133a6dcfb5316f59b5e11765c14e62c2"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3
 
 RDEPENDS:${PN} += "python3-core"
diff --git a/recipes-iot/aws-iot-device-client/aws-iot-device-client_1.10.1.bb b/recipes-iot/aws-iot-device-client/aws-iot-device-client_1.10.1.bb
@@ -27,8 +27,6 @@ SRC_URI = "\
 
 SRCREV = "7f9547bca3e1a199f2824f4376e1782b082b226f"
 
-S = "${WORKDIR}/git"
-
 inherit cmake systemd ptest
 
 do_install() {
diff --git a/recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.3.1.bb b/recipes-iot/aws-iot-fleetwise/aws-iot-fleetwise-edge_1.3.1.bb
@@ -24,8 +24,6 @@ SRC_URI = "\
 
 SRCREV = "e650426256718fe446a65fd751a577ce0774598f"
 
-S = "${WORKDIR}/git"
-
 inherit cmake systemd ptest pkgconfig
 
 FILES:${PN} += "${systemd_system_unitdir}"
@@ -70,7 +68,7 @@ do_configure:append() {
     # Execute the script with arguments to generate the file
     ${S}/tools/configure-fwe.sh \
         --input-config-file ${S}/configuration/static-config.json \
-        --output-config-file ${WORKDIR}/config-0.json \
+        --output-config-file ${UNPACKDIR}/config-0.json \
         --connection-type ${CONNECTION_TYPE} \
         --vehicle-name ${VEHICLE_NAME} \
         --endpoint-url ${ENDPOINT_URL} \
@@ -92,7 +90,7 @@ do_install() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0755 ${S}/tools/deploy/fwe@.service ${D}${systemd_system_unitdir}
     install -d ${D}${sysconfdir}/aws-iot-fleetwise
-    install -m 0755 ${WORKDIR}/config-0.json ${D}${sysconfdir}/aws-iot-fleetwise
+    install -m 0755 ${UNPACKDIR}/config-0.json ${D}${sysconfdir}/aws-iot-fleetwise
     install -d ${D}${localstatedir}/aws-iot-fleetwise
 }
 
diff --git a/recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.1.bb b/recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.1.bb
@@ -9,7 +9,7 @@ GG_ROOT = "${D}/${GG_BASENAME}"
 GGV2_FLEETPROVISIONING_VERSION ?= "1.2.2"
 GGV2_FLEET_PROVISIONING_TEMPLATE_NAME ?= "GreengrassFleetProvisioningTemplate"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/greengrass-bin/LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/greengrass-bin/LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
 DEPENDS += "gettext-native"
 
@@ -46,7 +46,7 @@ GG_USESYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', 'no',
 
 inherit systemd useradd ptest pkgconfig
 
-S = "${WORKDIR}/greengrass-bin"
+S = "${UNPACKDIR}/greengrass-bin"
 
 FILES:${PN} += "\
     /${GG_BASENAME} \
@@ -76,7 +76,7 @@ do_install() {
     ln -s /${GG_BASENAME}/packages/artifacts-unarchived/aws.greengrass.Nucleus/${PV}/aws.greengrass.nucleus ${GG_ROOT}/alts/init/distro
 
     install -m 0440 ${S}/LICENSE                         ${GG_ROOT}
-    install -m 0640 ${UNPACKDIR}/greengrassv2-init.yaml          ${GG_ROOT}/config/config.yaml.clean
+    install -m 0640 ${S}/../greengrassv2-init.yaml          ${GG_ROOT}/config/config.yaml.clean
     install -m 0640 ${S}/bin/greengrass.service.template ${GG_ROOT}/packages/artifacts-unarchived/aws.greengrass.Nucleus/${PV}/aws.greengrass.nucleus/bin/greengrass.service.template
     install -m 0750 ${S}/bin/loader                      ${GG_ROOT}/packages/artifacts-unarchived/aws.greengrass.Nucleus/${PV}/aws.greengrass.nucleus/bin/loader
     install -m 0640 ${S}/conf/recipe.yaml                ${GG_ROOT}/packages/artifacts-unarchived/aws.greengrass.Nucleus/${PV}/aws.greengrass.nucleus/conf/recipe.yaml
diff --git a/recipes-iot/aws-iot-greengrass/greengrass-lite_2.1.0.bb b/recipes-iot/aws-iot-greengrass/greengrass-lite_2.1.0.bb
@@ -55,8 +55,6 @@ EXTRA_OECMAKE:append = " \
 
 SRCREV_FORMAT .= "_ggl_core_mqtt_backoff_aws_sigv4"
 
-S = "${UNPACKDIR}/git"
-
 FILES:${PN}:append = " \
     ${systemd_unitdir}/system/greengrass-lite.service \
     /usr/components/* \
diff --git a/recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb b/recipes-iot/aws-iot-securetunneling-localproxy/aws-iot-securetunneling-localproxy_git.bb
@@ -29,8 +29,6 @@ SRCREV = "feb59e268c8f4f1c7450f3a510963e84cc397ac7"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb
@@ -20,8 +20,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "git_invalid_tag_regex"
 # https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/blob/master/CMake/Dependencies/libkvspic-CMakeLists.txt
 SRCREV = "65e38dac9b30523d43a57bc009d679e627b58d9a"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig ptest
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.2.bb b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-c_1.5.2.bb
@@ -25,8 +25,6 @@ UPSTREAM_VERSION_UNKNOWN = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "git_invalid_tag_regex"
 SRCREV = "3e519b7670e39031375d227f983ad2cde888078e"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig
 
 # ptest are disabled, cause running tests require a certificate
diff --git a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-cpp_3.4.2.bb b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-sdk-cpp_3.4.2.bb
@@ -21,8 +21,6 @@ SRC_URI = "git://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cp
 
 SRCREV = "7acf272672ced72bbbad85fe39d366deca57280e"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig
 
 PACKAGECONFIG ??= "gstreamer"
diff --git a/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.12.1.bb b/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.12.1.bb
@@ -27,8 +27,6 @@ SRC_URI = "\
 
 SRCREV = "cf817bc5d18f3e4bd499c6b0f9a68c6f4d7e01de"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig ptest
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-auth/aws-c-auth_0.9.0.bb b/recipes-sdk/aws-c-auth/aws-c-auth_0.9.0.bb
@@ -25,8 +25,6 @@ SRC_URI = "\
     "
 SRCREV = "cd9d6afcd42035d49bb2d0d3bef24b9faed57773"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 CFLAGS:append = " -Wl,-Bsymbolic"
diff --git a/recipes-sdk/aws-c-cal/aws-c-cal_0.9.2.bb b/recipes-sdk/aws-c-cal/aws-c-cal_0.9.2.bb
@@ -22,8 +22,6 @@ SRC_URI = "\
 
 SRCREV = "8703b3e5930c9fd508025b268ab837fc9df3c4fd"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-common/aws-c-common_0.12.3.bb b/recipes-sdk/aws-c-common/aws-c-common_0.12.3.bb
@@ -18,8 +18,6 @@ SRCREV = "aaa2f11ed609e3f888efd9bf745e810b45b13a38"
 # will match only x.x.x for auto upgrades, because: https://github.com/awslabs/aws-c-common/issues/1025
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d\.\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest
 
 CFLAGS:append = " -Wl,-Bsymbolic"
diff --git a/recipes-sdk/aws-c-compression/aws-c-compression_0.3.1.bb b/recipes-sdk/aws-c-compression/aws-c-compression_0.3.1.bb
@@ -24,8 +24,6 @@ SRC_URI = "\
 
 SRCREV = "f951ab2b819fc6993b6e5e6cfef64b1a1554bfc8"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-event-stream/aws-c-event-stream_0.5.4.bb b/recipes-sdk/aws-c-event-stream/aws-c-event-stream_0.5.4.bb
@@ -22,8 +22,6 @@ SRC_URI = "\
     "
 SRCREV = "9312b052583183b98526aaeb91e5c72ec3db9627"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 do_install_ptest () {
diff --git a/recipes-sdk/aws-c-http/aws-c-http_0.10.2.bb b/recipes-sdk/aws-c-http/aws-c-http_0.10.2.bb
@@ -25,8 +25,6 @@ SRC_URI = "\
 
 SRCREV = "10961a708a4148c57db139232277573da2f6e99c"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-io/aws-c-io_0.20.0.bb b/recipes-sdk/aws-c-io/aws-c-io_0.20.0.bb
@@ -24,8 +24,6 @@ SRC_URI = "\
     "
 SRCREV = "3b500b3746281ab19ef9336d93b153ad1d895214"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-iot/aws-c-iot_0.2.1.bb b/recipes-sdk/aws-c-iot/aws-c-iot_0.2.1.bb
@@ -30,8 +30,6 @@ SRC_URI = "\
 
 SRCREV = "9f0c152ed76af1a45d99fb98286707aa23c728af"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-mqtt/aws-c-mqtt_0.13.1.bb b/recipes-sdk/aws-c-mqtt/aws-c-mqtt_0.13.1.bb
@@ -25,8 +25,6 @@ SRC_URI = "\
 
 SRCREV = "3ac506507679a86677f8875dcc07589b63907863"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest
 
 CFLAGS:append = " -Wl,-Bsymbolic"
diff --git a/recipes-sdk/aws-c-s3/aws-c-s3_0.8.1.bb b/recipes-sdk/aws-c-s3/aws-c-s3_0.8.1.bb
@@ -21,8 +21,6 @@ SRC_URI = "\
     "
 SRCREV = "233c587f29fab457c1874988c19e04a2a8c8c00b"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-c-sdkutils/aws-c-sdkutils_0.2.4.bb b/recipes-sdk/aws-c-sdkutils/aws-c-sdkutils_0.2.4.bb
@@ -16,8 +16,6 @@ SRC_URI = "\
     "
 SRCREV = "f678bda9e21f7217e4bbf35e0d1ea59540687933"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-checksums/aws-checksums_0.2.7.bb b/recipes-sdk/aws-checksums/aws-checksums_0.2.7.bb
@@ -21,8 +21,6 @@ SRC_URI = "\
 
 SRCREV = "9978ba2c33a7a259c1a6bd0f62abe26827d03b85"
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.32.5.bb b/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.32.5.bb
@@ -29,8 +29,6 @@ SRC_URI = "\
 
 SRCREV = "78c4031387b5be86837e336730f4ef4ab6144815"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig ptest
 
 CFLAGS:append = " -Wl,-Bsymbolic"
diff --git a/recipes-sdk/aws-crt-python/aws-crt-python_0.27.2.bb b/recipes-sdk/aws-crt-python/aws-crt-python_0.27.2.bb
@@ -30,8 +30,6 @@ SRC_URI = "\
 SRCREV = "0157faf2fdb7bcb7eb2f84bcdbc7c67faff18c6a"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
-S = "${WORKDIR}/git"
-
 inherit setuptools3_legacy ptest
 
 AWS_C_INSTALL = "${D}/usr/lib;${S}/source"
diff --git a/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2-samples-fleet-provisoning.bb b/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2-samples-fleet-provisoning.bb
@@ -1,7 +1,7 @@
 # nooelint: oelint.file.underscores
 require aws-iot-device-sdk-cpp-v2-samples.inc
 
-S = "${WORKDIR}/git/samples/fleet_provisioning/fleet_provisioning"
+S = "${UNPACKDIR}/${PN}-${PV}/samples/fleet_provisioning/fleet_provisioning"
 
 SRC_URI:append = " \
     file://run-ptest \
@@ -34,4 +34,4 @@ INSANE_SKIP:${PN}-dbg += "buildpaths"
 #     echo "aws_access_key_id = XXX" >> ${D}/home/root/.aws/credentials
 #     echo "aws_secret_access_key = XXX" >> ${D}/home/root/.aws/credentials
 #     echo "region = xxx" >> ${D}/home/root/.aws/credentials
-# }
+# }
diff --git a/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2-samples-mqtt5-pubsub.bb b/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2-samples-mqtt5-pubsub.bb
@@ -1,7 +1,7 @@
 # nooelint: oelint.file.underscores
 require aws-iot-device-sdk-cpp-v2-samples.inc
 
-S = "${WORKDIR}/git/samples/mqtt5/mqtt5_pubsub"
+S = "${UNPACKDIR}/${PN}-${PV}/samples/mqtt5/mqtt5_pubsub"
 
 do_install() {
  install -d ${D}${bindir}
diff --git a/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2-samples.inc b/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2-samples.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "The AWS IoT Device SDK for C++ v2 provides MQTT APIs for C++ appl
 HOMEPAGE = "https://github.com/aws/aws-iot-device-sdk-cpp-v2"
 LICENSE = "Apache-2.0"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/documents/LICENSE;md5=f91e61641e7a96835dea6926a65f4702"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${PN}-${PV}/documents/LICENSE;md5=f91e61641e7a96835dea6926a65f4702"
 
 DEPENDS += "aws-iot-device-sdk-cpp-v2"
 
diff --git a/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2_1.35.1.bb b/recipes-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2_1.35.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The AWS IoT Device SDK for C++ v2 provides MQTT APIs for C++ appl
 HOMEPAGE = "https://github.com/aws/aws-iot-device-sdk-cpp-v2"
 LICENSE = "Apache-2.0"
 
-LIC_FILES_CHKSUM = "file://documents/LICENSE;md5=f91e61641e7a96835dea6926a65f4702"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${PN}-${PV}/documents/LICENSE;md5=f91e61641e7a96835dea6926a65f4702"
 
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'build-deps', 'openssl', 'aws-c-iot', d)}"
 
@@ -16,8 +16,6 @@ SRC_URI:append = " \
     ${@bb.utils.contains('PACKAGECONFIG', 'static', '', 'file://001-shared-static-crt-libs.patch', d)} \
     "
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig ptest
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)"
diff --git a/recipes-sdk/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c_202412.00.bb b/recipes-sdk/aws-iot-device-sdk-embedded-c/aws-iot-device-sdk-embedded-c_202412.00.bb
@@ -17,8 +17,6 @@ DEPENDS = "\
     ${@bb.utils.contains('PACKAGECONFIG', 'with-tests', 'ruby-native', '', d)} \
     "
 
-S = "${WORKDIR}/git"
-
 inherit cmake ptest pkgconfig
 
 PACKAGECONFIG ??= "\
diff --git a/recipes-sdk/aws-iot-device-sdk-python-v2/aws-iot-device-sdk-python-v2_1.22.2.bb b/recipes-sdk/aws-iot-device-sdk-python-v2/aws-iot-device-sdk-python-v2_1.22.2.bb
diff --git a/recipes-sdk/aws-lc/aws-lc_1.52.1.bb b/recipes-sdk/aws-lc/aws-lc_1.52.1.bb
diff --git a/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.588.bb b/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.588.bb
diff --git a/recipes-sdk/linux-webrtc-reference-for-amazon-kinesis-video-streams/linux-webrtc-reference-for-amazon-kinesis-video-streams_git.bb b/recipes-sdk/linux-webrtc-reference-for-amazon-kinesis-video-streams/linux-webrtc-reference-for-amazon-kinesis-video-streams_git.bb
diff --git a/recipes-sdk/s2n/s2n_1.5.21.bb b/recipes-sdk/s2n/s2n_1.5.21.bb
diff --git a/recipes-support/amazon-ssm-agent/amazon-ssm-agent_3.3.2656.0.bb b/recipes-support/amazon-ssm-agent/amazon-ssm-agent_3.3.2656.0.bb
diff --git a/recipes-support/aws-cli-v2/aws-cli-v2_2.27.34.bb b/recipes-support/aws-cli-v2/aws-cli-v2_2.27.34.bb
diff --git a/recipes-support/aws-cli/aws-cli_1.40.35.bb b/recipes-support/aws-cli/aws-cli_1.40.35.bb

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ SRC_URI = "\`
`12`	`12`	`file://run-ptest \`
`13`	`13`	`"`
`14`	`14`	`SRCREV = "9feebfa9facb6bfddade737de7a90bfbfd65cf6e"`
`15`		`-S = "${WORKDIR}/git"`
`16`	`15`
`17`	`16`	`inherit systemd ptest`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ SRC_URI:append = " \`
`27`	`27`	`file://run-ptest \`
`28`	`28`	`"`
`29`	`29`
`30`		`-S = "${WORKDIR}/release-v${PV}-${TARGET_ARCH}"`
	`30`	`+S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"`
`31`	`31`
`32`	`32`	`inherit bin_package ptest`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ SRC_URI = "\`
`10`	`10`	`"`
`11`	`11`
`12`	`12`	`SRCREV = "3e3d9b82d3a74ef3ba59b30aa5e2d955585c1746"`
`13`		`-S = "${WORKDIR}/git"`
`14`	`13`
`15`	`14`	`inherit setuptools3 ptest`
`16`	`15`