diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-30 13:58:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:52:58 +0100 |
| commit | 07db74000443c473db401df598c4654fa6660436 (patch) | |
| tree | 720885249bc800245bbee06834dd9cac35ba4ae0 /meta/recipes-qt | |
| parent | 8eba44660e495702fc68244fba64b6f08c1c9418 (diff) | |
| download | ast2050-yocto-poky-07db74000443c473db401df598c4654fa6660436.zip ast2050-yocto-poky-07db74000443c473db401df598c4654fa6660436.tar.gz | |
packagegroup-qt4e: tidy up and rename
* Eliminate the -base package, there's only one package and it might as
well be the main one.
* Rename to packagegroup-core-qt4e to match other package group recipes
* Fix and tidy up qt4e-demo-image at the same time
(From OE-Core rev: 9dddc9dfdc84401fee3b48eb3aba0cabdcf4d05a)
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')
| -rw-r--r-- | meta/recipes-qt/images/qt4e-demo-image.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb (renamed from meta/recipes-qt/packagegroups/packagegroup-qt4e.bb) | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 205c912..9e8b337 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb @@ -1,19 +1,13 @@ DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." LICENSE = "MIT" -PR="r2" +PR = "r3" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS += "packagegroup-qt4e" - -RDEPENDS_${PN} += " \ - packagegroup-qt4e-base \ - " - IMAGE_INSTALL += "\ ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-qt4e-base \ + packagegroup-core-qt4e \ " inherit core-image diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb index 2ee7959..2ea9c2e 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb @@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 inherit packagegroup -PACKAGES = "${PN}-base" - TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' -RDEPENDS_${PN}-base = " \ +RDEPENDS_${PN} = " \ qt4-embedded \ libqt-embedded3support4 \ libqt-embeddedclucene4 \ @@ -48,7 +46,7 @@ RDEPENDS_${PN}-base = " \ qt4-embedded-assistant \ " -RRECOMMENDS_${PN}-base = " \ +RRECOMMENDS_${PN} = " \ libqt-embeddedxmlpatterns4 \ " |
