From 0975201e0a0e09ec878b210aa461949a3da9c32e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Mar 2014 11:58:10 +0200 Subject: use package groups for image content Move installed packages from image recipe to separate package group recipes Change-Id: I0417953da4bc92438b3201b38b43f6d1784f1f17 Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 1 + recipes/images/b2qt-embedded-image.bb | 50 ++-------------------- .../packagegroup-b2qt-embedded-base.bb | 48 +++++++++++++++++++++ .../packagegroup-b2qt-embedded-gstreamer.bb | 42 ++++++++++++++++++ .../packagegroup-b2qt-embedded-tools.bb | 33 ++++++++++++++ 5 files changed, 128 insertions(+), 46 deletions(-) create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-base.bb create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index cde0b02..baaf998 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -46,3 +46,4 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" +MACHINE_EXTRA_INSTALL ?= "" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index a9ec3bf..4b492cd 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -34,50 +34,8 @@ IMAGE_FEATURES += "\ inherit core-image -EXTRA_IMAGEDEPENDS_mx6 += "u-boot-script-boundary" - -MACHINE_EXTRA_INSTALL ?= "" - -GSTREAMER_EXTRA_INSTALL = "\ - gst-meta-video \ - gst-meta-audio \ - gst-plugins-good \ - gst-plugins-base-app \ - gst-plugins-good-videofilter \ - gst-plugins-good-id3demux \ - gst-plugins-good-auparse \ - gst-plugins-good-isomp4 \ - gst-plugins-ugly-rmdemux \ - gst-plugins-ugly-asf \ - gst-plugins-ugly-a52dec \ - gst-ffmpeg \ - " - -TOOLS_EXTRA_INSTALL = "\ - adbd \ - ldd \ - binutils \ - binutils-symlinks \ - " - IMAGE_INSTALL += "\ - kernel-modules \ - psplash \ - openssh-sftp-server \ - openssl \ - libpng \ - jpeg \ - tiff \ - libxslt \ - icu \ - freetype \ - fontconfig \ - liberation-fonts \ - tslib \ - tslib-calibrate \ - alsa-utils-amixer \ - hunspell \ - ${GSTREAMER_EXTRA_INSTALL} \ - ${TOOLS_EXTRA_INSTALL} \ - ${MACHINE_EXTRA_INSTALL} \ - " + packagegroup-b2qt-embedded-base \ + packagegroup-b2qt-embedded-tools \ + packagegroup-b2qt-embedded-gstreamer \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb new file mode 100644 index 0000000..f518430 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -0,0 +1,48 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + kernel-modules \ + adbd \ + psplash \ + openssh-sftp-server \ + openssl \ + libpng \ + jpeg \ + tiff \ + libxslt \ + icu \ + freetype \ + fontconfig \ + liberation-fonts \ + tslib \ + tslib-calibrate \ + alsa-utils-amixer \ + hunspell \ + ${MACHINE_EXTRA_INSTALL} \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb new file mode 100644 index 0000000..f6a8a54 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -0,0 +1,42 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + gst-meta-video \ + gst-meta-audio \ + gst-plugins-good \ + gst-plugins-base-app \ + gst-plugins-good-videofilter \ + gst-plugins-good-id3demux \ + gst-plugins-good-auparse \ + gst-plugins-good-isomp4 \ + gst-plugins-ugly-rmdemux \ + gst-plugins-ugly-asf \ + gst-plugins-ugly-a52dec \ + gst-ffmpeg \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb new file mode 100644 index 0000000..61ca211 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + ldd \ + binutils \ + binutils-symlinks \ + " -- cgit v1.2.3-54-g00ecf