diff options
| author | Phil Blundell <philb@gnu.org> | 2004-08-30 09:24:04 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-08-30 09:24:04 +0000 |
| commit | 8c85273711381aa281c013fb509cfb6c13d6cba5 (patch) | |
| tree | 8ca7e33f4f5785d20c328492e31d73e4ad233869 | |
| parent | d1d4538b3f6f689930397976de3e5a1c34ce4f34 (diff) | |
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
| -rw-r--r-- | conf/zaurus-pxa.conf | 1 | ||||
| -rw-r--r-- | meta/gpe-image.oe | 4 |
2 files changed, 3 insertions, 2 deletions
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" |