diff options
| -rw-r--r-- | meta/gpe-collections.oe | 22 | ||||
| -rw-r--r-- | meta/gpe-image.oe | 6 |
2 files changed, 12 insertions, 16 deletions
diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe index 4282a702bf..89a48100ec 100644 --- a/meta/gpe-collections.oe +++ b/meta/gpe-collections.oe @@ -42,9 +42,7 @@ GPE_PIM = "\ gpe-calendar \ gpe-sketchbook \ gpe-contacts \ - gpe-today" - -GPE_EXTRA_PIM = "\ + gpe-today \ gpe-timesheet" GPE_BASE_SETTINGS = "\ @@ -59,11 +57,9 @@ GPE_BASE_SETTINGS = "\ gpe-wlancfg \ gpe-taskmanager \ keylaunch \ - minilite" - -GPE_EXTRA_SETTINGS = "\ + minilite \ xmonobut" - + GPE_BASE_APPS = "\ gpe-edit \ gpe-gallery \ @@ -80,11 +76,11 @@ GPE_MACHINE_CLASS ?= "none" GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}" GPE_EXTRA_INSTALL += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}" -GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone ${GPE_EXTRA_PIM}" -GPE_EXTRA_INSTALL_bigscreen = "firefox linphone ${GPE_EXTRA_PIM}" +GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone" +GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" -GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh ${GPE_EXTRA_PIM}" -GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh ${GPE_EXTRA_PIM}" +GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh" +GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh" -GPE_EXTRA_DEPENDS_none = "dillo2" -GPE_EXTRA_INSTALL_none = "dillo2" +GPE_EXTRA_DEPENDS_none = "" +GPE_EXTRA_INSTALL_none = "" diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe index ac67a2cc89..b389589bfb 100644 --- a/meta/gpe-image.oe +++ b/meta/gpe-image.oe @@ -1,17 +1,17 @@ include gpe-collections.oe -PR = "r2" +PR = "r3" export IMAGE_BASENAME = "gpe-image" DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \ - ${GPE_BASE_SETTINGS} ${GPE_EXTRA_SETTINGS} ${GPE_BASE_APPS} \ + ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \ ${GPE_EXTRA_DEPENDS}" XSERVER ?= "xserver-kdrive-fbdev" export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \ - ${GPE_PIM} ${GPE_BASE_SETTINGS} ${GPE_EXTRA_SETTINGS} \ + ${GPE_PIM} ${GPE_BASE_SETTINGS} \ ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \ ${XSERVER} \ ${GPE_BASE_RDEPENDS} \ |