3 files changed, 14 insertions, 78 deletions

diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
deleted file mode 100644
index 4a7f172..0000000
--- a/recipes/images/b2qt-embedded-image.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-DESCRIPTION = "B2Qt on embedded Linux SDK image"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-PR = "r0"
-
-IMAGE_FEATURES += "\
-        package-management \
-        ssh-server-dropbear \
-        tools-debug \
-        debug-tweaks \
-        hwcodecs \
-        "
-
-inherit core-image
-inherit bootfs-image
-
-IMAGE_INSTALL += "\
-    packagegroup-b2qt-embedded-base \
-    packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
-    "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 55394d6..b5bb73d 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -33,42 +33,24 @@ PR = "r0"
 
 inherit packagegroup
 
+MACHINE_EXTRA_INSTALL ?= ""
+
 RDEPENDS_${PN} = "\
         kernel-modules \
-        adbd \
-        openssh-sftp-server \
-        openssl \
+        linux-firmware \
         openssl-misc \
-        libpng \
-        tiff \
-        libxslt \
-        icu \
-        freetype \
-        fontconfig \
-        liberation-fonts \
-        tslib \
-        tslib-calibrate \
-        alsa-utils-amixer \
-        hunspell \
         ca-certificates \
-        linux-firmware \
+        liberation-fonts \
         ttf-devanagari \
         ttf-opensans \
         ttf-dejavu-common \
         ttf-dejavu-sans \
-        dbus-session-init \
         otf-noto \
-        libmysqlclient \
-        libpq \
+        dbus-session-init \
         tzdata \
         tzdata-americas \
         tzdata-asia \
         tzdata-europe \
-        atk \
-        libevent \
-        ostree \
-        dracut \
         connman \
-        ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
         ${MACHINE_EXTRA_INSTALL} \
         "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 17b278c..82f67b0 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -34,15 +34,19 @@ PR = "r0"
 inherit packagegroup
 
 RDEPENDS_${PN} = "\
-        ldd \
+        adbd \
+        alsa-utils-amixer \
         binutils \
         binutils-symlinks \
-        i2c-tools \
-        perf \
-        htop \
-        ntp \
         connman-client \
+        htop \
+        i2c-tools \
         iproute2 \
+        ldd \
+        ntp \
+        openssh-sftp-server \
+        perf \
         rsync \
+        tslib-calibrate \
         ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
         "