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/packagegroups | |
parent | 8eba44660e495702fc68244fba64b6f08c1c9418 (diff) | |
download | 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/packagegroups')
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb (renamed from meta/recipes-qt/packagegroups/packagegroup-qt4e.bb) | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb index 2ee7959c0c..2ea9c2e551 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 | |||
7 | 7 | ||
8 | inherit packagegroup | 8 | inherit packagegroup |
9 | 9 | ||
10 | PACKAGES = "${PN}-base" | ||
11 | |||
12 | TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' | 10 | TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' |
13 | 11 | ||
14 | RDEPENDS_${PN}-base = " \ | 12 | RDEPENDS_${PN} = " \ |
15 | qt4-embedded \ | 13 | qt4-embedded \ |
16 | libqt-embedded3support4 \ | 14 | libqt-embedded3support4 \ |
17 | libqt-embeddedclucene4 \ | 15 | libqt-embeddedclucene4 \ |
@@ -48,7 +46,7 @@ RDEPENDS_${PN}-base = " \ | |||
48 | qt4-embedded-assistant \ | 46 | qt4-embedded-assistant \ |
49 | " | 47 | " |
50 | 48 | ||
51 | RRECOMMENDS_${PN}-base = " \ | 49 | RRECOMMENDS_${PN} = " \ |
52 | libqt-embeddedxmlpatterns4 \ | 50 | libqt-embeddedxmlpatterns4 \ |
53 | " | 51 | " |
54 | 52 | ||