From 65fca4458cfe1d647c7ea1d4588dc449739a73eb Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 26 Jul 2012 18:16:14 +0100 Subject: packagegroup-*: change to inherit from packagegroup.bbclass Also clean out items already handled by that class (dev/dbg packages, ALLOW_EMPTY, etc.) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold --- .../nativesdk-packagegroup-qte-toolchain-host.bb | 1 - meta/recipes-qt/packagegroups/packagegroup-core-qt.bb | 11 +++-------- meta/recipes-qt/packagegroups/packagegroup-qt4e.bb | 6 ++---- .../packagegroups/packagegroup-qte-toolchain-target.bb | 5 ++++- 4 files changed, 9 insertions(+), 14 deletions(-) (limited to 'meta/recipes-qt/packagegroups') 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 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 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 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 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 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 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 @@ 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 \ -- cgit 1.2.3-korg