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.tar.gz
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 1c53a9ce2a..a3c275fd97 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
2 2
3DESCRIPTION = "Host packages for Qt Embedded SDK" 3DESCRIPTION = "Host packages for Qt Embedded SDK"
4LICENSE = "MIT" 4LICENSE = "MIT"
5ALLOW_EMPTY = "1"
6 5
7RDEPENDS_${PN} += "nativesdk-qt4-tools" 6RDEPENDS_${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 4fe07c654e..ec5e94bf76 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
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r3" 9PR = "r3"
10 10
11PACKAGES = "\ 11inherit packagegroup
12 packagegroup-core-qt-demos \
13 packagegroup-core-qt-demos-dbg \
14 packagegroup-core-qt-demos-dev \
15 "
16 12
17ALLOW_EMPTY = "1" 13PACKAGES = "${PN}-demos"
18 14
19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" 15QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
20#QTDEMOS_disabled = "fotowall"
21 16
22RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}" 17RDEPENDS_${PN}-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index 4b6d6a70c1..2ee7959c0c 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
7 7
8inherit packagegroup 8inherit packagegroup
9 9
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 10PACKAGES = "${PN}-base"
11 11
12PACKAGES += " \ 12TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
13 ${PN}-base \
14"
15 13
16RDEPENDS_${PN}-base = " \ 14RDEPENDS_${PN}-base = " \
17 qt4-embedded \ 15 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 abd6a1fcbe..61466d910b 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 @@
1DESCRIPTION = "Target packages for Qt Embedded SDK" 1DESCRIPTION = "Target packages for Qt Embedded SDK"
2LICENSE = "MIT" 2LICENSE = "MIT"
3ALLOW_EMPTY = "1"
4 3
5PR = "r5" 4PR = "r5"
6 5
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9 8
9inherit packagegroup
10
11PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
12
10RDEPENDS_${PN} += " \ 13RDEPENDS_${PN} += " \
11 packagegroup-core-standalone-sdk-target \ 14 packagegroup-core-standalone-sdk-target \
12 qt4-embedded-mkspecs \ 15 qt4-embedded-mkspecs \