From ea8dd8b2a5bc952c2c78ca48de35f1b3eca1ef98 Mon Sep 17 00:00:00 2001
From: Josep Orga <jorga@somdevices.com>
Date: Wed, 9 Jun 2021 12:22:09 +0200
Subject: [PATCH] =?utf8?q?meta-somdevices:=20somdevices-images:=20Updated?=
 =?utf8?q?=20somdevices-multimedia,=20somdevices-full=20and=20somdevices-q?=
 =?utf8?q?t5-validation:=20=09=C2=B7=20somdevices-multimedia:=20Removed=20?=
 =?utf8?q?some=20packages.=20=09=C2=B7=20somdevices-full:=20Added=20qt5=20?=
 =?utf8?q?packages.=20=09=C2=B7=20somdevices-qt5-validation:=20Added=20som?=
 =?utf8?q?devices-multimedia=20previous=20packages=20and=20removed=20other?=
 =?utf8?q?=20packages.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Josep Orga <jorga@somdevices.com>
---
 recipes-somdevices/images/somdevices-full.bb  |  7 +--
 .../images/somdevices-multimedia.bb           | 28 +-----------
 .../images/somdevices-qt5-validation.bb       | 45 +++++++++----------
 3 files changed, 25 insertions(+), 55 deletions(-)

diff --git a/recipes-somdevices/images/somdevices-full.bb b/recipes-somdevices/images/somdevices-full.bb
index b4fa2fd..bf02b96 100644
--- a/recipes-somdevices/images/somdevices-full.bb
+++ b/recipes-somdevices/images/somdevices-full.bb
@@ -1,6 +1,5 @@
-# Copyright (C) 2015 Freescale Semiconductor
-# Copyright 2017-2019 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "SOMDEVICES Image - Add Qt5"
+LICENSE = "MIT"
 
 require somdevices-multimedia.bb
 
@@ -19,4 +18,6 @@ OPENCV_PKGS_append_imxgpu = " \
 IMAGE_INSTALL += " \
     ${OPENCV_PKGS} \
     ${ML_PKGS} \
+    packagegroup-qt5-imx \
+    packagegroup-qt5-toolchain-target \
 "
diff --git a/recipes-somdevices/images/somdevices-multimedia.bb b/recipes-somdevices/images/somdevices-multimedia.bb
index 8ea7904..2100667 100644
--- a/recipes-somdevices/images/somdevices-multimedia.bb
+++ b/recipes-somdevices/images/somdevices-multimedia.bb
@@ -1,29 +1,10 @@
 # Copyright (C) 2015 Freescale Semiconductor
-# Copyright 2017-2019 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "NXP Image to validate i.MX machines. \
-This image contains everything used to test i.MX machines including GUI, \
-demos and lots of applications. This creates a very large image, not \
-suitable for production."
+DESCRIPTION = "SOMDEVICES Image - Add multimedia functionalities"
 LICENSE = "MIT"
 
 require somdevices-minimal.bb
 
-### WARNING: This image is NOT suitable for production use and is intended
-###          to provide a way for users to reproduce the image used during
-###          the validation process of i.MX BSP releases.
-
-## Select Image Features
 IMAGE_FEATURES += " \
-    debug-tweaks \
-    tools-profile \
-    package-management \
-    splash \
-    nfs-server \
-    tools-debug \
-    ssh-server-dropbear \
-    tools-testapps \
     hwcodecs \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base x11-sato', \
@@ -33,13 +14,6 @@ ERPC_COMPS ?= ""
 ERPC_COMPS_append_mx7ulp = "packagegroup-imx-erpc"
 
 CORE_IMAGE_EXTRA_INSTALL += " \
-    packagegroup-core-full-cmdline \
-    packagegroup-tools-bluetooth \
-    packagegroup-fsl-tools-audio \
-    packagegroup-fsl-tools-gpu \
-    packagegroup-fsl-tools-gpu-external \
-    packagegroup-fsl-tools-testapps \
-    packagegroup-fsl-tools-benchmark \
     packagegroup-fsl-gstreamer1.0 \
     packagegroup-fsl-gstreamer1.0-full \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)} \
diff --git a/recipes-somdevices/images/somdevices-qt5-validation.bb b/recipes-somdevices/images/somdevices-qt5-validation.bb
index 53caa1d..02663fe 100644
--- a/recipes-somdevices/images/somdevices-qt5-validation.bb
+++ b/recipes-somdevices/images/somdevices-qt5-validation.bb
@@ -1,32 +1,29 @@
-DESCRIPTION = "NXP Image - Adds Qt5"
+DESCRIPTION = "SOMDEVICES Image - Add test functionalities"
 LICENSE = "MIT"
 
 require somdevices-full.bb
 
-IMAGE_INSTALL += " \
-    packagegroup-qt5-imx \
-    packagegroup-qt5-webengine \
-    packagegroup-qt5-toolchain-target \
-    sshd \
-    python-pyserial \
+IMAGE_FEATURES += " \
+    debug-tweaks \
+    tools-profile \
+    package-management \
+    splash \
+    nfs-server \
+    tools-debug \
+    ssh-server-dropbear \
+    tools-testapps \
+"
+
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-core-full-cmdline \
+    packagegroup-tools-bluetooth \
+    packagegroup-fsl-tools-audio \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-gpu-external \
+    packagegroup-fsl-tools-testapps \
+    packagegroup-fsl-tools-benchmark \
     dhcp-client \
-    iw \
-    wpa-supplicant \
-    i2c-tools \
     alsa-utils \
-    ppp \
-    tzdata \
-    python-six \
-    bluez5 \
-    iproute2 \
-    can-utils \
-    python-future \
-    python-pprint \
-    python-difflib \
-    python-modules \
-    python-requests \
-    usb-modeswitch \
-    avahi-utils \
     cmake \
     libogg \
     protobuf \
@@ -37,9 +34,7 @@ IMAGE_INSTALL += " \
     vorbis-tools \
     tremor \
     nodejs \
-    hostapd \
     nodejs-npm \
-    python-pip \
     dnsmasq \
     packagegroup-sdk-target \
     qtwebkit \
-- 
2.17.1