summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/packagegroups
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-26 18:16:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:52:57 +0100
commit9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2 (patch)
tree43b3913030dff1ed7d0949bc1adc13df60a7f2ed /meta/recipes-qt/packagegroups
parent073a12c9cbedd210499835d608d98005251f7d6a (diff)
downloadpoky-9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2.zip
poky-9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2.tar.gz
poky-9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2.tar.bz2
packagegroup-*: change to inherit from packagegroup.bbclass
Also clean out items already handled by that class (dev/dbg packages, ALLOW_EMPTY, etc.) (From OE-Core rev: 65fca4458cfe1d647c7ea1d4588dc449739a73eb) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/packagegroups')
-rw-r--r--meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb1
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt.bb11
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt4e.bb6
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb5
4 files changed, 9 insertions, 14 deletions
diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 1c53a9c..a3c275f 100644
--- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
+++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
@@ -2,6 +2,5 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
DESCRIPTION = "Host packages for Qt Embedded SDK"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
RDEPENDS_${PN} += "nativesdk-qt4-tools"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 4fe07c6..ec5e94b 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -8,15 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r3"
-PACKAGES = "\
- packagegroup-core-qt-demos \
- packagegroup-core-qt-demos-dbg \
- packagegroup-core-qt-demos-dev \
- "
+inherit packagegroup
-ALLOW_EMPTY = "1"
+PACKAGES = "${PN}-demos"
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
-#QTDEMOS_disabled = "fotowall"
-RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}"
+RDEPENDS_${PN}-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index 4b6d6a7..2ee7959 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit packagegroup
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+PACKAGES = "${PN}-base"
-PACKAGES += " \
- ${PN}-base \
-"
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
RDEPENDS_${PN}-base = " \
qt4-embedded \
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index abd6a1f..61466d9 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
@@ -1,12 +1,15 @@
DESCRIPTION = "Target packages for Qt Embedded SDK"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
PR = "r5"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
RDEPENDS_${PN} += " \
packagegroup-core-standalone-sdk-target \
qt4-embedded-mkspecs \