merge of '28a8c519bdad5460acd375fdfc946ccc83177df6'

     and '640195905df353942a1e0cde6e72a194c3a7434a'

4 files changed, 110 insertions, 78 deletions

diff --git a/classes/task.bbclass b/classes/task.bbclass
new file mode 100644
index 0000000000..4edd704829
--- /dev/null
+++ b/classes/task.bbclass
@@ -0,0 +1,27 @@
+# Task packages are only used to pull in other packages
+# via their dependencies. They are empty.
+ALLOW_EMPTY = "1"
+
+# By default, only the task package itself is in PACKAGES.
+# -dbg and -dev flavours are handled by the anonfunc below.
+# This means that task recipes used to build multiple task
+# packages have to modify PACKAGES after inheriting task.bbclass.
+PACKAGES = "${PN}"
+
+# By default, task packages do not depend on a certain architecture.
+# Only if dependencies are modified by MACHINE_FEATURES, packages
+# need to be set to MACHINE_ARCH after inheriting task.bbclass
+PACKAGE_ARCH = "all"
+
+# This automatically adds -dbg and -dev flavours of all PACKAGES
+# to the list. Their dependencies (RRECOMMENDS) are handled as usual
+# by package_depchains in a following step.
+python () {
+    packages = bb.data.getVar('PACKAGES', d, 1).split()
+    genpackages = []
+    for pkg in packages:
+        for postfix in ['-dbg', '-dev']:
+            genpackages.append(pkg+postfix)
+    bb.data.setVar('PACKAGES', ' '.join(packages+genpackages), d)
+}
+
diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
new file mode 100644
index 0000000000..6ea7ca236b
--- /dev/null
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "OpenMoko: Debugging Tools"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r57"
+
+inherit task
+
+RDEPENDS_task-openmoko-debug = "\
+  alsa-utils-amixer \
+  alsa-utils-aplay \
+  alsa-utils-aconnect \
+  alsa-utils-alsamixer \
+  alsa-utils-speakertest \
+  madplay \
+  vorbis-tools \
+  strace \
+  ltrace \
+  gdb \
+  gdbserver \
+  tcpdump \
+  tslib-calibrate \
+  tslib-tests \
+  fbgrab \
+  fstests \
+  lsof \
+  lrzsz \
+  udev-utils \
+  usbutils \
+  uucp \
+  cu \
+#  sensors-i2cdetect sensors-i2cdump sensors-i2cset \
+  xev \
+  bonnie++ \
+  memtester \
+  dbench \
+"
diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb
new file mode 100644
index 0000000000..6a5c2c2aa5
--- /dev/null
+++ b/packages/tasks/task-openmoko-native-sdk.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "OpenMoko: Native SDK"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r58"
+
+inherit task
+
+RDEPENDS_task-openmoko-native-sdk = "\
+  binutils \
+  binutils-symlinks \
+  gcc \
+  gcc-symlinks \
+  cpp \
+  cpp-symlinks \
+  cvs \
+  libc6-dev \
+  libgcc-dev \
+  glibc-utils \
+  ldd \
+  g++ \
+  g++-symlinks \
+  libstdc++-dev \
+  \
+  make \
+  flex \
+  flex-dev \
+  bison \
+  gawk \
+  grep \
+  sed \
+  automake \
+  autoconf \
+  patch \
+  patchutils \
+  diffstat \
+  diffutils \
+  libtool \
+  pkgconfig \
+  \
+  xoo \
+"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index a7739d8c01..ba024e349e 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r57"
+PR = "r58"
 
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
+inherit task
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -17,12 +16,14 @@ PACKAGES = "\
   \
   task-openmoko-games \
   task-openmoko-examples \
+"
+
+RDEPENDS_task-openmoko-everything := "\
+  ${PACKAGES} \
   task-openmoko-debug \
   task-openmoko-native-sdk \
 "
 
-RDEPENDS_task-openmoko-everything := "${PACKAGES}"
-
 #
 # task-openmoko-core
 #
@@ -137,76 +138,3 @@ DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
 RDEPENDS_task-openmoko-games = "\
   oh-puzzles \
 "
-
-#
-# task-openmoko-debug
-#
-DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
-RDEPENDS_task-openmoko-debug = "\
-  alsa-utils-amixer \
-  alsa-utils-aplay \
-  alsa-utils-aconnect \
-  alsa-utils-alsamixer \
-  alsa-utils-speakertest \
-  madplay \
-  vorbis-tools \
-  strace \
-  ltrace \
-  gdb \
-  gdbserver \
-  tcpdump \
-  tslib-calibrate \
-  tslib-tests \
-  fbgrab \
-  fstests \
-  lsof \
-  lrzsz \
-  udev-utils \
-  usbutils \
-  uucp \
-  cu \
-#  sensors-i2cdetect sensors-i2cdump sensors-i2cset \
-  xev \
-  bonnie++ \
-  memtester \
-  dbench \
-"
-
-#
-# task-openmoko-native-sdk
-#
-DESCRIPTION_task-openmoko-native-sdk = "OpenMoko: Native SDK"
-RDEPENDS_task-openmoko-native-sdk = "\
-  binutils \
-  binutils-symlinks \
-  gcc \
-  gcc-symlinks \
-  cpp \
-  cpp-symlinks \
-  cvs \
-  libc6-dev \
-  libgcc-dev \
-  glibc-utils \
-  ldd \
-  g++ \
-  g++-symlinks \
-  libstdc++-dev \
-  \
-  make \
-  flex \
-  flex-dev \
-  bison \
-  gawk \
-  grep \
-  sed \
-  automake \
-  autoconf \
-  patch \
-  patchutils \
-  diffstat \
-  diffutils \
-  libtool \
-  pkgconfig \
-  \
-  xoo \
-"