merge of '1cc9d40e03f431fac4150580f6a58521cae55509'

     and 'a250ef0b1707ead866fe051ca88c56e538d51bfb'

6 files changed, 54 insertions, 3 deletions

diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 8486aa01cf..0c2342183e 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Debugging and Benchmarking Tools"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r58"
+PR = "r59"
 
 inherit task
 
@@ -15,6 +15,7 @@ RDEPENDS_task-openmoko-debug = "\
   cu \
   dbench \
   fbgrab \
+  fbset \
   fstests \
   gdb \
   gdbserver \
diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
new file mode 100644
index 0000000000..31ac3bb746
--- /dev/null
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -0,0 +1,26 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+    openmoko-sample2-src \
+"
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+    openmoko-sample2-src \
+"
diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-openmoko-toolchain-target.bb
index bcb2d370a6..281884d051 100644
--- a/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -26,6 +26,5 @@ RDEPENDS_${PN} = "\
     libmokoui2-dev \
     libmokopanelui2-dev \
     libmokojournal2-dev \
-    openmoko-sample2-src \
     openmoko-toolchain-scripts \
 "
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
index e34bb42b2f..4f3399ac8f 100644
--- a/packages/tasks/task-openmoko-ui.bb
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -52,5 +52,6 @@ THEMES_a1200    = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-q
 THEMES_rokre2   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 THEMES_rokre6   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_chumby   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 
 RDEPENDS_task-openmoko-ui += "${THEMES}"
diff --git a/packages/tasks/task-qtopia-core-console.bb b/packages/tasks/task-qtopia-core-console.bb
new file mode 100644
index 0000000000..ff0bbc6d12
--- /dev/null
+++ b/packages/tasks/task-qtopia-core-console.bb
@@ -0,0 +1,13 @@
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "MIT"
+
+inherit task
+
+DESCRIPTION_task-qtopia-core-console = "QtopiaCore Core libraries for XML, SQL, Network, Containers and others."
+RDEPENDS_task-qtopia-core-console = "\
+    libqtopiacorecore4 \
+    libqtopiacorenetwork4 \
+    libqtopiacorexml4 \
+    libqtopiacoresql4"
+
+    
diff --git a/packages/tasks/task-qtopia-core-gui.bb b/packages/tasks/task-qtopia-core-gui.bb
new file mode 100644
index 0000000000..5b5e467305
--- /dev/null
+++ b/packages/tasks/task-qtopia-core-gui.bb
@@ -0,0 +1,11 @@
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "MIT"
+
+inherit task
+
+DESCRIPTION_task-qtopia-core-gui = "QtopiaCore GUI library"
+RDEPENDS_task-qtopia-core-gui = " \
+    task-qtopia-core-console \
+    libqtopiacoregui4 \
+    libqtopiacorescript4 \
+    libqtopiacoredbus4"