summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-30 13:58:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:52:58 +0100
commit07db74000443c473db401df598c4654fa6660436 (patch)
tree720885249bc800245bbee06834dd9cac35ba4ae0
parent8eba44660e495702fc68244fba64b6f08c1c9418 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-qt/images/qt4e-demo-image.bb10
-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 205c912168..9e8b3379ff 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -1,19 +1,13 @@
1DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." 1DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt."
2LICENSE = "MIT" 2LICENSE = "MIT"
3PR="r2" 3PR = "r3"
4 4
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8DEPENDS += "packagegroup-qt4e"
9
10RDEPENDS_${PN} += " \
11 packagegroup-qt4e-base \
12 "
13
14IMAGE_INSTALL += "\ 8IMAGE_INSTALL += "\
15 ${CORE_IMAGE_BASE_INSTALL} \ 9 ${CORE_IMAGE_BASE_INSTALL} \
16 packagegroup-qt4e-base \ 10 packagegroup-core-qt4e \
17" 11"
18 12
19inherit core-image 13inherit core-image
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
8inherit packagegroup 8inherit packagegroup
9 9
10PACKAGES = "${PN}-base"
11
12TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
13 11
14RDEPENDS_${PN}-base = " \ 12RDEPENDS_${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
51RRECOMMENDS_${PN}-base = " \ 49RRECOMMENDS_${PN} = " \
52 libqt-embeddedxmlpatterns4 \ 50 libqt-embeddedxmlpatterns4 \
53" 51"
54 52