summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/meta/gpe-image.bb12
-rw-r--r--packages/meta/meta-gpe.bb1
-rw-r--r--packages/meta/meta-opie.bb22
-rw-r--r--packages/meta/opie-image.bb1
4 files changed, 22 insertions, 14 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index edf41f7eae..572eef2230 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -42,8 +42,16 @@ GPE_EXTRA_INSTALL_none = ""
XSERVER ?= "xserver-kdrive-fbdev"
DEPENDS = "task-bootstrap \
- meta-gpe \
- ${GPE_EXTRA_DEPENDS}"
+ meta-gpe \
+ ${GPE_EXTRA_DEPENDS}"
+
+RDEPENDS = "\
+ gpe-task-base \
+ gpe-task-pim \
+ gpe-task-settings \
+ gpe-task-apps \
+ ${XSERVER} \
+ ${GPE_EXTRA_INSTALL}"
export IPKG_INSTALL = "task-bootstrap gpe-task-base \
gpe-task-pim gpe-task-settings \
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 3a3bb2261b..347608aaa1 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -10,7 +10,6 @@ RDEPENDS_gpe-base-depends := "\
virtual/xserver"
RDEPENDS_gpe-task-base := "\
- gpe-task-base = \
gpe-bootsplash \
bluez-utils-dbus \
matchbox \
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index a2bc99e67e..30f3358d8f 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -22,14 +22,14 @@ PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
# for devices with >16M of flash
#
-DEPENDS = "irda-utils ntp timezones ttf-dejavu \
- bluez-utils-nodbus wireless-tools \
- opie-ttf-support libopieobex0 opie-examples-python \
- opie-freetype opie-help-en opie-i18n opie-login \
- opie-securityplugin-blueping opie-securityplugin-dummy \
- opie-securityplugin-notice opie-securityplugin-pin \
- opie-sh opie-symlinker opie-alarm openobex \
- konqueror-embedded qpdf2"
+#DEPENDS = "irda-utils ntp timezones ttf-dejavu \
+# bluez-utils-nodbus wireless-tools \
+# opie-ttf-support libopieobex0 opie-examples-python \
+# opie-freetype opie-help-en opie-i18n opie-login \
+# opie-securityplugin-blueping opie-securityplugin-dummy \
+# opie-securityplugin-notice opie-securityplugin-pin \
+# opie-sh opie-symlinker opie-alarm openobex \
+# konqueror-embedded qpdf2"
#
# Dependencies to get the launcher up and running
@@ -193,9 +193,9 @@ task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-ticta
# Let's build DEPENDS and RDEPENDS now
#
-# FIXME - these shouldn't be here
-DEPENDS += "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
- opie-sounds opie-ttf-support ttf-dejavu"
+## FIXME - these shouldn't be here
+#DEPENDS += "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \
+# opie-sounds opie-ttf-support ttf-dejavu"
RDEPENDS_task-opie-applets = "${task-opie-applets}"
RDEPENDS_task-opie-apps = "${task-opie-apps}"
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 6d3eb1d59d..421fe53ea0 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -9,6 +9,7 @@ LICENSE = "MIT"
PR = "r19"
DEPENDS = "task-bootstrap meta-opie"
+RDEPENDS = "${INSTALL_PACKAGES}"
extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'