merge of '5b3c06549bda71c0b02a8f27fa8aa82c95abc4ad'

     and '6396af305b4f951d7d88215419603669286e4715'

3 files changed, 38 insertions, 32 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 4d16501d6b..17fc9a30f5 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r21"
+PR = "r20"
 
 PACKAGES = "task-base \
             task-base-oh-minimal \
@@ -38,9 +38,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # irda
 # pci
 # pcmcia
+# redboot
+# uboot
 # usbgadget
 # usbhost
 
+
 DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 
 #
@@ -62,9 +65,12 @@ RDEPENDS_task-base = "\
     ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
     ${MACHINE_EXTRA_RDEPENDS} \
     ${DISTRO_EXTRA_RDEPENDS}"
@@ -247,6 +253,12 @@ task-base-usbhost-rrecommends = "\
     kernel-module-usbserial \
     kernel-module-usb-storage "
 
+task-base-uboot-rdepends = "\
+        uboot-utils"
+
+task-base-redboot-rdepends = "\
+        fis"
+
 task-distro-ppp-rdepends = "\
     ppp \
     ppp-dialin"
@@ -293,6 +305,8 @@ task-distro-nfs-rrecommends = "\
     kernel-module-lockd \
     kernel-module-sunrpc"
 
+task-distro-raid-rdepends = "\
+	"
 
 # Tosort
 # kernel-module-ipv6
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index ece303d62a..7f8b03ce33 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 
-PR = "r32"
+PR = "r33"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\
   matchbox-stroke \
   matchbox-config-gtk \
   matchbox-panel-2-applets \
-  matchbox-panel-hacks \
   matchbox-themes-extra \
   matchbox-themes-gtk \
-  matchbox-applet-inputmanager \
-  matchbox-applet-startup-monitor \
   openmoko-panel-battery \
   openmoko-panel-clock \
   openmoko-panel-demo \
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index a9814d51a1..cbd1ab72f1 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -21,73 +21,67 @@ RDEPENDS_task-sdk-base := "\
     glibc-dev \
     libgcc1 \
     alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
+    libaudiofile-dev \
+    libbluetooth-dev \
     dbus-dev \
     expat-dev \
     fontconfig-dev \
     freetype-dev \
-    glib-2.0-dev \
+    libglib-2.0-dev \
     gstreamer-dev \
     libice-dev \
     ipkg-dev \
-    jpeg-dev \
+    libjpeg-dev \
     libapm-dev \
-    libasound \
+    libasound2 \
     libdisplaymigration-dev \
     libetpan-dev \
     libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
+    libglade-2.0-dev \
+    libgnutls-dev \
     libgpg-error-dev \
-    libidl-dev \
+    libidl-2-dev \
     libiw-dev \
-    libmimedir-dev \
+    libmimedir-0.4-dev \
     libpcap-dev \
     libpixman-dev \
     libpng-dev \
     libschedule-dev \
     libsm-dev \
     libsoundgen-dev \
-    libsoup-dev \
+    libsoup-2.2-dev \
     libsvg-dev \
     libtododb-dev \
     libts-dev \
     libxml2-dev \
     ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    sqlite-dev \
+    libopenobex-dev \
+    libpopt-dev \
+    libreadline-dev \
+    libsqlite-dev \
     zlib-dev \
     libxmu-dev"
 
 RDEPENDS_task-sdk-x11 := "\
-    atk-dev \
-    cairo-dev \
+    libatk-1.0-dev \
+    libcairo-dev \
     gconf-dbus-dev \
     gtk+-dev \
     gtk-engines-dev \
     libsvg-cairo-dev \
-    libmatchbox-dev \
+    libmb-dev \
     matchbox-desktop-dev \
     pango-dev \
-    startup-notification-dev"
+    libstartup-notification-1-dev"
 
 RDEPENDS_task-sdk-x11-ext := "\
-    compositeext-dev \
-    damageext-dev \
-    fixesext-dev \
     libxcursor-dev \
     libxdmcp-dev \
-    libxfixes-dev \
     libxft-dev \
     libxrandr-dev \
     libxrender-dev \
     libxsettings-client-dev \
     randrext-dev \
-    recordext-dev \
-    renderext-dev \
     resourceext-dev \
     libx11-dev \
     libxau-dev \
@@ -103,14 +97,15 @@ RDEPENDS_task-sdk-x11-ext := "\
     libxt-dev \
     xtrans-dev \
     libxtst-dev"
-#    libxss-dev \
+
 
 RDEPENDS_task-sdk-gpe := "\
     libcontactsdb-dev \
-    esound-dev \
+    libesd-dev \
     libeventdb-dev \
     libgpepimc-dev \
     libgpevtype-dev \
     libgpelaunch-dev \
     libgpewidget-dev \
     libhandoff-dev"
+