diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-01-18 10:54:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-18 10:54:38 +0000 |
| commit | ec51545a229f2400954e6ef1680d9874f8bc32b6 (patch) | |
| tree | b53cc2dd34edfad867cdfd122c7612bd847a8200 /conf | |
| parent | d5d23d6428b7ea36bc88ab0216f46fa5fc8675d4 (diff) | |
| parent | 43cd3c0c6b338107c3540233600f2a0bf16854e1 (diff) | |
merge of 70c6a809b479d2c6e6e5eaaffd412be3c60d71f3
and 9c6d2f9ed3be4745760b4dcd14811587f4acd623
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.conf | 1 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 1 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 1 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 1 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 1 | ||||
| -rw-r--r-- | conf/machine/tosa.conf | 2 |
6 files changed, 1 insertions, 6 deletions
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index e4d7616510..ec10cd5e4e 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -12,7 +12,6 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge" GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge" include conf/machine/include/handheld-common.conf diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index e502a12dc2..0c432ad674 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -24,7 +24,6 @@ include conf/machine/include/ipaq-common.conf include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim" GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index abcf9d2de7..bcad9ccbe0 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -16,7 +16,6 @@ TARGET_VENDOR = "-oe" PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista" IMAGE_FSTYPE = "ext2" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword" GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 7b9a24ba0c..d022d8703a 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -11,7 +11,6 @@ XSERVER = "xserver-kdrive-omap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib" GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 30444c1533..eb44107ecd 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -37,7 +37,6 @@ USE_DEVFS = "1" GUI_MACHINE_CLASS = "bigscreen" ROOT_FLASH_SIZE = "24" USE_VT = "0" -GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop" GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop" include conf/machine/include/handheld-common.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index a4bdba8675..b573f5721d 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -15,7 +15,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE EXTRA_IMAGEDEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim" +GPE_EXTRA_INSTALL += "gaim" ROOT_FLASH_SIZE = "28" include conf/machine/include/handheld-common.conf |