10 files changed, 29 insertions, 20 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 2f9c65c8dd..2e54d06b28 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -5,7 +5,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} v
 
 inherit kernel-arch
 
-PACKAGES_DYNAMIC = "kernel-module-*"
+PACKAGES_DYNAMIC += "kernel-module-*"
+PACKAGES_DYNAMIC += "kernel-image-*"
 
 export OS = "${TARGET_OS}"
 export CROSS_COMPILE = "${TARGET_PREFIX}"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 98d188375f..8682b46d4c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -70,7 +70,9 @@ DATETIME = "${DATE}${TIME}"
 # Openembedded Software Prerequisites.
 ##################################################################
 
-ASSUME_PROVIDED = "python-native cvs-native svn-native"
+# python-native should be here but python relies on building 
+# its own in staging
+ASSUME_PROVIDED = "cvs-native svn-native"
 
 ##################################################################
 # Package default variables.
diff --git a/packages/alsa/alsa-utils_1.0.10.bb b/packages/alsa/alsa-utils_1.0.10.bb
index 916afedd16..94e49ebf25 100644
--- a/packages/alsa/alsa-utils_1.0.10.bb
+++ b/packages/alsa/alsa-utils_1.0.10.bb
@@ -52,6 +52,4 @@ DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configura
 RDEPENDS_alsa-utils-aplay  += "alsa-conf"
 RDEPENDS_alsa-utils-amixer += "alsa-conf"
 
-# ALSA can be in kernel
-RRECOMMENDS_alsa-utils += "${ALSA_PACKAGES}"
 ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb
index 8e8297c85b..0a93c32e3f 100644
--- a/packages/alsa/alsa-utils_1.0.8.bb
+++ b/packages/alsa/alsa-utils_1.0.8.bb
@@ -53,5 +53,4 @@ DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configura
 
 RDEPENDS_alsa-utils-aplay  += "alsa-conf"
 RDEPENDS_alsa-utils-amixer += "alsa-conf"
-RDEPENDS_alsa-utils += "${ALSA_PACKAGES}"
 ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index b8e69d6b11..4047f6e7a9 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -4,7 +4,7 @@ inherit gpe
 
 DESCRIPTION = "GPE infrared communication applet"
 DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus"
-RDEPENDS = "libopenobex-1.0-1 irda-utils"
+RDEPENDS = "irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
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)}'
 
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 7bed78e9bc..42e80c4ab7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -4,6 +4,7 @@ LICENSE = "zaurus-updater"
 PR = "r2"
 
 PACKAGES = ""
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "file://updater.sh \
            file://gnu-tar.gz"