From b7b7b8ba477be3f471d96ce473a55fcfaf24917b Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sat, 16 Feb 2008 20:06:08 +0000
Subject: image.bbclass: Innocent typo fix.

---
 classes/image.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/image.bbclass b/classes/image.bbclass
index e8fca61fb2..67a3a4fa10 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -35,9 +35,9 @@ python () {
 }
 
 #
-# Get a list of files containing device tables to create.
+# Get a list of files containing tables of devices to be created.
 # * IMAGE_DEVICE_TABLE is the old name to an absolute path to a device table file
-# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, seached
+# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, searched
 #   for in the BBPATH
 # If neither are specified then the default name of files/device_table-minimal.txt
 # is searched for in the BBPATH (same as the old version.)
-- 
cgit v1.2.3


From d9971a1a3d12421aea6e77f90e80589786a3a40a Mon Sep 17 00:00:00 2001
From: Derek Young <dyoung@nslu2-linux.org>
Date: Sun, 17 Feb 2008 00:40:09 +0000
Subject: Add forgotten patch to re-enable big endian builds based on gcc 4.2.2

---
 packages/gcc/gcc_4.2.2.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 15a25c9c6a..dea9f14d9a 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
         file://602-sdk-libstdc++-includes.patch;patch=1 \
 	file://740-sh-pr24836.patch;patch=1 \
 	file://800-arm-bigendian.patch;patch=1 \
+	file://801-arm-bigendian-eabi.patch;patch=1 \
 	file://904-flatten-switch-stmt-00.patch;patch=1 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
-- 
cgit v1.2.3


From c7c0ee0bb756ca79840a318378562d65a236bd4c Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 17 Feb 2008 02:49:20 +0000
Subject: devimage 0.1: Link init script to /sbin/init, so this can be booted
 as normal rootfs. * In addition to default initramfs booting.

---
 packages/initrdscripts/devimage_0.1.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/initrdscripts/devimage_0.1.bb b/packages/initrdscripts/devimage_0.1.bb
index c671f38025..0622dd0330 100644
--- a/packages/initrdscripts/devimage_0.1.bb
+++ b/packages/initrdscripts/devimage_0.1.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
 SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-PR = "r3"
+PR = "r4"
 
 do_install() {
-        install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
 	install -d ${D}/etc/dropbear
+	install -d ${D}/sbin
+	install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
         install -m 0600 ${WORKDIR}/dropbear_rsa_host_key ${D}/etc/dropbear/
         install -m 0644 ${WORKDIR}/passwd ${D}/etc/
+	ln -s /init ${D}/sbin/init
 }
 
-FILES_${PN} += " /init /etc/*"
+FILES_${PN} += " /init /etc/* /sbin/*"
-- 
cgit v1.2.3


From db5d22bd31a498aa24a74e2fec7faa3467fa42ad Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 17 Feb 2008 02:52:18 +0000
Subject: initramfs-uniboot: Modprobe mtdblock and factor out fatal().

---
 packages/initrdscripts/files/init.sh            | 10 ++++++----
 packages/initrdscripts/initramfs-uniboot_1.0.bb |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index f8d5de9173..08163fa040 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -8,6 +8,7 @@ early_setup() {
     mkdir /proc
     mount -t proc proc /proc
     mkdir /mnt
+    modprobe -q mtdblock
 }
 
 dev_setup()
@@ -48,13 +49,13 @@ boot_root() {
     exec switch_root -c /dev/console $BOOT_ROOT /sbin/init
 }
 
-boot_failed() {
-    echo "No valid root device was specified.  Please add root=/dev/something to"
-    echo "the kernel command-line and try again."
+fatal() {
+    echo $1
     echo
     exec sh
 }
 
+
 echo "Starting initramfs boot..."
 early_setup
 read_args
@@ -68,4 +69,5 @@ dev_setup
 
 load_modules
 [ -n "$BOOT_ROOT" ] && boot_root
-boot_failed
+
+fatal "No valid root device was specified.  Please add root=/dev/something to the kernel command-line and try again."
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 167ce71ffe..786afb972c 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,6 +1,7 @@
 SRC_URI = "file://init.sh"
-PR = "r2"
+PR = "r3"
 DESCRIPTON = "A modular initramfs init script system."
+RRECOMMENDS = "kernel-module-mtdblock"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init.sh ${D}/init
-- 
cgit v1.2.3


From d48df38d1f5109cfa951d407ff26dd84155c7ae8 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 17 Feb 2008 02:54:44 +0000
Subject: initramfs-module-block: Accept additional FSTYPE param, handle mount
 failure. * FSTYPE useful for FSes not automatically recognized by mount (e.g.
 jffs2).

---
 packages/initrdscripts/files/85-blockboot.sh         | 6 +++++-
 packages/initrdscripts/initramfs-module-block_1.0.bb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh
index 567f7e29b3..fee9072d3a 100644
--- a/packages/initrdscripts/files/85-blockboot.sh
+++ b/packages/initrdscripts/files/85-blockboot.sh
@@ -3,6 +3,10 @@
 
 if [ -e "$ROOT_DEVICE" ]; then
     echo "booting from: $ROOT_DEVICE"
-    mount "$ROOT_DEVICE" /mnt
+    type=""
+    if [ -n "$FSTYPE" ]; then
+	type="-t $FSTYPE"
+    fi
+    mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
     BOOT_ROOT=/mnt
 fi
diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb
index 72812a2490..dcee113dd1 100644
--- a/packages/initrdscripts/initramfs-module-block_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-block_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://85-blockboot.sh"
-PR = "r1"
+PR = "r2"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
-- 
cgit v1.2.3


From 71a0ef43a6bf3c9eabc5ca4b9bd62229e574015d Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 17 Feb 2008 02:56:43 +0000
Subject: * initramfs-module-bootmenu: Add support for jffs2 booting and "drop
 to shell" option.

---
 packages/initrdscripts/files/10-initfs.sh               |  1 +
 packages/initrdscripts/files/30-bootmenu.sh             | 10 +++++++++-
 packages/initrdscripts/initramfs-module-bootmenu_1.0.bb |  2 +-
 packages/initrdscripts/initramfs-module-initfs_1.0.bb   |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh
index bad649e5c2..c2a843eb12 100644
--- a/packages/initrdscripts/files/10-initfs.sh
+++ b/packages/initrdscripts/files/10-initfs.sh
@@ -3,3 +3,4 @@
 modprobe -q vfat >/dev/null 2>&1
 modprobe -q ext2 >/dev/null 2>&1
 modprobe -q ext3 >/dev/null 2>&1
+modprobe -q jffs2 >/dev/null 2>&1
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index d54a643807..a45b55a353 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -95,6 +95,7 @@ while read maj min nblk dev; do
 done < /proc/partitions
 
 add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)"
+add_menu_item "Shell"
 
 total=`echo -e $list | wc -l`
 num=0
@@ -142,8 +143,11 @@ echo Selected: $sel
 
 dev=`expr "$sel" : '\([^ /]*\)'`
 path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
+fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
 
-if [ "$dev" == "NFS" ]; then
+if [ "$dev" == "Shell" ]; then
+    exec /bin/sh
+elif [ "$dev" == "NFS" ]; then
     ROOT_DEVICE="/dev/nfs"
     CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image"
 elif [ -n "$path" ]; then
@@ -151,6 +155,10 @@ elif [ -n "$path" ]; then
     CMDLINE="$CMDLINE root=/dev/loop looproot=/dev/$dev:$path"
 else
     ROOT_DEVICE="/dev/$dev"
+    # jffs2 is not recognized by mount automagically
+    if [ "$fstype" == "(jffs2)" ]; then
+	FSTYPE="jffs2"
+    fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
 
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 8b9a49f40b..6f3c6ec565 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r9"
+PR = "r10"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
index 64bba4a304..2c2ec07bf5 100644
--- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://10-initfs.sh"
-PR = "r2"
+PR = "r4"
 DESCRIPTION = "An initramfs module for initializing filesystems."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
-- 
cgit v1.2.3


From d1d941876523b687b4153a5f79e0b4f6c2d7fe5e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 17 Feb 2008 03:09:06 +0000
Subject: initramfs-uniboot: FSTYPE -> ROOT_FSTYPE, set from rootfstype=
 command line param.

---
 packages/initrdscripts/files/30-bootmenu.sh             | 2 +-
 packages/initrdscripts/files/85-blockboot.sh            | 4 ++--
 packages/initrdscripts/files/init.sh                    | 2 ++
 packages/initrdscripts/initramfs-module-block_1.0.bb    | 2 +-
 packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 2 +-
 packages/initrdscripts/initramfs-uniboot_1.0.bb         | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index a45b55a353..3f3b8c7079 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -157,7 +157,7 @@ else
     ROOT_DEVICE="/dev/$dev"
     # jffs2 is not recognized by mount automagically
     if [ "$fstype" == "(jffs2)" ]; then
-	FSTYPE="jffs2"
+	ROOT_FSTYPE="jffs2"
     fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh
index fee9072d3a..e1c3ed893e 100644
--- a/packages/initrdscripts/files/85-blockboot.sh
+++ b/packages/initrdscripts/files/85-blockboot.sh
@@ -4,8 +4,8 @@
 if [ -e "$ROOT_DEVICE" ]; then
     echo "booting from: $ROOT_DEVICE"
     type=""
-    if [ -n "$FSTYPE" ]; then
-	type="-t $FSTYPE"
+    if [ -n "$ROOT_FSTYPE" ]; then
+	type="-t $ROOT_FSTYPE"
     fi
     mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
     BOOT_ROOT=/mnt
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 08163fa040..8b9fe12429 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -31,6 +31,8 @@ read_args() {
         case $arg in
             root=*)
                 ROOT_DEVICE=$optarg ;;
+            rootfstype=*)
+                ROOT_FSTYPE=$optarg ;;
             rootdelay=*)
                 rootdelay=$optarg ;;
         esac
diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb
index dcee113dd1..b4b2d43150 100644
--- a/packages/initrdscripts/initramfs-module-block_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-block_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://85-blockboot.sh"
-PR = "r2"
+PR = "r3"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 6f3c6ec565..8c66521f30 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r10"
+PR = "r11"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 786afb972c..e0f726582e 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://init.sh"
-PR = "r3"
+PR = "r4"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 
-- 
cgit v1.2.3


From 0395d7bcfd686b1e3761ae3dcb0d30f116a1d11a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 17 Feb 2008 08:19:00 +0000
Subject: at76c503a: add 0.17 release of at76_usb modules * this works with
 2.6.21-hh for the h5000 machine * this driver also needs a firmware package,
 that will follow later

---
 packages/at76c503a/at76c503a-modules_0.17.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 packages/at76c503a/at76c503a-modules_0.17.bb

diff --git a/packages/at76c503a/at76c503a-modules_0.17.bb b/packages/at76c503a/at76c503a-modules_0.17.bb
new file mode 100644
index 0000000000..affffa39ef
--- /dev/null
+++ b/packages/at76c503a/at76c503a-modules_0.17.bb
@@ -0,0 +1,19 @@
+SECTION = "base"
+LICENSE = "GPL"
+
+SRCDATE = "20080116"
+
+SRC_URI = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz"
+S = "${WORKDIR}/at76_usb-${PV}/"
+
+inherit module
+
+MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \
+	at76c505-rfmd at76c503-i3863 at76c505-rfmd2958"
+
+do_install() {
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+	for i in *${KERNEL_OBJECT_SUFFIX}; do
+		install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+	done
+}
-- 
cgit v1.2.3


From 22930c300b7927092bc75eee464be0ad73213e8f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 17 Feb 2008 08:34:39 +0000
Subject: h5000: ship all kernel-modules and at76_usb

---
 conf/machine/h5000.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index e795395534..a55b75cd89 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -24,12 +24,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
+# Ship complete set of modules ('kernel-modules') for easier debug purposes 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules \
+                              kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
 			      kernel-module-h5400-bt \
 			      kernel-module-snd-soc-h5000 \
-			      kernel-module-i2c-pxa"
+			      kernel-module-i2c-pxa \
+			      at76c503a-modules"
 
 #
 # Modules autoload and other boot properties
-- 
cgit v1.2.3


From 77ea601316feb01887b5f4bc26d97f072d111ab1 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 09:47:56 +0000
Subject: busybox: add docu for "push 'em"-status of
 packages/busybox/busybox-1.9.1/adduser-longops.patch * add lines upstream,
 status and comment to the patch

---
 packages/busybox/busybox-1.9.1/adduser-longops.patch | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/busybox/busybox-1.9.1/adduser-longops.patch b/packages/busybox/busybox-1.9.1/adduser-longops.patch
index cb615c381e..f221d30895 100644
--- a/packages/busybox/busybox-1.9.1/adduser-longops.patch
+++ b/packages/busybox/busybox-1.9.1/adduser-longops.patch
@@ -1,3 +1,7 @@
+upstream: http://bugs.busybox.net/view.php?id=2134
+status: accepted in rev. 21031 on Feb 15 2008
+comment: fixes OE bug 3781, applied by mickeyl
+
 diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in
 --- busybox-1.9.1.old/loginutils/Config.in	Tue Feb 12 10:03:11 2008
 +++ busybox-1.9.1/loginutils/Config.in	Thu Feb 14 11:48:31 2008
-- 
cgit v1.2.3


From 87f5a11c6c0fa6f2ed6dffd2d00990caba59063a Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 10:19:00 +0000
Subject: anki: export PV that should work with bitbake 1.8.8, too.

---
 packages/anki/anki_0.4.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/anki/anki_0.4.3.bb b/packages/anki/anki_0.4.3.bb
index e4878645d8..f3a62f3323 100644
--- a/packages/anki/anki_0.4.3.bb
+++ b/packages/anki/anki_0.4.3.bb
@@ -1,9 +1,9 @@
 require anki.inc
 
 RDEPENDS += "libanki"
-PR = "r0"
+PR = "r1"
 
-#export PV="${PV}"
+export PV := "${PV}"
 
 SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1"
 S = "${WORKDIR}/anki-${PV}"
-- 
cgit v1.2.3


From 456ba7ffd159821e86ad7ad4b66ec7d5790bd054 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 17 Feb 2008 13:56:40 +0000
Subject: classes/kernel.bbclass: Remove usage of non-standard variables
 (DEPLOY_TO) and random renaming of output.

---
 classes/kernel.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 28e04ea204..6c12004dad 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -65,21 +65,21 @@ kernel_do_compile() {
 	fi
 }
 
+INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}"
+INITRAMFS_IMAGE_TARGET ?= "initramfs-image"
+
 do_builtin_initramfs() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-	cp "${INITRAMFS_LOC}" usr/initramfs_data.cpio.gz
+	cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
 	oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	install -d ${DEPLOY_DIR_IMAGE}
-	mv ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.no-initramfs.bin
-	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin
 	# Make sure to kill injected initramfs, in case someone will do "-c compile -f"
 	rm usr/initramfs_data.cpio.gz
-
-	[ -n "${DEPLOY_TO}" ] && install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_TO}
 }
 addtask builtin_initramfs after do_compile
-# As it accepts external parameter(s), better make it unstamped
 do_builtin_initramfs[nostamp] = "1"
+do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs"
 
 kernel_do_stage() {
 	ASMDIR=`readlink include/asm`
-- 
cgit v1.2.3


From 4ba579914b3b0058f095d3cc5e4336bfd27e5503 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 17 Feb 2008 13:57:45 +0000
Subject: kernel-initramfs: Remove recursive usage of bitbake as per discussion
 on the mailing list and agreement by the OE core team.

---
 packages/initrdscripts/kernel-initramfs_1.0.bb | 48 --------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 packages/initrdscripts/kernel-initramfs_1.0.bb

diff --git a/packages/initrdscripts/kernel-initramfs_1.0.bb b/packages/initrdscripts/kernel-initramfs_1.0.bb
deleted file mode 100644
index be1c067ba2..0000000000
--- a/packages/initrdscripts/kernel-initramfs_1.0.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "A kernel with internal initramfs"
-PR = "r1"
-
-#inherit kernel
-KERNEL_IMAGETYPE ?= "zImage"
-
-# Name of initramfs recipe to build and put result into kernel
-KERNEL_INITRAMFS ?= "initramfs-image"
-
-do_compile() {
-	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${WORKDIR}/initramfs.bin bitbake ${KERNEL_INITRAMFS} -c deploy_to
-	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} INITRAMFS_LOC=${WORKDIR}/initramfs.bin DEPLOY_TO=${WORKDIR}/\${KERNEL_IMAGE_BASE_NAME} bitbake virtual/kernel -c builtin_initramfs
-}
-
-do_install() {
-        install -d ${D}/boot/
-	install -m 644 ${WORKDIR}/${KERNEL_IMAGETYPE}* ${D}/boot/${KERNEL_IMAGETYPE}-${@get_pv(d)}
-}
-
-def get_version(d):
-	import bb
-	import os
-	dest = bb.data.getVar("WORKDIR", d, 1)
-	try:
-	    files = os.listdir(dest)
-	    files = filter(lambda f:f.startswith("zImage-"), files)
-	    ver = files[0][len("zImage-"):]
-	    return ver
-	except:
-	    return "dum-m-y"
-
-def get_pv(d):
-	ver = get_version(d)
-	verc = ver.split("-")
-	return verc[0] + "-" + verc[1]
-	
-def get_pr(d):
-	ver = get_version(d)
-	verc = ver.split("-")
-	return verc[2]
-
-PACKAGES = "kernel-image"
-FILES_kernel-image = "/boot/*"
-PKG_kernel-image = "kernel-image-${@get_pv(d)}"
-PKGPV_kernel-image = "${@get_pv(d)}"
-PKGPR_kernel-image = "${@get_pr(d)}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
cgit v1.2.3


From c84138ac986f55076982bc368b5ae6a9033ea15d Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 17 Feb 2008 14:18:01 +0000
Subject: kernel-initramfs, initramfs-image-ipk: Remove recipes with recursive
 bitbake invocations. * As not maintainable on global OE level.

---
 packages/initrdscripts/initramfs-image-ipk_1.0.bb | 15 -------
 packages/initrdscripts/kernel-initramfs_1.0.bb    | 48 -----------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 packages/initrdscripts/initramfs-image-ipk_1.0.bb
 delete mode 100644 packages/initrdscripts/kernel-initramfs_1.0.bb

diff --git a/packages/initrdscripts/initramfs-image-ipk_1.0.bb b/packages/initrdscripts/initramfs-image-ipk_1.0.bb
deleted file mode 100644
index 8c79c24478..0000000000
--- a/packages/initrdscripts/initramfs-image-ipk_1.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Boot initramfs as a package"
-PR = "r1"
-
-do_compile() {
-	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image
-}
-
-do_install() {
-	install -d ${D}/boot/
-	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image -c deploy_to
-}
-
-FILES_${PN} += "/boot/*"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/initrdscripts/kernel-initramfs_1.0.bb b/packages/initrdscripts/kernel-initramfs_1.0.bb
deleted file mode 100644
index be1c067ba2..0000000000
--- a/packages/initrdscripts/kernel-initramfs_1.0.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "A kernel with internal initramfs"
-PR = "r1"
-
-#inherit kernel
-KERNEL_IMAGETYPE ?= "zImage"
-
-# Name of initramfs recipe to build and put result into kernel
-KERNEL_INITRAMFS ?= "initramfs-image"
-
-do_compile() {
-	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${WORKDIR}/initramfs.bin bitbake ${KERNEL_INITRAMFS} -c deploy_to
-	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} INITRAMFS_LOC=${WORKDIR}/initramfs.bin DEPLOY_TO=${WORKDIR}/\${KERNEL_IMAGE_BASE_NAME} bitbake virtual/kernel -c builtin_initramfs
-}
-
-do_install() {
-        install -d ${D}/boot/
-	install -m 644 ${WORKDIR}/${KERNEL_IMAGETYPE}* ${D}/boot/${KERNEL_IMAGETYPE}-${@get_pv(d)}
-}
-
-def get_version(d):
-	import bb
-	import os
-	dest = bb.data.getVar("WORKDIR", d, 1)
-	try:
-	    files = os.listdir(dest)
-	    files = filter(lambda f:f.startswith("zImage-"), files)
-	    ver = files[0][len("zImage-"):]
-	    return ver
-	except:
-	    return "dum-m-y"
-
-def get_pv(d):
-	ver = get_version(d)
-	verc = ver.split("-")
-	return verc[0] + "-" + verc[1]
-	
-def get_pr(d):
-	ver = get_version(d)
-	verc = ver.split("-")
-	return verc[2]
-
-PACKAGES = "kernel-image"
-FILES_kernel-image = "/boot/*"
-PKG_kernel-image = "kernel-image-${@get_pv(d)}"
-PKGPV_kernel-image = "${@get_pv(d)}"
-PKGPR_kernel-image = "${@get_pr(d)}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
cgit v1.2.3


From 673d1bb689817bb46661662b5d1459d587f038ab Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 15:22:06 +0000
Subject: zten: push patches upstream.  Add AUTHOR to bb file.

---
 packages/zten/files/zten.patch | 2 ++
 packages/zten/zten_1.6.2.bb    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/zten/files/zten.patch b/packages/zten/files/zten.patch
index 22ba56951a..3fff27a23d 100644
--- a/packages/zten/files/zten.patch
+++ b/packages/zten/files/zten.patch
@@ -1,3 +1,5 @@
+upstream: no upstream bug tracker. Laibsch contacted author by mail on 2008-02-17.
+
 --- zten/zten.pro.orig	2003-02-16 16:45:44.000000000 +0100
 +++ zten/zten.pro	2006-04-23 18:50:19.000000000 +0200
 @@ -1,11 +1,9 @@
diff --git a/packages/zten/zten_1.6.2.bb b/packages/zten/zten_1.6.2.bb
index b5a4c6eac1..33feae0911 100644
--- a/packages/zten/zten_1.6.2.bb
+++ b/packages/zten/zten_1.6.2.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "EB*/EPWING dictionary browser for Linux Zaurus"
+AUTHOR = "Yuuichi Teranishi <teranisi@gohome.org>"
 HOMEPAGE = "http://www.gohome.org/zten"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-- 
cgit v1.2.3


From 221ba4650fa3b92d3abc6f5c8f0291cbddedee18 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Feb 2008 18:17:05 +0000
Subject: openmoko-sound-system2: remove hard-coded fragment size for alsa sink

---
 packages/openmoko2/openmoko-sound-system2/session  | 2 +-
 packages/openmoko2/openmoko-sound-system2_0.1.0.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session
index ed2346d55f..7ba07e9784 100644
--- a/packages/openmoko2/openmoko-sound-system2/session
+++ b/packages/openmoko2/openmoko-sound-system2/session
@@ -1,7 +1,7 @@
 #!/usr/bin/pulseaudio -nF
 
 # Create autoload entries for the device drivers
-add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
+add-autoload-sink output module-alsa-sink sink_name=output
 add-autoload-source input module-alsa-source source_name=input
 
 # Load several protocols
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index 29d0cba1fe..ac281dad76 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -13,7 +13,7 @@ RDEPENDS = "\
 "
 RREPLACES = "openmoko-sound-system"
 RPROVIDES = "openmoko-sound-system"
-PR = "r4"
+PR = "r5"
 
 inherit openmoko-base update-rc.d
 
-- 
cgit v1.2.3


From befe5e55ec935233638e8adfa0d4ba5ead58f2c8 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Feb 2008 18:19:06 +0000
Subject: pulseaudio: 0.9.9 works good enough to be the default version now *
 add pulse to audio user group, so it can run as system daemon eventually

---
 packages/pulseaudio/pulse.inc           | 7 ++++---
 packages/pulseaudio/pulseaudio_0.9.9.bb | 6 ++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index b6b622d9c6..7f7f205613 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -20,8 +20,8 @@ EXTRA_OECONF = "\
 		--with-glib \
 		--with-alsa \
 		--with-oss \
-                --with-hal \
-		"
+		--with-hal \
+"
 
 PARALLEL_MAKE = ""
 
@@ -83,7 +83,8 @@ pkg_postinst_${PN}-server() {
         grep -q pulse: /etc/group || addgroup pulse
         grep -q pulse: /etc/passwd || \
             adduser --disabled-password --home=/var/run/pulse --system \
-                    --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse                                            
+                    --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
+        adduser pulse audio
         /etc/init.d/populate-volatile.sh update
 }
 
diff --git a/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb
index d1e5706809..b884c27dd6 100644
--- a/packages/pulseaudio/pulseaudio_0.9.9.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.9.bb
@@ -8,11 +8,9 @@ SRC_URI += "\
   file://fix-dbus-without-hal.patch;patch=1 \
 "            
 
-PR = "r1"
+PR = "r2"
 
 # problems w/ pulseaudio 0.9.9 atm:
 # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
 # 2.) doesn't build w/ glibc TLS support (hence patched out)
-# 3.) hangs, if used with gst-pulse 0.9.7, fails with hierarchical pthread stuff
-DEFAULT_PREFERENCE = "-1"
-
+# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)
-- 
cgit v1.2.3


From 094aa0b6c929924c7cf0915c5d2cfc1234adb73b Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Feb 2008 18:19:21 +0000
Subject: gst-plug-pulse 0.9.7 new default version

---
 packages/gstreamer/gst-plugin-pulse_0.9.7.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
index 5a83f3915b..8351856143 100644
--- a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
+++ b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
@@ -4,8 +4,6 @@ LICENSE = "GPL"
 DEPENDS = "gstreamer pulseaudio"
 PR = "r1"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \
 	file://dont-overload-pulseaudio.patch;patch=1"
 S = "${WORKDIR}/gst-pulse-${PV}"
-- 
cgit v1.2.3


From 55f1bbed28e78a1f327b5ac198a0e54d02263890 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Feb 2008 18:20:56 +0000
Subject: sane-srvrevs.inc: bump gsm0710muxd to r77

---
 conf/distro/include/sane-srcrevs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4d92f48928..755b874083 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -26,7 +26,7 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "73"
+SRCREV_pn-gsm0710muxd ?= "77"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
-- 
cgit v1.2.3


From bfcee58f3400d1fed759a65117ddbde78fca768f Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 20:47:10 +0000
Subject: wxbase: consolidate into wxwidgets project directory.

---
 packages/wxbase/.mtn2git_empty       |  0
 packages/wxbase/wxbase_2.6.2.bb      | 54 ------------------------------------
 packages/wxbase/wxbase_2.7+cvs.bb    | 53 -----------------------------------
 packages/wxwidgets/wxbase_2.6.2.bb   | 54 ++++++++++++++++++++++++++++++++++++
 packages/wxwidgets/wxbase_2.7+cvs.bb | 53 +++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 107 deletions(-)
 delete mode 100644 packages/wxbase/.mtn2git_empty
 delete mode 100644 packages/wxbase/wxbase_2.6.2.bb
 delete mode 100644 packages/wxbase/wxbase_2.7+cvs.bb
 create mode 100644 packages/wxwidgets/wxbase_2.6.2.bb
 create mode 100644 packages/wxwidgets/wxbase_2.7+cvs.bb

diff --git a/packages/wxbase/.mtn2git_empty b/packages/wxbase/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb
deleted file mode 100644
index 07d9199ae1..0000000000
--- a/packages/wxbase/wxbase_2.6.2.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
-
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxBase-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.6.so*"
-
-do_configure() {
-       oe_runconf
-}
-
-do_stage() {
-       install -d ${STAGING_INCDIR}/wx-2.6/wx
-       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
-       cp -pR lib/libwx* ${STAGING_LIBDIR}
-       cp -pR lib/wx     ${STAGING_LIBDIR}
-       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
-       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
-           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
-           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
-           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
-           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
-}
-
-FILES_${PN} += " \
-       ${libdir}/wx/config"
-
-FILES_${PN}-dev += " \
-       ${libdir}/wx/include \
-       ${datadir}/bakefile"
-
-do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
-       install -d ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p CHANGES.txt     ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p COPYING.LIB     ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p LICENCE.txt     ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p README.txt      ${D}${docdir}/${PN}-${PV}
-}
diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb
deleted file mode 100644
index 772ea4e27f..0000000000
--- a/packages/wxbase/wxbase_2.7+cvs.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
-
-
-SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2"
-#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxGTK"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gui --enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.7*"
-
-do_configure() {
-       oe_runconf
-}
-
-do_stage() {
-       install -d ${STAGING_INCDIR}/wx-2.7/wx
-       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
-       cp -pR lib/libwx* ${STAGING_LIBDIR}
-       cp -pR lib/wx     ${STAGING_LIBDIR}
-       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
-       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
-           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
-           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
-           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
-           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
-}
-
-FILES_${PN} += " \
-       ${libdir}/wx/config"
-
-FILES_${PN}-dev += " \
-       ${libdir}/wx/include \
-       ${datadir}/bakefile"
-
-do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-       ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
-       install -d ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p docs/*.txt      ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}
-}
diff --git a/packages/wxwidgets/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.2.bb
new file mode 100644
index 0000000000..07d9199ae1
--- /dev/null
+++ b/packages/wxwidgets/wxbase_2.6.2.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "jpeg libpng zlib"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxBase-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.6.so*"
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.6/wx
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
+}
+
+FILES_${PN} += " \
+       ${libdir}/wx/config"
+
+FILES_${PN}-dev += " \
+       ${libdir}/wx/include \
+       ${datadir}/bakefile"
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p CHANGES.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p COPYING.LIB     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p LICENCE.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p README.txt      ${D}${docdir}/${PN}-${PV}
+}
diff --git a/packages/wxwidgets/wxbase_2.7+cvs.bb b/packages/wxwidgets/wxbase_2.7+cvs.bb
new file mode 100644
index 0000000000..772ea4e27f
--- /dev/null
+++ b/packages/wxwidgets/wxbase_2.7+cvs.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "jpeg libpng zlib"
+
+
+SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2"
+#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxGTK"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gui --enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.7*"
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.7/wx
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
+}
+
+FILES_${PN} += " \
+       ${libdir}/wx/config"
+
+FILES_${PN}-dev += " \
+       ${libdir}/wx/include \
+       ${datadir}/bakefile"
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p docs/*.txt      ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}
+}
-- 
cgit v1.2.3


From ec91747176dcfbb05f2a3e87100b67ecdd076013 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 21:08:59 +0000
Subject: acpid: push gcc patch upstream and consolidate identical patches.

---
 packages/acpid/acpid-1.0.3/.mtn2git_empty |  0
 packages/acpid/acpid-1.0.3/gcc40.patch    | 13 -------------
 packages/acpid/acpid-1.0.4/.mtn2git_empty |  0
 packages/acpid/acpid-1.0.4/gcc40.patch    | 13 -------------
 packages/acpid/acpid/.mtn2git_empty       |  0
 packages/acpid/acpid/gcc40.patch          | 15 +++++++++++++++
 6 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 packages/acpid/acpid-1.0.3/.mtn2git_empty
 delete mode 100644 packages/acpid/acpid-1.0.3/gcc40.patch
 delete mode 100644 packages/acpid/acpid-1.0.4/.mtn2git_empty
 delete mode 100644 packages/acpid/acpid-1.0.4/gcc40.patch
 create mode 100644 packages/acpid/acpid/.mtn2git_empty
 create mode 100644 packages/acpid/acpid/gcc40.patch

diff --git a/packages/acpid/acpid-1.0.3/.mtn2git_empty b/packages/acpid/acpid-1.0.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/acpid/acpid-1.0.3/gcc40.patch b/packages/acpid/acpid-1.0.3/gcc40.patch
deleted file mode 100644
index dbe090ba41..0000000000
--- a/packages/acpid/acpid-1.0.3/gcc40.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpid-1.0.3/ud_socket.c
-===================================================================
---- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
-+++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
-@@ -58,7 +58,7 @@
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {
diff --git a/packages/acpid/acpid-1.0.4/.mtn2git_empty b/packages/acpid/acpid-1.0.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/acpid/acpid-1.0.4/gcc40.patch b/packages/acpid/acpid-1.0.4/gcc40.patch
deleted file mode 100644
index dbe090ba41..0000000000
--- a/packages/acpid/acpid-1.0.4/gcc40.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpid-1.0.3/ud_socket.c
-===================================================================
---- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
-+++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
-@@ -58,7 +58,7 @@
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {
diff --git a/packages/acpid/acpid/.mtn2git_empty b/packages/acpid/acpid/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/acpid/acpid/gcc40.patch b/packages/acpid/acpid/gcc40.patch
new file mode 100644
index 0000000000..5320cee0bb
--- /dev/null
+++ b/packages/acpid/acpid/gcc40.patch
@@ -0,0 +1,15 @@
+upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341
+
+Index: acpid-1.0.3/ud_socket.c
+===================================================================
+--- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
++++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
+@@ -58,7 +58,7 @@
+ 	while (1) {
+ 		int newsock = 0;
+ 		struct sockaddr_un cliaddr;
+-		int len = sizeof(struct sockaddr_un);
++		socklen_t len = sizeof(struct sockaddr_un);
+ 
+ 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
+ 		if (newsock < 0) {
-- 
cgit v1.2.3


From fb4ada7351bbe36370505d8244c95f47614aa636 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:19:59 +0000
Subject: packages/libmrss/files/better-parse-url-r0.patch: Document what's up
 with this patch, hopefully some one is sending it upstream

---
 packages/libmrss/files/better-parse-url-r0.patch | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch
index 94a78110a2..18a3ef56e2 100644
--- a/packages/libmrss/files/better-parse-url-r0.patch
+++ b/packages/libmrss/files/better-parse-url-r0.patch
@@ -1,3 +1,10 @@
+upstream: bakunin_at_autistici_dot_org
+status: API addition not proposed upstream
+comment: API addition to not manually setup the CURL connection and still
+be able to get the transfered feed and save it to secondary storage. done
+by zecke for the OpenMoko RSS reader.
+
+
 Index: libmrss-0.17.2/src/mrss.h
 ===================================================================
 --- libmrss-0.17.2.orig/src/mrss.h	2007-04-02 14:42:55.000000000 +0200
-- 
cgit v1.2.3


From 45bb225e01108328a5006ef0b8238e94737d4f66 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:27:45 +0000
Subject: packages/glibc/zecke-sane-readelf.patch: This was needed because OSX
 has no readelf command by default and thread support of the compiler was
 misdetected to the missing readelf.

---
 packages/glibc/glibc-2.4/zecke-sane-readelf.patch       | 5 +++++
 packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
index 023b6a51bc..229db09fb3 100644
--- a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
+++ b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
@@ -1,3 +1,8 @@
+upstream: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3004
+status: WONTFIX
+comment: Use OEs version of the readelf version. There might be no
+host system version (e.g. on OSX) or it is not multiarch.
+
 Index: glibc-2.4/configure
 ===================================================================
 --- glibc-2.4.orig/configure	2006-03-06 12:18:56.000000000 +0100
diff --git a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
index c57494f937..7dc699cfad 100644
--- a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
+++ b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
@@ -1,3 +1,8 @@
+upstream: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3004
+status: WONTFIX
+comment: Use OEs version of the readelf version. There might be no
+host system version (e.g. on OSX) or it is not multiarch.
+
 Index: glibc-2.3.2/configure
 ===================================================================
 --- glibc-2.3.2.orig/configure	2006-08-05 20:18:11.000000000 +0200
-- 
cgit v1.2.3


From 813b702be534bd460e69c32ac4671e8be7573204 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:36:24 +0000
Subject: packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch: Document this
 patch and explain why it is a hack

---
 packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
index 6afb10d6ef..0b401defd8 100644
--- a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
@@ -1,3 +1,16 @@
+upstream: n/a
+status: evil hack
+comment: Including host system headers when cross compiling can lead to weird
+issues, in the best case compile issues, in the worst case crashes. E.g. if you
+are building a uclibc system, you certainly do not want glibc headers or OSX libc
+headers to be picked up. To avoid that this patch is penetalizing certain common
+Linux/Unix host directories.
+
+To send the patch upstream the evil paths should be specified by
+a setting or command-line options. Until now this is a evil hack assuming
+certain host system paths. E.g. /usr/local/ and other common paths should be
+added.
+
 Index: gcc-4.0.2/gcc/c-incpath.c
 ===================================================================
 --- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
-- 
cgit v1.2.3


From 1b1d31889caebc06e4a140011ee41db4b2f4c989 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 17 Feb 2008 21:37:25 +0000
Subject: packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch: When cross compiling we
 want to use gcc's cpp for the cross compiled headers

---
 packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
-- 
cgit v1.2.3


From f759ed80ed16b61b1641bd1bbada501607b600a4 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 17 Feb 2008 22:17:49 +0000
Subject: zaurus-2.6: add pcmcia modules for Poodle

---
 conf/machine/include/zaurus-2.6.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index f6d1ec0d8e..9a4d373de0 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -31,7 +31,7 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd"
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
 	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd"
 
-- 
cgit v1.2.3


From 442bbafc8dfde04b2c082cba2567aa016152ffa2 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 17 Feb 2008 22:19:04 +0000
Subject: task-base: add crypto_algapi/cryptomgr for task-base-wifi

---
 packages/tasks/task-base.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index bb89ac0c2b..77aa07de00 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 = "r61"
+PR = "r62"
 
 inherit task
 
@@ -345,6 +345,8 @@ RRECOMMENDS_task-base-wifi = "\
     kernel-module-ieee80211-crypt-wep \
     kernel-module-ecb \
     kernel-module-arc4 \
+    kernel-module-crypto_algapi \
+    kernel-module-cryptomgr \
     kernel-module-michael-mic \
     kernel-module-aes"
 
-- 
cgit v1.2.3


From 6b2b68e32c0673c71d31aa40c063d4eb52de2452 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 17 Feb 2008 22:20:29 +0000
Subject: linux-rp 2.6.24: remove repeated content from pxafb.patch

---
 packages/linux/linux-rp-2.6.24/pxafb.patch | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/linux/linux-rp-2.6.24/pxafb.patch b/packages/linux/linux-rp-2.6.24/pxafb.patch
index efcfb079b2..7fe693cd91 100644
--- a/packages/linux/linux-rp-2.6.24/pxafb.patch
+++ b/packages/linux/linux-rp-2.6.24/pxafb.patch
@@ -11,16 +11,3 @@ Index: linux-2.6.23/drivers/video/pxafb.c
  		lccr3 = fbi->reg_lccr3;
  		set_hsync_time(fbi, pcd);
  		fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
-Index: linux-2.6.23/drivers/video/pxafb.c
-===================================================================
---- linux-2.6.23.orig/drivers/video/pxafb.c	2008-01-25 16:25:21.000000000 -0800
-+++ linux-2.6.23/drivers/video/pxafb.c	2008-01-25 16:32:14.000000000 -0800
-@@ -1194,7 +1194,7 @@
- 		if ((clkinfo->old == 13000))
- 			break;
- 
--		pcd = get_pcd(fbi->fb.var.pixclock);
-+		pcd = get_pcd(fbi,fbi->fb.var.pixclock);
- 		lccr3 = fbi->reg_lccr3;
- 		set_hsync_time(fbi, pcd);
- 		fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
-- 
cgit v1.2.3


From b58a2b81ad312b1699f0cdbb6b8162ba91d21ead Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 23:47:59 +0000
Subject: task-opie-all: drop opie-usermanager.  Fixes bug 3311.

---
 packages/tasks/task-opie-all.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 4666b4ab8d..5487985fd4 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -50,8 +50,7 @@ RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-butto
                       opie-formatter opie-language opie-launcher-settings \
                       opie-light-and-power opie-mediummount opie-networksettings \
                       opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
-                      opie-systemtime opie-usermanager opie-icon-reload \
-                      opie-vmemo-settings"
+                      opie-systemtime opie-icon-reload opie-vmemo-settings"
 
 RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
                  opie-mail opie-pimconverter"
-- 
cgit v1.2.3


From 701691dd6d5b1a6c129c455730026ee726d16508 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 17 Feb 2008 23:57:48 +0000
Subject: libmrss: document better-parse-url-r0.patch being sent upstream.

---
 packages/libmrss/files/better-parse-url-r0.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch
index 18a3ef56e2..72fa3688a7 100644
--- a/packages/libmrss/files/better-parse-url-r0.patch
+++ b/packages/libmrss/files/better-parse-url-r0.patch
@@ -1,5 +1,5 @@
-upstream: bakunin_at_autistici_dot_org
-status: API addition not proposed upstream
+upstream: mailed to bakunin_at_autistici_dot_org by Laibsch
+status: pending
 comment: API addition to not manually setup the CURL connection and still
 be able to get the transfered feed and save it to secondary storage. done
 by zecke for the OpenMoko RSS reader.
-- 
cgit v1.2.3


From 632f5de2cc8377e4856c5062f3c7c863b090766e Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 00:25:58 +0000
Subject: gcc: add upstream comments to three more, otherwise identical
 patches. * complimentary to 4b9bf269fccb2d8469b9d1ccfe6d73ac060a6b29 *
 "upstream: n/a" should really have a more verbose explanation   is it a hack,
 is upstream being a d0rk, did you try but failed?

---
 packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch | 4 ++++
 packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch | 4 ++++
 packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
diff --git a/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
diff --git a/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
index 42ec190600..921cab6e18 100644
--- a/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
-- 
cgit v1.2.3


From c0cb44d08ae453391b643b3e458a349dc00b5a51 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 00:40:37 +0000
Subject: tshark: initial commit of tshark, the text-based version of
 wireshark.  closes 2283. * the latest version 0.99.7 fails do_patch, so I
 left everything at 0.99.4

---
 packages/wireshark/tshark_0.99.4.bb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/wireshark/tshark_0.99.4.bb

diff --git a/packages/wireshark/tshark_0.99.4.bb b/packages/wireshark/tshark_0.99.4.bb
new file mode 100644
index 0000000000..4f8f6781bf
--- /dev/null
+++ b/packages/wireshark/tshark_0.99.4.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "tshark is the text based verion of wireshark - a popular network protocol analyzer"
+HOMEPAGE = "http://www.ethereal.com"
+SECTION = "network"
+LICENSE = "GPL"
+DEPENDS = "perl-native gnutls libpcap pcre expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+           file://use-our-lemon.patch;patch=1 \
+	   file://no-host-includes.patch;patch=1"
+
+S=${WORKDIR}/wireshark-${PV}
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-wireshark"
+
+do_compile_prepend() {
+	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+}
+
-- 
cgit v1.2.3


From 260ca99bdd4b18f0575af0ef9cc063aec09dc367 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 01:22:55 +0000
Subject: djvulibre: replace QTDIR with PALMTOPDIR to enable successful
 compilation.  closes 3044. * use sourceforge mirror * reorder fields
 according to style guide

---
 packages/djvulibre/djvulibre_3.5.19.bb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb
index 5ba5751f2d..8a90efe85c 100644
--- a/packages/djvulibre/djvulibre_3.5.19.bb
+++ b/packages/djvulibre/djvulibre_3.5.19.bb
@@ -1,27 +1,23 @@
 DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
 LICENSE = "GPL"
-
 DEPENDS = "jpeg libpng tiff"
+PR = "r1"
 
-SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \
+SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
            file://fix-cross-configure.patch;patch=1"
 
-
 inherit qt4x11 autotools pkgconfig
 
 #export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
 #export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
 
 EXTRA_OECONF = " --enable-threads \
-                 --with-qt=${QTDIR} "
-
-PACKAGES =+ "libdjvulibre"
-
-FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
-FILES_${PN} += "${datadir}/djvu"
+                 --with-qt=${PAMLTOPDIR} "
 
 do_stage() {
         autotools_stage_all
 }
 
-
+PACKAGES =+ "libdjvulibre"
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
-- 
cgit v1.2.3


From 8ae01e8bbfb6d2b2638eedbecda66b317f676395 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 01:28:04 +0000
Subject: djvulibre: update to version 3.5.20.

---
 packages/djvulibre/djvulibre_3.5.19.bb | 23 -----------------------
 packages/djvulibre/djvulibre_3.5.20.bb | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 packages/djvulibre/djvulibre_3.5.19.bb
 create mode 100644 packages/djvulibre/djvulibre_3.5.20.bb

diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb
deleted file mode 100644
index 8a90efe85c..0000000000
--- a/packages/djvulibre/djvulibre_3.5.19.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng tiff"
-PR = "r1"
-
-SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
-           file://fix-cross-configure.patch;patch=1"
-
-inherit qt4x11 autotools pkgconfig
-
-#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
-#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
-
-EXTRA_OECONF = " --enable-threads \
-                 --with-qt=${PAMLTOPDIR} "
-
-do_stage() {
-        autotools_stage_all
-}
-
-PACKAGES =+ "libdjvulibre"
-FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
-FILES_${PN} += "${datadir}/djvu"
diff --git a/packages/djvulibre/djvulibre_3.5.20.bb b/packages/djvulibre/djvulibre_3.5.20.bb
new file mode 100644
index 0000000000..8a90efe85c
--- /dev/null
+++ b/packages/djvulibre/djvulibre_3.5.20.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng tiff"
+PR = "r1"
+
+SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
+           file://fix-cross-configure.patch;patch=1"
+
+inherit qt4x11 autotools pkgconfig
+
+#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
+#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
+
+EXTRA_OECONF = " --enable-threads \
+                 --with-qt=${PAMLTOPDIR} "
+
+do_stage() {
+        autotools_stage_all
+}
+
+PACKAGES =+ "libdjvulibre"
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
-- 
cgit v1.2.3


From 2e5342507b4e589c1d3dcbffe8a8d2617326e979 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Feb 2008 02:11:37 +0000
Subject: qclockchange: update to version 0.1b.  Closes 2653.

---
 packages/qclockchange/files/.mtn2git_empty       |   0
 packages/qclockchange/files/qclockchange.desktop |   6 ++++++
 packages/qclockchange/files/qclockchange.png     | Bin 0 -> 5472 bytes
 packages/qclockchange/qclockchange_0.1a.bb       |  22 ---------------------
 packages/qclockchange/qclockchange_0.1b.bb       |  24 +++++++++++++++++++++++
 5 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 packages/qclockchange/files/.mtn2git_empty
 create mode 100644 packages/qclockchange/files/qclockchange.desktop
 create mode 100644 packages/qclockchange/files/qclockchange.png
 delete mode 100644 packages/qclockchange/qclockchange_0.1a.bb
 create mode 100644 packages/qclockchange/qclockchange_0.1b.bb

diff --git a/packages/qclockchange/files/.mtn2git_empty b/packages/qclockchange/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/qclockchange/files/qclockchange.desktop b/packages/qclockchange/files/qclockchange.desktop
new file mode 100644
index 0000000000..9463623883
--- /dev/null
+++ b/packages/qclockchange/files/qclockchange.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Comment= Changes the CPU frequency
+Exec=qclockchange
+Icon=qclockchange
+Type=Application
+Name=Qclockchange
diff --git a/packages/qclockchange/files/qclockchange.png b/packages/qclockchange/files/qclockchange.png
new file mode 100644
index 0000000000..861fe2eecc
Binary files /dev/null and b/packages/qclockchange/files/qclockchange.png differ
diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/pa