From: rjt@cambridgebroadband.com Date: Thu, 2 Dec 2004 13:44:22 +0000 (+0000) Subject: Merge oe-devel@oe-devel.bkbits.net:packages X-Git-Tag: Release-2010-05/1~15813 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4c0979ac146033230f435a877b824bf1f4d3768;p=openembedded.git Merge oe-devel@oe-devel.bkbits.net:packages into flotta.cambridgebroadband.com:/development/openembedded/packages 2004/12/02 13:43:35+00:00 cambridgebroadband.com!rjt fixed GPE_EXTRA_* usage in tosa and zauras-pxa confs BKrev: 41af1c36SwEZAcCpRqlsc_NfXGjztQ --- diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 0868abf9a2..b44fb1b43c 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS = "gaim" +GPE_EXTRA_DEPENDS += "gaim" include conf/machine/handheld-common.conf # not using tune-xscale.conf so as to retain backwards compatibility diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf index 94d63bf3a6..a7b5efddee 100644 --- a/conf/machine/zaurus-pxa.conf +++ b/conf/machine/zaurus-pxa.conf @@ -18,8 +18,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS = "gaim sylpheed" -GPE_EXTRA_INSTALL = "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim sylpheed" +GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/handheld-common.conf # not using tune-xscale.conf so as to retain backwards compatibility