From: Phil Blundell <philb@gnu.org>
Date: Mon, 30 Aug 2004 09:24:04 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17454
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c85273711381aa281c013fb509cfb6c13d6cba5;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages

2004/08/30 10:23:50+01:00 (none)!pb
add gaim to gpe-image for zaurus-pxa

BKrev: 4132f234YJsJf5seyUHsQpvdZHBbjQ
---

diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index 0fdb294baf..41e9e76e27 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -18,6 +18,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 	           ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
 GPE_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS = "gaim"
 
 include conf/handheld-common.conf
 # not using tune-xscale.conf so as to retain backwards compatibility
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 15bc3d377a..0f70ef7a41 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -2,8 +2,8 @@ export IMAGE_BASENAME = "gpe-image"
 
 GPE_MACHINE_CLASS ?= "none"
 
-GPE_EXTRA_DEPENDS ?= "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL ?= "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
 
 GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
 GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"