diff --git a/meta-digi-del/classes/del-image.bbclass b/meta-digi-del/classes/del-image.bbclass index a620e3cd0..2a8c148a0 100644 --- a/meta-digi-del/classes/del-image.bbclass +++ b/meta-digi-del/classes/del-image.bbclass @@ -8,6 +8,7 @@ PACKAGE_GROUP_del-network = "packagegroup-del-network" PACKAGE_GROUP_del-wireless = "packagegroup-del-wireless" PACKAGE_GROUP_del-debug = "packagegroup-del-debug" PACKAGE_GROUP_del-bluetooth = "packagegroup-del-bluetooth" +PACKAGE_GROUP_del-qt = "packagegroup-del-qt" ## DEL rootfs final tuning del_rootfs_tuning() { diff --git a/meta-digi-del/recipes-core/images/del-image-graphical.bb b/meta-digi-del/recipes-core/images/del-image-graphical.bb index 4595b223d..70ba8053f 100644 --- a/meta-digi-del/recipes-core/images/del-image-graphical.bb +++ b/meta-digi-del/recipes-core/images/del-image-graphical.bb @@ -11,44 +11,15 @@ VIRTUAL-RUNTIME_dev_manager = "udev" include del-image-minimal.bb -IMAGE_INSTALL += "packagegroup-core-x11-sato-games" - -#IMAGE_FEATURES += "debug-tweaks" DISTRO_FEATURES += "pulseaudio" WEB = "web-webkit" -SOC_EXTRA_IMAGE_FEATURES ?= "tools-testapps" - -# mesa-demos is currently broken when building with other GL library -# so we avoid it by now and tools-testapps includes it. -SOC_EXTRA_IMAGE_FEATURES_mx5 = "" -SOC_EXTRA_IMAGE_FEATURES_mx6 = "" - -# Add extra image features -EXTRA_IMAGE_FEATURES += " \ - ${SOC_EXTRA_IMAGE_FEATURES} \ - nfs-server \ - tools-debug \ - tools-profile \ - qt4-pkgs \ -" - SOC_IMAGE_INSTALL = "" -SOC_IMAGE_INSTALL_mx5 = "glcubes-demo" - -# TODO: test the following -# packagegroup-fsl-tools-testapps \ -# packagegroup-fsl-tools-benchmark \ -# packagegroup-qt-in-use-demos \ +SOC_IMAGE_INSTALL_mx5 = "amd-gpu-x11-bin-mx51" IMAGE_INSTALL += " \ - ${SOC_IMAGE_INSTALL} \ - cpufrequtils \ - nano \ - qt4-plugin-phonon-backend-gstreamer \ - qt4-demos \ - qt4-examples \ - fsl-gui-extrafiles \ + ${SOC_IMAGE_INSTALL} \ + pointercal-xinput \ " export IMAGE_BASENAME = "del-image-graphical" diff --git a/meta-digi-del/recipes-graphics/packagegroups/packagegroup-del-qt.bb b/meta-digi-del/recipes-graphics/packagegroups/packagegroup-del-qt.bb new file mode 100644 index 000000000..a6ac49689 --- /dev/null +++ b/meta-digi-del/recipes-graphics/packagegroups/packagegroup-del-qt.bb @@ -0,0 +1,28 @@ +# +# Copyright (C) 2013 Digi International. +# +DESCRIPTION = "QT packagegroup for DEL image" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +PACKAGE_ARCH = "${MACHINE_ARCH}" +ALLOW_EMPTY = "1" +PR = "r0" + +inherit packagegroup + +# TODO: test the following +# packagegroup-fsl-tools-testapps \ +# packagegroup-fsl-tools-benchmark \ +# packagegroup-qt-in-use-demos \ + + +RDEPENDS_${PN} = "\ + qt4-pkgs \ + qt4-plugin-phonon-backend-gstreamer \ + qt4-demos \ + qt4-examples \ + fsl-gui-extrafiles \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" + +RRECOMMENDS_${PN} = "\ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"