diff options
| -rw-r--r-- | packages/meta/gpe-image.bb | 28 | ||||
| -rw-r--r-- | packages/meta/meta-gpe.bb | 9 |
2 files changed, 24 insertions, 13 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 9824134862..ccc6d53b3e 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -4,7 +4,7 @@ FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${D gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" -PR = "r17" +PR = "r18" export IMAGE_BASENAME = "gpe-image" @@ -13,19 +13,25 @@ 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 = "gtk-theme-industrial matchbox-themes-extra-industrial" +GPE_EXTRA_THEMES = "gpe-theme-industrial" -#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone" -#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" -GPE_EXTRA_DEPENDS_bigscreen = "figment" -GPE_EXTRA_INSTALL_bigscreen = " figment gpe-task-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_DEPENDS_bigscreen = "" +GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" -GPE_EXTRA_DEPENDS_smallscreen = "gpe-mini-browser figment linphone-hh" -GPE_EXTRA_INSTALL_smallscreen = "gpe-mini-browser figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_DEPENDS_smallscreen = "" +GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" -#h3900 has 32mb of *useable* flash -#GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe " -#GPE_EXTRA_INSTALL_append_h3900 = " vlc-gpe " +#ship more stuff with devices with >16MB of flash +GPE_BIGFLASH := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ + gpe-theme-clearlooks \ + gpe-filemanager \ + gpe-nmf \ + gpe-task-connectivity \ + figment \ +",d)}' + +GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH} +GPE_EXTRA_INSTALL += ${GPE_BIGFLASH} GPE_EXTRA_DEPENDS_none = "" GPE_EXTRA_INSTALL_none = "" diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index c23031d20f..8d9d9f6dc0 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,7 +1,7 @@ -PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games +PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r38" +PR = "r39" ALLOW_EMPTY = "1" @@ -100,6 +100,11 @@ gpe-task-games = "\ gsoko \ xdemineur" +gpe-task-connectivity = "\ + gpe-mini-browser \ + gaim \ + linphone-hh" + RDEPENDS_gpe-task-games := "${gpe-task-games}" DEPENDS += " ${gpe-task-games}" |