merge of '1d2340f5c0766711d217ca40fbfcb4cb196412ac'

     and '8bee8c12a8f566036b80dc740f5215782a19eb8b'

4 files changed, 12 insertions, 8 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 1a41f13129..4898e84a33 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -125,6 +125,7 @@ RRECOMMENDS_task-base-core-default = '\
     dropbear '
 
 task-base-kernel24-rdepends = "\
+    modutils-depmod \
     linux-hotplug "
 
 task-base-kernel26-rdepends = "\
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index b421818379..984fa61584 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r4"
+PR = "r5"
 
 PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -155,7 +155,7 @@ RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-dateb
 RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
                  opie-mail opie-pimconverter"
 
-RDEPENDS_task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \
+RDEPENDS_task-opie-bluetooth = "bluez-utils obexftp obexpush libopieobex0 \
                        opie-bluepin opie-bluetoothmanager opie-bluetoothapplet"
 
 RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index dccdd13bdf..f9d3f7bfc7 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Proper tools for busybox haters"
-PR = "r2"
+DESCRIPTION = "Full versions of tools provided by busybox"
+PR = "r4"
 
 PACKAGE_ARCH = "all"
 ALLOW_EMPTY_${PN} = "1"
@@ -12,6 +12,7 @@ RDEPENDS = "\
 	    sed \
 	    wget \
 	    patch \
+            tar \
 	    diffutils \
             less \
             vim \
@@ -20,4 +21,8 @@ RDEPENDS = "\
             module-init-tools \
 	    "
 
-
+#
+# binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info
+#
+# busybox tar does not understand '--no-same-owner' option which bitbake use
+#
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 6e3626aa98..3fff3cbeb9 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -48,7 +48,6 @@ RDEPENDS_task-qpe-applications = "\
     ubahnnav \
     visiscript \
     xqt2 \
-    zeecookbook \
     zbedic \
     zbench \
     zgscore \
@@ -89,7 +88,6 @@ RDEPENDS_task-qpe-games = "\
     powermanga \
     puzz-le \
     qfish2 \
-    qpe-vexed \
     qmatrix \
     shisensho \
     sokoban \