aboutsummaryrefslogtreecommitdiffstats
path: root/packages/meta/gpe-image.bb
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-10-06 15:16:41 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-10-06 15:16:41 +0000
commit191f1b54558d2bdc074418e4587f9f2487f16495 (patch)
treeda996c909d95aa34dd3e861c5f0f11161ac17ef9 /packages/meta/gpe-image.bb
parentce3ddd754de3a497d7ecaa345703ed4c8d4dc849 (diff)
downloadopenembedded-191f1b54558d2bdc074418e4587f9f2487f16495.tar.gz
packages/meta/gpe-image.bb: unbreak gpe-image with various patches from .dev
Diffstat (limited to 'packages/meta/gpe-image.bb')
-rw-r--r--packages/meta/gpe-image.bb25
1 files changed, 15 insertions, 10 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index ccc6d53b3e..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 = "r18"
+PR = "r19"
export IMAGE_BASENAME = "gpe-image"
@@ -15,23 +15,28 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
GPE_EXTRA_THEMES = "gpe-theme-industrial"
-GPE_EXTRA_DEPENDS_bigscreen = ""
+GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}"
GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-GPE_EXTRA_DEPENDS_smallscreen = ""
+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 := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
- gpe-theme-clearlooks \
- gpe-filemanager \
- gpe-nmf \
+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 \
- figment \
+ ${GPE_BIGFLASH_DEPENDS} \
",d)}'
-GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH}
-GPE_EXTRA_INSTALL += ${GPE_BIGFLASH}
+GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS}
+GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
GPE_EXTRA_DEPENDS_none = ""
GPE_EXTRA_INSTALL_none = ""