[oe-commits] org.oe.dev merge of '28a8c519bdad5460acd375fdfc946ccc83177df6'

[mickeyl commit]

merge of '28a8c519bdad5460acd375fdfc946ccc83177df6'
     and '640195905df353942a1e0cde6e72a194c3a7434a'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a4b1e7b65833194a48909d836e87a913dbbe3c66
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a4b1e7b65833194a48909d836e87a913dbbe3c66
Files:
1
classes/task.bbclass
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-native-sdk.bb
packages/tasks/task-openmoko.bb
packages/zten/zten_1.6.2.bb
Diffs:

#
# mt diff -r28a8c519bdad5460acd375fdfc946ccc83177df6 -ra4b1e7b65833194a48909d836e87a913dbbe3c66
#
# 
# 
# add_file "classes/task.bbclass"
#  content [e7e881f731b2d8e00055d9a95c21b50d2c2a208b]
# 
# add_file "packages/tasks/task-openmoko-debug.bb"
#  content [194fcf90f766fbdbc057be3fec031b632534283d]
# 
# add_file "packages/tasks/task-openmoko-native-sdk.bb"
#  content [5ffc742e0afbb22c7591fc1491dc5f96bdbb4388]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [8b037b50419fa01babd6a99e14c281d0c0b641bd]
#    to [bc54453464fd43283f4dee169ceb5c9656b41bcd]
# 
============================================================
--- classes/task.bbclass	e7e881f731b2d8e00055d9a95c21b50d2c2a208b
+++ classes/task.bbclass	e7e881f731b2d8e00055d9a95c21b50d2c2a208b
@@ -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)
+}
+
============================================================
--- packages/tasks/task-openmoko-debug.bb	194fcf90f766fbdbc057be3fec031b632534283d
+++ packages/tasks/task-openmoko-debug.bb	194fcf90f766fbdbc057be3fec031b632534283d
@@ -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 \
+"
============================================================
--- packages/tasks/task-openmoko-native-sdk.bb	5ffc742e0afbb22c7591fc1491dc5f96bdbb4388
+++ packages/tasks/task-openmoko-native-sdk.bb	5ffc742e0afbb22c7591fc1491dc5f96bdbb4388
@@ -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 \
+"
============================================================
--- packages/tasks/task-openmoko.bb	8b037b50419fa01babd6a99e14c281d0c0b641bd
+++ packages/tasks/task-openmoko.bb	bc54453464fd43283f4dee169ceb5c9656b41bcd
@@ -1,11 +1,10 @@ PROVIDES = "task-openmoko-everything"
 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 @@ RDEPENDS_task-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 \
-"


#
# mt diff -r640195905df353942a1e0cde6e72a194c3a7434a -ra4b1e7b65833194a48909d836e87a913dbbe3c66
#
# 
# 
# patch "packages/zten/zten_1.6.2.bb"
#  from [6dc2302625ff7cc29b4fd02acda47bed412e77ae]
#    to [d16e5bbbdd5db91cc2059950ee052d9e1df00d1d]
# 
============================================================
--- packages/zten/zten_1.6.2.bb	6dc2302625ff7cc29b4fd02acda47bed412e77ae
+++ packages/zten/zten_1.6.2.bb	d16e5bbbdd5db91cc2059950ee052d9e1df00d1d
@@ -7,7 +7,7 @@ RCONFLICTS = "ztenv"
 RDEPENDS = "virtual/japanese-font"
 RCONFLICTS = "ztenv"
 
-SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc9321 \
+SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \
            file://zten.patch;patch=1"
 
 S = "${WORKDIR}/zten"