diff options
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/gpe-image.bb | 33 | ||||
| -rw-r--r-- | packages/meta/meta-gpe.bb | 14 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 1 | ||||
| -rw-r--r-- | packages/meta/ucslugc-native.bb | 6 |
4 files changed, 37 insertions, 17 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 9824134862..1e75c49413 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 = "r19" export IMAGE_BASENAME = "gpe-image" @@ -13,19 +13,30 @@ 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_THEMES}" +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_THEMES}" +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_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ + gpe-theme-clearlooks \ + gpe-filemanager \ + gpe-nmf \ + figment \ +",d)}' + + +GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ + gpe-task-connectivity \ + ${GPE_BIGFLASH_DEPENDS} \ +",d)}' + +GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS} +GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL} GPE_EXTRA_DEPENDS_none = "" GPE_EXTRA_INSTALL_none = "" diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index c23031d20f..8e09472c5b 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 = "r41" ALLOW_EMPTY = "1" @@ -13,6 +13,7 @@ RDEPENDS_gpe-base-depends := "${gpe-base-depends}" DEPENDS += " ${gpe-base-depends}" gpe-task-base = "\ + gpe-bootsplash \ bluez-utils-dbus \ matchbox \ xcursor-transparent-theme \ @@ -103,6 +104,15 @@ gpe-task-games = "\ RDEPENDS_gpe-task-games := "${gpe-task-games}" DEPENDS += " ${gpe-task-games}" +gpe-task-connectivity = "\ + gpe-mini-browser \ + gaim \ + linphone-hh" + +RDEPENDS_gpe-task-connectivity := "${gpe-task-connectivity}" +DEPENDS += " ${gpe-task-connectivity}" + + DEPENDS += "matchbox-themes-extra" LICENSE = "MIT" diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7be2072040..4fa516f582 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -131,6 +131,7 @@ OPENSLUG_PACKAGES = "\ wget \ xinetd \ yp-tools ypbind ypserv \ + zd1211 \ zlib \ " diff --git a/packages/meta/ucslugc-native.bb b/packages/meta/ucslugc-native.bb index c878f31562..019ea7a5c3 100644 --- a/packages/meta/ucslugc-native.bb +++ b/packages/meta/ucslugc-native.bb @@ -9,8 +9,8 @@ PACKAGES = "${PN}" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. UCSLUGC_NATIVE_RT_prepend_linux = "\ - glibc-utils \ - libc6-dev \ + glibc-extra-nss glibc-utils \ + libc6 libc6-dev \ " UCSLUGC_NATIVE_RT_prepend_linux-uclibc = "\ uclibc-dev uclibc-utils \ @@ -33,8 +33,6 @@ UCSLUGC_NATIVE_RT = "\ # Run-time and DEPENDS UCSLUGC_NATIVE_prepend_linux = "\ - glibc-extra-nss \ - libc6 \ " UCSLUGC_NATIVE_prepend_linux-uclibc = "\ libiconv \ |