merge of '4287770ea855fb20a7ff1b944f48982f4aab48c9'

     and 'fd012d756d6df4946900321f427519708a15e866'

12 files changed, 123 insertions, 98 deletions

diff --git a/packages/initscripts/initscripts-1.0/functions b/packages/initscripts/initscripts-1.0/functions
new file mode 100644
index 0000000000..358fc6edb3
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/functions
@@ -0,0 +1,17 @@
+# -*-Shell-script-*-
+#
+# functions     This file contains functions to be used by most or all
+#               shell scripts in the /etc/init.d directory.
+#
+
+cpuinfo_id() {		# return the Hardware module ID
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+killproc() {		# kill the named process(es)
+    pid=`/bin/ps -e x |
+         /bin/grep $1 |
+         /bin/grep -v grep |
+         /bin/sed -e 's/^  *//' -e 's/ .*//'`
+    [ "$pid" != "" ] && kill $pid
+}
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index aa30833895..ebddf17b61 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,9 +4,10 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r97"
+PR = "r98"
 
-SRC_URI = "file://halt \
+SRC_URI = "file://functions \
+           file://halt \
            file://ramdisk \
            file://umountfs \
            file://devices \
@@ -32,7 +33,7 @@ SRC_URI = "file://halt \
            file://volatiles \
            file://save-rtc.sh"
 
-SRC_URI_append_arm          = " file://alignment.sh"
+SRC_URI_append_arm = " file://alignment.sh"
 
 KERNEL_VERSION = ""
 
@@ -40,18 +41,19 @@ do_install () {
 #
 # Create directories and install device independent scripts
 #
-	install -d ${D}${sysconfdir}/init.d \
-		   ${D}${sysconfdir}/rcS.d \
-		   ${D}${sysconfdir}/rc0.d \
-		   ${D}${sysconfdir}/rc1.d \
-		   ${D}${sysconfdir}/rc2.d \
-		   ${D}${sysconfdir}/rc3.d \
-		   ${D}${sysconfdir}/rc4.d \
-		   ${D}${sysconfdir}/rc5.d \
-		   ${D}${sysconfdir}/rc6.d \
-		   ${D}${sysconfdir}/default \
-		   ${D}${sysconfdir}/default/volatiles
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/rcS.d
+	install -d ${D}${sysconfdir}/rc0.d
+	install -d ${D}${sysconfdir}/rc1.d
+	install -d ${D}${sysconfdir}/rc2.d
+	install -d ${D}${sysconfdir}/rc3.d
+	install -d ${D}${sysconfdir}/rc4.d
+	install -d ${D}${sysconfdir}/rc5.d
+	install -d ${D}${sysconfdir}/rc6.d
+	install -d ${D}${sysconfdir}/default
+	install -d ${D}${sysconfdir}/default/volatiles
 
+	install -m 0755    ${WORKDIR}/functions		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/finish		${D}${sysconfdir}/init.d
diff --git a/packages/libsdl/libsdl-net_1.2.5.bb b/packages/libsdl/libsdl-net_1.2.7.bb
index a2ab06d479..a2ab06d479 100644
--- a/packages/libsdl/libsdl-net_1.2.5.bb
+++ b/packages/libsdl/libsdl-net_1.2.7.bb
diff --git a/packages/python/python-pygtk-0.6.12/.mtn2git_empty b/packages/python/python-pygtk-1.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pygtk-0.6.12/.mtn2git_empty
+++ b/packages/python/python-pygtk-1.2/.mtn2git_empty
diff --git a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch
index 94bb164f67..94bb164f67 100644
--- a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al
+++ b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch
diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb
index 90f8cb3821..a974a2471d 100644
--- a/packages/python/python-pygtk-1.2_0.6.12.bb
+++ b/packages/python/python-pygtk-1.2_0.6.12.bb
@@ -8,7 +8,7 @@ SRCNAME = "pygtk"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
-           file://remove-imlib-et-al;patch=1 \
+           file://remove-imlib-et-al.patch;patch=1 \
            file://acinclude.m4"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -17,7 +17,7 @@ inherit autotools pkgconfig distutils-base
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
+#FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
diff --git a/packages/python/python-pytest_0.6.0.bb b/packages/python/python-pytester_0.6.0.bb
index 17db94897c..bc7953b73e 100644
--- a/packages/python/python-pytest_0.6.0.bb
+++ b/packages/python/python-pytester_0.6.0.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 HOMEPAGE = "http://oss.wxnet.org/pytester/index.html"
 PRIORITY = "optional"
 LICENSE = "GPL"
-SRCNAME = "pytest"
+SRCNAME = "pytester"
 PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
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..754e32b1d2 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 = "r59"
 
-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
 #
@@ -72,6 +73,7 @@ RDEPENDS_task-openmoko-ui = "\
   openmoko-sound-system \
   openmoko-sound-theme-standard \
   neod \
+  gpe-scap \
 "
 
 #
@@ -137,76 +139,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 \
-"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 1f4dbbc751..04a6ac03b2 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml18"
+PR = "ml19"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -58,7 +58,7 @@ RDEPENDS = "\
 		python-pyrex		\
 		python-pyro		\
 		python-pyserial		\
-		python-pytest		\
+		python-pytester		\
 		python-pyvisa		\
 		python-pyweather	\
 		python-pyxml		\
diff --git a/packages/zten/zten_1.6.2.bb b/packages/zten/zten_1.6.2.bb
index 1511341f0a..b5a4c6eac1 100644
--- a/packages/zten/zten_1.6.2.bb
+++ b/packages/zten/zten_1.6.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "eb kakasi"
 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"