aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-30 14:48:06 +0100
committerSaul Wold <sgw@linux.intel.com>2012-09-03 22:52:51 -0700
commitb3a49ebaa2149ac66e7d82b63dd29a83f6d96429 (patch)
treeb0461ff2a7f577c2ffef73e9c5b959c730967968
parent9dddc9dfdc84401fee3b48eb3aba0cabdcf4d05a (diff)
downloadopenembedded-core-contrib-b3a49ebaa2149ac66e7d82b63dd29a83f6d96429.tar.gz
packagegroup-core-gtk-directfb: remove superfluous -base package
There's only one package, just make it the main one; also update core-image-gtk-directfb to match and tidy it up a bit. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/images/core-image-gtk-directfb.bb8
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb4
2 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
index 868b3097f2..05f03cdcef 100644
--- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
@@ -6,18 +6,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS += "packagegroup-core-gtk-directfb"
-
-RDEPENDS_${PN} += " \
- packagegroup-core-gtk-directfb-base \
- "
-
inherit core-image
IMAGE_INSTALL += "\
${CORE_IMAGE_BASE_INSTALL} \
packagegroup-core-basic \
- packagegroup-core-gtk-directfb-base \
+ packagegroup-core-gtk-directfb \
"
python __anonymous () {
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 0c47b6fbcd..2f35b34ca5 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.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} = " \
directfb \
directfb-examples \
pango \