From: Koen Kooi <koen@openembedded.org>
Date: Mon, 17 Nov 2008 17:31:11 +0000 (+0100)
Subject: sugar-image: remove x11-image remnants
X-Git-Tag: Release-2010-05/1~5281
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9be688c0077b58ddec61fa2ea82a22004319e09;p=openembedded.git

sugar-image: remove x11-image remnants
---

diff --git a/packages/images/sugar-image.bb b/packages/images/sugar-image.bb
index af64e3d062..4dbc1671af 100644
--- a/packages/images/sugar-image.bb
+++ b/packages/images/sugar-image.bb
@@ -1,9 +1,6 @@
-ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
-			  " 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-export IMAGE_BASENAME = "x11-image"
+export IMAGE_BASENAME = "sugar-image"
 
 DEPENDS = "task-base"
 IMAGE_INSTALL = "\