diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 1daf35bfd..49ab2c42f 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -74,6 +74,9 @@ IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "tar.bz2 boot.ubifs recovery.ubifs squashfs", \ "tar.bz2 ubifs boot.ubifs recovery.ubifs", d)}' +# Default image for install scripts +DEFAULT_IMAGE_NAME ?= "dey-image-webkit" + # For populate_sdk, gcc-arm-none-eabi_9 has a python2 dependency, so we remove it. ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi" diff --git a/sdk/build-github.sh b/sdk/build-github.sh index 1ba6b6169..357f50159 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -3,7 +3,7 @@ # # build-github.sh # -# Copyright (C) 2015-2022 by Digi International Inc. +# Copyright (C) 2015-2023 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -148,7 +148,7 @@ done<<-_EOF_ ccimx6sbc dey-image-qt ccimx6ulsbc dey-image-qt ccimx6ulstarter core-image-base - ccmp15-dvk dey-image-qt + ccmp15-dvk dey-image-webkit ccmp13-dvk core-image-base _EOF_ diff --git a/sdk/build.sh b/sdk/build.sh index 34a80ebac..79d1d2b9d 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -183,7 +183,7 @@ done<<-_EOF_ ccimx6ulstarter core-image-base ccimx6ulsom dey-image-mft-module-min ccimx6ulrftest dey-image-mft-module-rf - ccmp15-dvk dey-image-qt,dey-image-crank + ccmp15-dvk dey-image-webkit,dey-image-crank ccmp13-dvk core-image-base ccimx93-dvk dey-image-qt _EOF_ diff --git a/sdk/config/ccmp15-dvk/conf-notes.txt b/sdk/config/ccmp15-dvk/conf-notes.txt index ebfdec9b2..61380b8fe 100644 --- a/sdk/config/ccmp15-dvk/conf-notes.txt +++ b/sdk/config/ccmp15-dvk/conf-notes.txt @@ -1,5 +1,10 @@ Digi Embedded Yocto provides the following image recipes: + * dey-image-webkit: graphical WebKit image + + By default the image is Wayland-based so it provides a full Weston + desktop environment. + * dey-image-qt: graphical QT image By default the image is Wayland-based so it provides a full Weston