[OE-core] [PATCH 13/28] packagegroup-qt4e: tidy up and rename
Paul Eggleton
paul.eggleton at linux.intel.com
Mon Sep 3 10:30:33 UTC 2012
* 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
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
meta/recipes-qt/images/qt4e-demo-image.bb | 10 ++--------
...kagegroup-qt4e.bb => packagegroup-core-qt4e.bb} | 6 ++----
2 files changed, 4 insertions(+), 12 deletions(-)
rename meta/recipes-qt/packagegroups/{packagegroup-qt4e.bb => packagegroup-core-qt4e.bb} (94%)
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
similarity index 94%
rename from meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
rename to 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 \
"
--
1.7.9.5
More information about the Openembedded-core
mailing list