diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-01-18 10:59:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-18 10:59:59 +0000 |
| commit | 3d3c02597e3e07fa1150ed6117f1134fc93784bf (patch) | |
| tree | 70088f9fd8e78cd53e98d7332ddb5a0e972b63b9 /packages/meta/gpe-image.bb | |
| parent | b8b4281b33aa1bfd9125092d113e674905381c3b (diff) | |
| parent | 43cd3c0c6b338107c3540233600f2a0bf16854e1 (diff) | |
merge of 6140847fcfac52c881f2bf65906299e435571b8f
and 9c6d2f9ed3be4745760b4dcd14811587f4acd623
Diffstat (limited to 'packages/meta/gpe-image.bb')
| -rw-r--r-- | packages/meta/gpe-image.bb | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 572eef2230..a53c4d4dc0 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -8,44 +8,31 @@ PR = "r19" export IMAGE_BASENAME = "gpe-image" -GUI_MACHINE_CLASS ?= "none" - -GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}" -GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" - GPE_EXTRA_THEMES = "gpe-theme-industrial" -GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_none = "" GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" - -GPE_EXTRA_DEPENDS_smallscreen = "${GPE_EXTRA_THEMES}" GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" -#ship more stuff with devices with >16MB of flash -GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ - gpe-theme-clearlooks \ - figment \ -",d)}' - +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" +#ship more stuff with devices with >16MB of flash GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ - gpe-task-connectivity \ - ${GPE_BIGFLASH_DEPENDS} \ + gpe-task-connectivity \ + gpe-theme-clearlooks \ + figment \ ",d)}' -GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS} GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL} -GPE_EXTRA_DEPENDS_none = "" -GPE_EXTRA_INSTALL_none = "" - XSERVER ?= "xserver-kdrive-fbdev" -DEPENDS = "task-bootstrap \ - meta-gpe \ - ${GPE_EXTRA_DEPENDS}" +DEPENDS = "task-bootstrap task-gpe" +RDEPENDS = "${IPKG_INSTALL}" -RDEPENDS = "\ +export IPKG_INSTALL = "\ + task-bootstrap \ gpe-task-base \ gpe-task-pim \ gpe-task-settings \ @@ -53,12 +40,6 @@ RDEPENDS = "\ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -export IPKG_INSTALL = "task-bootstrap gpe-task-base \ - gpe-task-pim gpe-task-settings \ - gpe-task-apps ${GPE_EXTRA_DEPENDS} \ - ${XSERVER} \ - ${GPE_EXTRA_INSTALL}" - #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk |