Merge branch 'master-next' into add_tls

tro · web-flow · commit 5066e494f533 · 2025-09-30T15:41:32.000+02:00
diff --git a/README.md b/README.md
@@ -56,7 +56,8 @@ Generally you can build all images for all "Devices", but some combinations do n
 - [aws-iot-greengrass-lite-demo-image](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/README.md)
 - [aws-iot-greengrass-lite-demo-ec2-image](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-ec2-image/README.md)
 - [aws-iot-greengrass-lite-demo-simple-image](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/README.md)
-- [aws-iot-greengrass-lite-demo-simple-imag-tpm](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image-tpm/README.md)
+- [aws-iot-greengrass-lite-demo-simple-image-tpm](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image-tpm/README.md)
+- [aws-iot-greengrass-lite-demo-swupdate-image](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/README.md)
 - [aws-iot-greengrass-lite-demo-tiny-image](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-tiny-image/README.md)
 - [aws-iot-greengrass-lite-webrtc-demo-image](meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/README.md)
 - [aws-webrtc-demo-image](meta-aws-demos/recipes-core/images/aws-webrtc-demo-image/README.md)
diff --git a/layers/sw/meta-aws b/layers/sw/meta-aws
@@ -1 +1 @@
-Subproject commit 66a4a1158373634e26ba52b5b5f3846047d86622
+Subproject commit cc89a369f14e2543fe357fdb6735c997766bd6d3
diff --git a/layers/sw/scarthgap-rust-mixin b/layers/sw/scarthgap-rust-mixin
@@ -0,0 +1 @@
+Subproject commit a0705b87e7c1a257dafb089063f3302ed49c87d3
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-image/config.conf
@@ -42,24 +42,9 @@ INHERIT += "create-spdx"
 # add build info to the image
 INHERIT += "image-buildinfo"
 
-
-# tests
-
-# use slirp networking instead of TAP interface (require root rights)
-#QEMU_USE_SLIRP = "1"
-#TEST_SERVER_IP = "127.0.0.1"
-
-# this will specify what test should run when running testimage cmd - oeqa layer tests + ptests:
-# Ping and SSH are not required, but do help in debugging. ptest will discover all ptest packages.
-# TEST_SUITES = " ping ssh ptest"
-
-# this will allow - running testimage cmd: bitbake core-image-minimal -c testimage
-# IMAGE_CLASSES += "testimage"
-
-# PUT = package under test / this is set in auto.conf
-# PUT = "greengrass-lite-ptest"
-# IMAGE_INSTALL:append = " ptest-runner ssh ${PUT}"
-
 # if not set, you will have to take care of mount points at two places, with this set image
 # partition layout is done in wic file and fstab settings in aws-iot-greengrass-lite-demo-ab-image.bb
 WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-simple-image/aws-iot-greengrass-demo-simple-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-simple-image/aws-iot-greengrass-demo-simple-image.bb
@@ -62,4 +62,4 @@ extra_files () {
 
     # enable systemd-time-wait-sync as this is important for greengrass to have a correct clock
     ln -sf /${libdir}/systemd/system/systemd-time-wait-sync.service ${IMAGE_ROOTFS}/${sysconfdir}/systemd/system/multi-user.target.wants/
-}
+}
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-simple-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-demo-simple-image/config.conf
@@ -20,19 +20,5 @@ BB_GENERATE_SHALLOW_TARBALLS = "1"
 
 INHERIT += "create-spdx"
 
-# tests
-
-# use slirp networking instead of TAP interface (require root rights)
-#QEMU_USE_SLIRP = "1"
-#TEST_SERVER_IP = "127.0.0.1"
-
-# this will specify what test should run when running testimage cmd - oeqa layer tests + ptests:
-# Ping and SSH are not required, but do help in debugging. ptest will discover all ptest packages.
-# TEST_SUITES = " ping ssh ptest"
-
-# this will allow - running testimage cmd: bitbake core-image-minimal -c testimage
-# IMAGE_CLASSES += "testimage"
-
-# PUT = package under test / this is set in auto.conf
-# PUT = "greengrass-lite-ptest"
-# IMAGE_INSTALL:append = " ptest-runner ssh ${PUT}"
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-container-demo-image/aws-iot-greengrass-lite-container-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-container-demo-image/aws-iot-greengrass-lite-container-demo-image.bb
@@ -33,3 +33,6 @@ DISTRO_FEATURES:remove = "sysvinit"
 
 ### AWS ###
 IMAGE_INSTALL:append = " greengrass-lite"
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-container-demo-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-container-demo-image/config.conf
@@ -1,3 +1,6 @@
 DISTRO = "poky-altcfg"
 
-DISTRO_FEATURES:append = " virtualization"
+DISTRO_FEATURES:append = " virtualization"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-ec2-image/aws-iot-greengrass-lite-demo-ec2-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-ec2-image/aws-iot-greengrass-lite-demo-ec2-image.bb
@@ -198,3 +198,6 @@ IMAGE_INSTALL:append = " systemd-extra-utils"
 
 # this will install the rauc configuration file
 IMAGE_INSTALL:append = " virtual-rauc-conf"
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-ec2-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-ec2-image/config.conf
@@ -43,3 +43,6 @@ EFI_PROVIDER = "grub-efi"
 MACHINE_FEATURES += "efi"
 
 PREFERRED_RPROVIDER_virtual-grub-bootconf = "rauc-qemu-grubconf"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/README.md b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/README.md
@@ -120,7 +120,7 @@ systemctl status --with-dependencies greengrass-lite.target
 
 ## Fleetprovisioning example
 
-Follow instructiongs [here](scripts/fleetprovisioning/README.md)
+Follow instructions [here](scripts/fleetprovisioning/README.md)
 
 ## A/B update example made with [meta-rauc](https://github.com/rauc/meta-rauc-community)
 
@@ -240,7 +240,7 @@ Manifests:
         Unarchive: 'NONE'
 ```
 
-## Configuration for streaming updates
+## Configuration for streaming / adaptive updates
 
 The update file (`update.raucb`) is stored in an S3 bucket. But not downloaded as before from the Greengrass component, instead a signed url is generated and passed into rauc.
 This allows (streaming)[https://rauc.readthedocs.io/en/latest/advanced.html#http-streaming] and (adaptive)[https://rauc.readthedocs.io/en/latest/advanced.html#adaptive-updates] updates.
@@ -265,16 +265,17 @@ Manifests:
       bootstrap:
         Script: |
           echo Bootstrap
-          echo AWS_CONTAINER_AUTHORIZATION_TOKEN: $AWS_CONTAINER_AUTHORIZATION_TOKEN
-          echo AWS_CONTAINER_CREDENTIALS_FULL_URI: $AWS_CONTAINER_CREDENTIALS_FULL_URI
-          BUCKET=rauc-yocto-test-bucket
-          UPDATEFILE=aws-iot-greengrass-lite-demo-swupdate-file-raspberrypi-armv8.rootfs.swu
+          BUCKET=rauc-adaptive-test
+          UPDATEFILE=aws-iot-greengrass-lite-demo-bundle-raspberrypi-armv8.raucb
+
           REGION=$(aws s3api get-bucket-location --bucket "$BUCKET" --query LocationConstraint --output text)
           echo $REGION
           BUNDLE_URL=$(aws s3 presign "s3://$BUCKET/$UPDATEFILE" --expires-in 3600 --endpoint-url "https://s3.$REGION.amazonaws.com")
           echo $BUNDLE_URL
           sudo rauc install $BUNDLE_URL
+          sleep  5
         RequiresPrivilege: true
+        Timeout: '600'
       startup:
         Script: |
           echo Startup
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/aws-iot-greengrass-lite-demo-bundle.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/aws-iot-greengrass-lite-demo-bundle.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "A update bundle for aws-iot-greengrass-lite-demo-image"
 
 inherit bundle
 
-# RAUC_BUNDLE_VERSION = "v20200703"
-# RAUC_BUNDLE_DESCRIPTION = "RAUC Demo Bundle"
+RAUC_BUNDLE_DESCRIPTION = "aws-iot-greengrass-lite-demo-bundle"
 
 RAUC_BUNDLE_SLOTS = "rootfs"
 RAUC_SLOT_rootfs = "aws-iot-greengrass-lite-demo-image"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/aws-iot-greengrass-lite-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/aws-iot-greengrass-lite-demo-image.bb
@@ -131,7 +131,9 @@ IMAGE_INSTALL:append = " aws-cli"
 # rootfs image size must to be 4K-aligned
 IMAGE_ROOTFS_ALIGNMENT = "4"
 
-# TODO
 # ext4 block size should be set to 4K and use a fixed directory hash seed to
 # reduce the image delta size (keep oe-core's 4K bytes-per-inode)
-# EXTRA_IMAGECMD:ext4 = "-i 4096 -b 4096 -E hash_seed=86ca73ff-7379-40bd-a098-fcb03a6e719d"
+EXTRA_IMAGECMD:ext4 = "-i 4096 -b 4096 -E hash_seed=86ca73ff-7379-40bd-a098-fcb03a6e719d"
+
+# disable fleetprovisioning (default on)
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/config.conf
@@ -3,8 +3,8 @@ DISTRO = "poky-altcfg"
 QB_MEM = "-m 2048"
 BOOT_SPACE = "69152"
 
-# we are read only, no addition space necessary
-IMAGE_OVERHEAD_FACTOR = "1"
+# we are read only, no addition space necessary, except for rauc
+IMAGE_OVERHEAD_FACTOR = "1.1"
 
 BOOT_SPACE = "69152"
 
@@ -45,3 +45,6 @@ INHERIT += "image-buildinfo"
 # if not set, you will have to take care of mount points at two places, with this set image
 # partition layout is done in wic file and fstab settings in aws-iot-greengrass-lite-demo-ab-image.bb
 WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = "ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image-tpm/aws-iot-greengrass-lite-demo-simple-image-tpm.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image-tpm/aws-iot-greengrass-lite-demo-simple-image-tpm.bb
@@ -65,3 +65,6 @@ extra_files_rpi () {
     install -d ${IMAGE_ROOTFS}/${sysconfdir}/systemd/system/multi-user.target.wants/
     ln -sf /${libdir}/systemd/system/wpa_supplicant@.service ${IMAGE_ROOTFS}/${sysconfdir}/systemd/system/multi-user.target.wants/wpa_supplicant@wlan0.service
 }
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image-tpm/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image-tpm/config.conf
@@ -20,23 +20,6 @@ BB_GENERATE_SHALLOW_TARBALLS = "1"
 
 INHERIT += "create-spdx"
 
-# tests
-
-# use slirp networking instead of TAP interface (require root rights)
-#QEMU_USE_SLIRP = "1"
-#TEST_SERVER_IP = "127.0.0.1"
-
-# this will specify what test should run when running testimage cmd - oeqa layer tests + ptests:
-# Ping and SSH are not required, but do help in debugging. ptest will discover all ptest packages.
-# TEST_SUITES = " ping ssh ptest"
-
-# this will allow - running testimage cmd: bitbake core-image-minimal -c testimage
-# IMAGE_CLASSES += "testimage"
-
-# PUT = package under test / this is set in auto.conf
-# PUT = "greengrass-lite-ptest"
-# IMAGE_INSTALL:append = " ptest-runner ssh ${PUT}"
-
 # tpm support
 IMAGE_INSTALL:append = " packagegroup-security-tpm2"
 
@@ -48,3 +31,6 @@ DISTRO_FEATURES:append = " tpm"
 # additional steps required: https://github.com/tpm2-software/tpm2-tss/blob/master/doc/tcti-spi-ltt2go.md#abrmd-udev--systemd-service
 DEPENDS:append:pn-tpm2-tss = " libusb1"
 DEPENDS:append:pn-tpm2-tss-engine = " libusb1"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/aws-iot-greengrass-lite-demo-simple-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/aws-iot-greengrass-lite-demo-simple-image.bb
@@ -65,3 +65,6 @@ extra_files_rpi () {
     install -d ${IMAGE_ROOTFS}/${sysconfdir}/systemd/system/multi-user.target.wants/
     ln -sf /${libdir}/systemd/system/wpa_supplicant@.service ${IMAGE_ROOTFS}/${sysconfdir}/systemd/system/multi-user.target.wants/wpa_supplicant@wlan0.service
 }
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-simple-image/config.conf
@@ -20,19 +20,5 @@ BB_GENERATE_SHALLOW_TARBALLS = "1"
 
 INHERIT += "create-spdx"
 
-# tests
-
-# use slirp networking instead of TAP interface (require root rights)
-#QEMU_USE_SLIRP = "1"
-#TEST_SERVER_IP = "127.0.0.1"
-
-# this will specify what test should run when running testimage cmd - oeqa layer tests + ptests:
-# Ping and SSH are not required, but do help in debugging. ptest will discover all ptest packages.
-# TEST_SUITES = " ping ssh ptest"
-
-# this will allow - running testimage cmd: bitbake core-image-minimal -c testimage
-# IMAGE_CLASSES += "testimage"
-
-# PUT = package under test / this is set in auto.conf
-# PUT = "greengrass-lite-ptest"
-# IMAGE_INSTALL:append = " ptest-runner ssh ${PUT}"
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/README.md b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/README.md
@@ -1,6 +1,6 @@
 # aws-iot-greengrass-lite-demo-swupdate-image
-Similar to
-But demo for (swupdate[])https://sbabic.github.io/swupdate/index.html]
+Similar to [aws-iot-greengrass-lite-demo-image](../aws-iot-greengrass-lite-demo-image/README.md)
+But demo for (swupdate[https://sbabic.github.io/swupdate/index.html]
 
 Tested with: `raspberrypi-64`
 
@@ -29,8 +29,7 @@ swupdate  -i /tmp/aws-iot-greengrass-lite-demo-swupdate-file-raspberrypi-armv8.r
 
 ```
 
-
-## How to use in a gg component
+## How to use this in a gg component
 
 The component operates in two main phases:
 
@@ -73,15 +72,6 @@ Manifests:
       startup:
         Script: |
           echo Startup
-          rauc status
-          current_booted_slot_bundle_hash=$(rauc status --detailed --output-format=json-pretty | jq -r '.slots[] | select(.[].state == "booted") | .[].slot_status.bundle.hash')
-          bundle_hash=$(rauc info --output-format=json-pretty {artifacts:path}/aws-iot-greengrass-lite-demo-swupdate-file-raspberrypi-armv8.rootfs.swu | jq -r '.hash')
-          if [ "$current_booted_slot_bundle_hash" == "$bundle_hash" ]; then
-              echo "Bundle image hash matches the current running slot"
-          else
-              echo "Bundle image hash differs from the current running slot"
-              exit 1
-          fi
     Artifacts:
       - URI: 's3://2024-11-27-us-east-1ab-update/aws-iot-greengrass-lite-demo-swupdate-file-raspberrypi-armv8.rootfs.swu'
         Unarchive: 'NONE'
@@ -109,8 +99,6 @@ Manifests:
       bootstrap:
         Script: |
           echo Bootstrap
-          echo AWS_CONTAINER_AUTHORIZATION_TOKEN: $AWS_CONTAINER_AUTHORIZATION_TOKEN
-          echo AWS_CONTAINER_CREDENTIALS_FULL_URI: $AWS_CONTAINER_CREDENTIALS_FULL_URI
           BUCKET=swupdate-yocto-test-bucket
           UPDATEFILE=aws-iot-greengrass-lite-demo-swupdate-file-raspberrypi-armv8.rootfs.swu
           REGION=$(aws s3api get-bucket-location --bucket "$BUCKET" --query LocationConstraint --output text)
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/aws-iot-greengrass-lite-demo-swupdate-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/aws-iot-greengrass-lite-demo-swupdate-image.bb
@@ -137,4 +137,7 @@ IMAGE_INSTALL += "\
 		util-linux-sfdisk \
 		 "
 
-IMAGE_INSTALL:append = " aws-cli"
+IMAGE_INSTALL:append = " aws-cli"
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-swupdate-image/config.conf
@@ -24,9 +24,6 @@ WKS_FILE = "${THISDIR}/wic/sdimage-aws-iot-greengrass-lite-demo_partition.wks.in
 IMAGE_FSTYPES = "ext4 ext4.gz wic wic.bz2 "
 # IMAGE_INSTALL:append = " rauc"
 
-# just necessary if aws-iot-device-client is installed
-PACKAGECONFIG:pn-aws-iot-device-client = "st"
-
 COPY_LIC_MANIFEST = "1"
 
 COPY_LIC_DIRS = "1"
@@ -45,3 +42,7 @@ INHERIT += "image-buildinfo"
 # if not set, you will have to take care of mount points at two places, with this set image
 # partition layout is done in wic file and fstab settings in aws-iot-greengrass-lite-demo-ab-image.bb
 WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-tiny-image/aws-iot-greengrass-lite-demo-tiny-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-tiny-image/aws-iot-greengrass-lite-demo-tiny-image.bb
@@ -33,3 +33,9 @@ extra_files () {
     # enable systemd-time-wait-sync as this is important for greengrass to have a correct clock
     ln -sf /${libdir}/systemd/system/systemd-time-wait-sync.service ${IMAGE_ROOTFS}/${sysconfdir}/systemd/system/multi-user.target.wants/
 }
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-walltablet-demo-image/aws-iot-greengrass-lite-walltablet-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-walltablet-demo-image/aws-iot-greengrass-lite-walltablet-demo-image.bb
@@ -124,3 +124,6 @@ CORE_IMAGE_BASE_INSTALL += "gtk+3-demo"
 CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}"
 
 QB_MEM = "-m 512"
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-walltablet-demo-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-walltablet-demo-image/config.conf
@@ -17,9 +17,6 @@ WKS_FILE = "${THISDIR}/wic/sdimage-aws-iot-greengrass-lite-demo_partition.wks.in
 IMAGE_FSTYPES="ext4 wic.bz2 wic"
 IMAGE_INSTALL:append = " rauc"
 
-# just necessary if aws-iot-device-client is installed
-PACKAGECONFIG:pn-aws-iot-device-client = "st"
-
 COPY_LIC_MANIFEST = "1"
 
 COPY_LIC_DIRS = "1"
@@ -56,4 +53,8 @@ MACHINE_FEATURES:append = " vc4graphics"
 
 DISTRO_FEATURES:append = " pulseaudio"
 
-PACKAGECONFIG:pn-chromium-ozone-wayland += "proprietary-codecs"
+PACKAGECONFIG:pn-chromium-ozone-wayland += "proprietary-codecs"
+
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/aws-iot-greengrass-lite-webrtc-demo-image.bb b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/aws-iot-greengrass-lite-webrtc-demo-image.bb
@@ -147,3 +147,6 @@ ln -sf /${libdir}/systemd/system/webrtc.service ${IMAGE_ROOTFS}/${sysconfdir}/sy
 # webrtc
 IMAGE_INSTALL:append = " amazon-kvs-webrtc-sdk"
 IMAGE_INSTALL:append = " gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly v4l-utils libcamera libcamera-apps libcamera-gst"
+
+# disable fleetprovisioning
+PACKAGECONFIG:pn-greengrass-lite = ""
diff --git a/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/config.conf b/meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-webrtc-demo-image/config.conf
@@ -67,3 +67,6 @@ EXTRA_OECMAKE:append:pn-amazon-kvs-webrtc-sdk = " -DIOT_CORE_ENABLE_CREDENTIALS=
 
 # adding the webrtc reference for amazon kinesis video streams (still beta)
 IMAGE_INSTALL:append = " linux-webrtc-reference-for-amazon-kinesis-video-streams"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/images/aws-webrtc-demo-image/config.conf b/meta-aws-demos/recipes-core/images/aws-webrtc-demo-image/config.conf
@@ -8,3 +8,6 @@ PACKAGECONFIG:append:pn-gstreamer1.0-plugins-ugly = "x264"
 
 # opus needs to be enabled
 PACKAGECONFIG:append:pn-gstreamer1.0-plugins-base = "opus"
+
+# we do not want to have ptests in demo images enabled
+DISTRO_FEATURES:remove = " ptest"
diff --git a/meta-aws-demos/recipes-core/rauc/files/rauc-grow-data-partition.service b/meta-aws-demos/recipes-core/rauc/files/rauc-grow-data-partition.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Service to grow data partition size
+DefaultDependencies=no
+Before=home.mount
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/parted --script /dev/mmcblk0 resizepart 4 100%
+
+[Install]
+WantedBy=home.mount
diff --git a/meta-aws-demos/recipes-core/rauc/files/rauc.service.d/override.conf b/meta-aws-demos/recipes-core/rauc/files/rauc.service.d/override.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/bin/rauc --mount=/run/rauc/mnt -d service
diff --git a/meta-aws-demos/recipes-core/rauc/rauc_%.bbappend b/meta-aws-demos/recipes-core/rauc/rauc_%.bbappend
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/001-disable_strip.patch b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/001-disable_strip.patch
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/004-fix-fleet-provisioning-circular-dependency.patch b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/004-fix-fleet-provisioning-circular-dependency.patch
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl-deploy-image-components b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl-deploy-image-components
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.gg_fleetprovisioning.service b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.gg_fleetprovisioning.service
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.gg_pre-fleetprovisioning.service b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.gg_pre-fleetprovisioning.service
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.local-deployment.service b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.local-deployment.service
diff --git a/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite_git.bb b/meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite_git.bb
diff --git a/poky b/poky
