From 96770840c270ff272c34a7df4050c7a2076d78a6 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 15 Oct 2006 02:11:45 +0000
Subject: diffutils 2.8.1: Use alternatives for diff since busybox also
 supplies a diff command. As per #1472.

---
 packages/diffutils/diffutils_2.8.1.bb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/diffutils/diffutils_2.8.1.bb b/packages/diffutils/diffutils_2.8.1.bb
index e8de2cad62..a0a7b7dad9 100644
--- a/packages/diffutils/diffutils_2.8.1.bb
+++ b/packages/diffutils/diffutils_2.8.1.bb
@@ -3,11 +3,11 @@ LICENSE = "GPL"
 DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
 sdiff, and cmp utilities. These programs are usually \
 used for creating patch files."
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
 
-inherit autotools
+inherit autotools update-alternatives
 
 # diffutils assumes non-glibc compilation with uclibc and
 # this causes it to generate its own implementations of
@@ -15,3 +15,11 @@ inherit autotools
 # because it uses __mempcpy, there are other things (TBD:
 # see diffutils.mk in buildroot)
 EXTRA_OECONF_linux-uclibc = "--without-included-regex"
+
+do_install_append () {
+        mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN}
+}
+
+ALTERNATIVE_NAME = "diff"
+ALTERNATIVE_PATH = "diff.${PN}"
+ALTERNATIVE_PRIORITY = "100"
-- 
cgit v1.2.3


From 9ce575c7b0402e8533017bb3c93cbcdbc59541c7 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 15 Oct 2006 02:15:12 +0000
Subject: psmisc: Psmisc was updated to use alternatives for fuser, however the
 PR wasn't incremented, so bump the PR so the change gets propagated.

---
 packages/psmisc/psmisc_21.8.bb | 2 +-
 packages/psmisc/psmisc_22.2.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb
index abbcc28987..b1e1ae2fad 100644
--- a/packages/psmisc/psmisc_21.8.bb
+++ b/packages/psmisc/psmisc_21.8.bb
@@ -1,3 +1,3 @@
 require psmisc.inc
-PR = "r1"
+PR = "r2"
 SRC_URI += "file://signames-header-fix.patch;patch=1"
diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb
index 4f0d7f219d..62327fa4d6 100644
--- a/packages/psmisc/psmisc_22.2.bb
+++ b/packages/psmisc/psmisc_22.2.bb
@@ -1,2 +1,2 @@
 require psmisc.inc
-PR = "r0"
+PR = "r1"
-- 
cgit v1.2.3


From b6c49e03bd76e8b035ac0857ca27879d4b174273 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 15 Oct 2006 02:39:21 +0000
Subject: fakeroot 1.2.13: Fakeroot requires getopt which is provided via
 util-linux, so make it RDEPEND on util-linux. Closes #1452.

---
 packages/fakeroot/fakeroot_1.2.13.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb
index 6867a39c93..0326ea41d7 100644
--- a/packages/fakeroot/fakeroot_1.2.13.bb
+++ b/packages/fakeroot/fakeroot_1.2.13.bb
@@ -2,6 +2,9 @@ DESCRIPTION = "Gives a fake root environment"
 SECTION = "base"
 HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html"
 LICENSE = "GPL"
+# fakeroot needs getopt which is provided by the util-linux package
+RDEPENDS = "util-linux"
+PR = "r1"
 
 SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz"
 
-- 
cgit v1.2.3


From 4a94698d16d850c868abfe5b966fd95cbe01e758 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 15 Oct 2006 02:40:40 +0000
Subject: fakeroot 1.2.13: Run it through oe-stylize.py to tidy it up.

---
 packages/fakeroot/fakeroot_1.2.13.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb
index 0326ea41d7..e29cf162b4 100644
--- a/packages/fakeroot/fakeroot_1.2.13.bb
+++ b/packages/fakeroot/fakeroot_1.2.13.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Gives a fake root environment"
-SECTION = "base"
 HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html"
+SECTION = "base"
 LICENSE = "GPL"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
@@ -11,7 +11,7 @@ SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz"
 inherit autotools
 
 do_stage() {
-	install -d ${STAGING_INCDIR}/fakeroot
-	install -m 644 *.h ${STAGING_INCDIR}/fakeroot
-	autotools_stage_all
+        install -d ${STAGING_INCDIR}/fakeroot
+        install -m 644 *.h ${STAGING_INCDIR}/fakeroot
+        autotools_stage_all
 }
-- 
cgit v1.2.3


From 40e99d4a068c5c3e5031077ec692553755615197 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 10:24:37 +0000
Subject: libaio: revert __io_getevents_0_4.patch (FTBFS on x86) and fix ARM
 version of io_syscall5 as suggested by Jamie Lenehan

---
 packages/libaio/libaio-0.3.106/00_arches.patch     |  2 +-
 .../libaio/libaio-0.3.106/__io_getevents_0_4.patch | 29 ----------------------
 packages/libaio/libaio_0.3.106.bb                  |  3 +--
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch

diff --git a/packages/libaio/libaio-0.3.106/00_arches.patch b/packages/libaio/libaio-0.3.106/00_arches.patch
index 7e8b569294..f4ca5ff11d 100644
--- a/packages/libaio/libaio-0.3.106/00_arches.patch
+++ b/packages/libaio/libaio-0.3.106/00_arches.patch
@@ -751,7 +751,7 @@
 +}
 +
 +#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)	\
-+type ffname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\
++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\
 +  __SYS_REG(sname)							\
 +  register long __r0 __asm__("r0") = (long)arg1;			\
 +  register long __r1 __asm__("r1") = (long)arg2;			\
diff --git a/packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch b/packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch
deleted file mode 100644
index ce4578515c..0000000000
--- a/packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Marcin Juszkiewicz <hrw@openembedded.org>
-
-Fast hack to get applications which use libaio linked.
-
-Get rid of:
-/home/hrw/devel/build/dev/tmp/staging/arm-linux/lib/libaio.so: undefined reference to `__io_getevents_0_4'
-
-Index: libaio-0.3.106/src/io_getevents.c
-===================================================================
---- libaio-0.3.106.orig/src/io_getevents.c	2003-06-18 21:58:21.000000000 +0200
-+++ libaio-0.3.106/src/io_getevents.c	2006-10-14 19:42:49.000000000 +0200
-@@ -22,7 +22,7 @@
- #include <time.h>
- #include "syscall.h"
- 
--io_syscall5(int, __io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout)
-+io_syscall5(int, io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout)
- 
- #define AIO_RING_MAGIC                  0xa10a10a1
- 
-@@ -51,7 +51,7 @@
- 	}
- 	
- do_syscall:	
--	return __io_getevents_0_4(ctx, min_nr, nr, events, timeout);
-+	return io_getevents_0_4(ctx, min_nr, nr, events, timeout);
- }
- 
- DEFSYMVER(io_getevents_0_4, io_getevents, 0.4)
diff --git a/packages/libaio/libaio_0.3.106.bb b/packages/libaio/libaio_0.3.106.bb
index e4d758c368..bc70bbe8d2 100644
--- a/packages/libaio/libaio_0.3.106.bb
+++ b/packages/libaio/libaio_0.3.106.bb
@@ -1,10 +1,9 @@
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \
            file://00_arches.patch;patch=1 \
-           file://__io_getevents_0_4.patch;patch=1 \
            file://destdir.patch;patch=1"
 
 do_stage() {
-- 
cgit v1.2.3


From 77c386448fdf3c2b8bc9a64a67dbcd12098d257f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 11:37:41 +0000
Subject: openzaurus-sa: added COMPATIBLE_MACHINE

---
 packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index a79d4f3a00..34ccfb14f3 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -8,6 +8,7 @@ PXAV = "3"
 SHARPV = "20030509"
 PR = "r23"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
+COMPATIBLE_MACHINE = "collie"
 
 SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
            file://cacko.patch;patch=1 \
-- 
cgit v1.2.3


From 2cda7fdd7eb0d2d1493617e6870d459399170301 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 11:38:49 +0000
Subject: openzaurus-pxa27x: added COMPATIBLE_MACHINE

---
 packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index eae524a7ae..edeb927f0d 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -5,6 +5,7 @@ PV = "2.4.20-rmk2-embedix"
 LICENSE = "GPL"
 KV = "2.4.20"
 PR = "r18"
+COMPATIBLE_MACHINE = "(akita|spitz)"
 
 SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2 \
            file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \
-- 
cgit v1.2.3


From 61db05650bdde4e3766a20e408da5bdf877a4f11 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 13:39:35 +0000
Subject: task-base: support 'pci' feature

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

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 50ca203b9a..d724e65b57 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 = "r9"
+PR = "r10"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -74,6 +74,7 @@ RDEPENDS_task-base = "\
     ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
@@ -149,6 +150,9 @@ task-base-kernel26-rdepends = "\
 task-base-keyboard-rdepends = "\
     keymaps"
 
+task-base-pci-rdepends = "\
+    pciutils"
+
 task-base-kernel26-extras-rrecommends = "\
     kernel-module-input \
     kernel-module-uinput"
-- 
cgit v1.2.3


From b2772e7b8f423dca4a6b5b490fa527241dd4dbf2 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 13:45:20 +0000
Subject: guiness: added pci to MACHINE_FEATURES

---
 conf/machine/guinness.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 35cb1d2070..12143edf63 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -17,7 +17,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci"
 
 require conf/machine/include/tune-athlonmp.conf
 
-- 
cgit v1.2.3


From 0383de771ac2db6d12d74ab24f8347ee1caa37b5 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 15 Oct 2006 14:04:52 +0000
Subject: h4000: Remove pcmcia from MACHINE_FEATURES. * h4000 has only internal
 pcmcia slot, to which acx100 wifi is hardwired. Thus, no need to support
 arbitrary PCMCIA devices.

---
 conf/machine/h4000.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index c12e487bf7..a9adfe4486 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 ROOT_FLASH_SIZE = "32"
 PCMCIA_MANAGER = "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
 
 #autoload on boot:
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
-- 
cgit v1.2.3


From f1831cf3e22b8b6c55679d661007f0fdb344f260 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 15 Oct 2006 14:39:21 +0000
Subject: python-pyrex[-native]: upgrade to 0.9.3.1 fixing compatibility with
 Python 2.4 This fixes errors like the following:    TypeError: swig_sources()
 takes exactly 2 arguments (3 given)

---
 packages/python/python-pyrex-native_0.9.3.1.bb |  9 +++++++++
 packages/python/python-pyrex-native_0.9.3.bb   |  9 ---------
 packages/python/python-pyrex_0.9.3.1.bb        | 14 ++++++++++++++
 packages/python/python-pyrex_0.9.3.bb          | 14 --------------
 4 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 packages/python/python-pyrex-native_0.9.3.1.bb
 delete mode 100644 packages/python/python-pyrex-native_0.9.3.bb
 create mode 100644 packages/python/python-pyrex_0.9.3.1.bb
 delete mode 100644 packages/python/python-pyrex_0.9.3.bb

diff --git a/packages/python/python-pyrex-native_0.9.3.1.bb b/packages/python/python-pyrex-native_0.9.3.1.bb
new file mode 100644
index 0000000000..d7ec81fd8e
--- /dev/null
+++ b/packages/python/python-pyrex-native_0.9.3.1.bb
@@ -0,0 +1,9 @@
+require python-pyrex_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+
+do_stage() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
diff --git a/packages/python/python-pyrex-native_0.9.3.bb b/packages/python/python-pyrex-native_0.9.3.bb
deleted file mode 100644
index d7ec81fd8e..0000000000
--- a/packages/python/python-pyrex-native_0.9.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require python-pyrex_${PV}.bb
-inherit native
-DEPENDS = "python-native"
-RDEPENDS = ""
-
-do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/python/python-pyrex_0.9.3.1.bb b/packages/python/python-pyrex_0.9.3.1.bb
new file mode 100644
index 0000000000..d0a5f826e0
--- /dev/null
+++ b/packages/python/python-pyrex_0.9.3.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Pyrex is a language specially designed for writing Python extension modules. \
+It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
+and the messy, low-level world of C."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "Pyrex"
+PR = "ml0"
+
+SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-pyrex_0.9.3.bb b/packages/python/python-pyrex_0.9.3.bb
deleted file mode 100644
index d0a5f826e0..0000000000
--- a/packages/python/python-pyrex_0.9.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Pyrex is a language specially designed for writing Python extension modules. \
-It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
-and the messy, low-level world of C."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-SRCNAME = "Pyrex"
-PR = "ml0"
-
-SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-- 
cgit v1.2.3


From ee3eeb5f7fdde0d7a8dec06e404d96006775916f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 15 Oct 2006 14:41:07 +0000
Subject: upgrade python-dbus to 0.71. patches (seem to be) no longer
 necessary. close #1479

---
 packages/python/python-dbus/.mtn2git_empty |   0
 packages/python/python-dbus/cross.patch    |  15 ---
 packages/python/python-dbus/gettext.patch  | 164 -----------------------------
 packages/python/python-dbus/tmpdir.patch   |  30 ------
 packages/python/python-dbus_0.23.bb        |  22 ----
 packages/python/python-dbus_0.71.bb        |  13 +++
 6 files changed, 13 insertions(+), 231 deletions(-)
 delete mode 100644 packages/python/python-dbus/.mtn2git_empty
 delete mode 100644 packages/python/python-dbus/cross.patch
 delete mode 100644 packages/python/python-dbus/gettext.patch
 delete mode 100644 packages/python/python-dbus/tmpdir.patch
 delete mode 100644 packages/python/python-dbus_0.23.bb
 create mode 100644 packages/python/python-dbus_0.71.bb

diff --git a/packages/python/python-dbus/.mtn2git_empty b/packages/python/python-dbus/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/python/python-dbus/cross.patch b/packages/python/python-dbus/cross.patch
deleted file mode 100644
index 6d1d9d8e7e..0000000000
--- a/packages/python/python-dbus/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- dbus-0.20/configure.in~cross
-+++ dbus-0.20/configure.in
-@@ -466,6 +466,7 @@
-     exit (0);
- ]])],
-               [have_abstract_sockets=yes],
-+              [have_abstract_sockets=no],
-               [have_abstract_sockets=no])
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
diff --git a/packages/python/python-dbus/gettext.patch b/packages/python/python-dbus/gettext.patch
deleted file mode 100644
index 7042bd0903..0000000000
--- a/packages/python/python-dbus/gettext.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-Index: dbus-0.23/configure.in
-===================================================================
---- dbus-0.23.orig/configure.in	2005-04-02 17:14:37.780040976 -0500
-+++ dbus-0.23/configure.in	2005-04-02 17:14:38.024003888 -0500
-@@ -22,6 +22,9 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- 
-+AM_GNU_GETTEXT_VERSION(0.11.5)
-+AM_GNU_GETTEXT([external], [need-ngettext])
-+
- AC_ARG_ENABLE(qt,               [  --enable-qt           enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto)
- AC_ARG_ENABLE(glib,             [  --enable-glib         enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto)
- AC_ARG_ENABLE(gtk,              [  --enable-gtk          enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto)
-Index: dbus-0.23/glib/Makefile.am
-===================================================================
---- dbus-0.23.orig/glib/Makefile.am	2004-07-29 04:00:45.000000000 -0400
-+++ dbus-0.23/glib/Makefile.am	2005-04-02 17:22:27.302662688 -0500
-@@ -15,7 +15,7 @@
- 	dbus-gvalue.c				\
- 	dbus-gvalue.h
- 
--libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
-+libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(LIBINTL) $(top_builddir)/dbus/libdbus-1.la
- ## don't export symbols that start with "_" (we use this 
- ## convention for internal symbols)
- libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
-Index: dbus-0.23/glib/dbus-glib-tool.c
-===================================================================
---- dbus-0.23.orig/glib/dbus-glib-tool.c	2004-08-09 23:07:00.000000000 -0400
-+++ dbus-0.23/glib/dbus-glib-tool.c	2005-04-02 17:14:38.024003888 -0500
-@@ -26,8 +26,13 @@
- #include "dbus-gparser.h"
- #include "dbus-gutils.h"
- #include <locale.h>
-+
-+#ifdef HAVE_GETTEXT
- #include <libintl.h>
- #define _(x) dgettext (GETTEXT_PACKAGE, x)
-+#else
-+#define _(x) x
-+#endif
- #define N_(x) x
- #include <stdio.h>
- #include <stdlib.h>
-Index: dbus-0.23/glib/dbus-glib.c
-===================================================================
---- dbus-0.23.orig/glib/dbus-glib.c	2004-08-09 23:07:00.000000000 -0400
-+++ dbus-0.23/glib/dbus-glib.c	2005-04-02 17:14:38.024003888 -0500
-@@ -27,8 +27,12 @@
- #include "dbus-gtest.h"
- #include "dbus-gutils.h"
- 
-+#ifdef HAVE_GETTEXT
- #include <libintl.h>
- #define _(x) dgettext (GETTEXT_PACKAGE, x)
-+#else
-+#define _(x) x
-+#endif
- #define N_(x) x
- 
- /**
-Index: dbus-0.23/glib/dbus-gmain.c
-===================================================================
---- dbus-0.23.orig/glib/dbus-gmain.c	2004-11-13 02:07:47.000000000 -0500
-+++ dbus-0.23/glib/dbus-gmain.c	2005-04-02 17:14:38.025003736 -0500
-@@ -27,8 +27,12 @@
- #include "dbus-gtest.h"
- #include "dbus-gutils.h"
- 
-+#ifdef HAVE_GETTEXT
- #include <libintl.h>
- #define _(x) dgettext (GETTEXT_PACKAGE, x)
-+#else
-+#define _(x) x
-+#endif
- #define N_(x) x
- 
- /**
-Index: dbus-0.23/glib/dbus-gparser.c
-===================================================================
---- dbus-0.23.orig/glib/dbus-gparser.c	2004-08-09 23:07:00.000000000 -0400
-+++ dbus-0.23/glib/dbus-gparser.c	2005-04-02 17:14:38.025003736 -0500
-@@ -20,12 +20,18 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  *
-  */
-+
-+#include <config.h>
- #include "dbus-gparser.h"
- #include "dbus-gidl.h"
- #include <string.h>
- 
-+#ifdef HAVE_GETTEXT
- #include <libintl.h>
- #define _(x) gettext ((x))
-+#else
-+#define _(x) x
-+#endif
- #define N_(x) x
- 
- #ifndef DOXYGEN_SHOULD_SKIP_THIS
-Index: dbus-0.23/tools/Makefile.am
-===================================================================
---- dbus-0.23.orig/tools/Makefile.am	2004-04-21 17:29:07.000000000 -0400
-+++ dbus-0.23/tools/Makefile.am	2005-04-02 17:22:00.712704976 -0500
-@@ -37,8 +37,8 @@
- 
- dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
- dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
--dbus_launch_LDADD= $(DBUS_X_LIBS)
--dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
-+dbus_launch_LDADD= $(DBUS_X_LIBS) $(LIBINTL)
-+dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(LIBINTL) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
- 
- man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
- EXTRA_DIST = $(man_MANS)
-Index: dbus-0.23/tools/dbus-launch.c
-===================================================================
---- dbus-0.23.orig/tools/dbus-launch.c	2004-08-09 23:07:01.000000000 -0400
-+++ dbus-0.23/tools/dbus-launch.c	2005-04-02 17:14:38.026003584 -0500
-@@ -22,6 +22,8 @@
-  */
- #include <config.h>
- #include <stdlib.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
-Index: dbus-0.23/tools/dbus-tree-view.c
-===================================================================
---- dbus-0.23.orig/tools/dbus-tree-view.c	2004-08-09 23:07:01.000000000 -0400
-+++ dbus-0.23/tools/dbus-tree-view.c	2005-04-02 17:14:38.026003584 -0500
-@@ -24,8 +24,12 @@
- #include <config.h>
- #include "dbus-tree-view.h"
- 
-+#ifdef HAVE_GETTEXT
- #include <libintl.h>
- #define _(x) dgettext (GETTEXT_PACKAGE, x)
-+#else
-+#define _(x) x
-+#endif
- #define N_(x) x
- 
- enum
-Index: dbus-0.23/tools/dbus-viewer.c
-===================================================================
---- dbus-0.23.orig/tools/dbus-viewer.c	2004-08-09 23:07:01.000000000 -0400
-+++ dbus-0.23/tools/dbus-viewer.c	2005-04-02 17:14:38.027003432 -0500
-@@ -30,8 +30,12 @@
- #include <glib/dbus-gparser.h>
- #include <glib/dbus-gutils.h>
- 
-+#ifdef HAVE_GETTEXT
- #include <libintl.h>
- #define _(x) dgettext (GETTEXT_PACKAGE, x)
-+#else
-+#define _(x) x
-+#endif
- #define N_(x) x
- 
- typedef struct
diff --git a/packages/python/python-dbus/tmpdir.patch b/packages/python/python-dbus/tmpdir.patch
deleted file mode 100644
index 838b903f0a..0000000000
--- a/packages/python/python-dbus/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dbus-0.22/configure.in.orig	2004-08-13 00:57:16.000000000 +0200
-+++ dbus-0.22/configure.in	2004-12-30 21:15:57.000000000 +0100
-@@ -1047,15 +1048,18 @@
- AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
- 
- #### Find socket directories
--if ! test -z "$TMPDIR" ; then
--   DEFAULT_SOCKET_DIR=$TMPDIR
--elif ! test -z "$TEMP" ; then
--   DEFAULT_SOCKET_DIR=$TEMP
--elif ! test -z "$TMP" ; then
--   DEFAULT_SOCKET_DIR=$TMP
--else
--   DEFAULT_SOCKET_DIR=/tmp
--fi
-+#if ! test -z "$TMPDIR" ; then
-+#   DEFAULT_SOCKET_DIR=$TMPDIR
-+#elif ! test -z "$TEMP" ; then
-+#   DEFAULT_SOCKET_DIR=$TEMP
-+#elif ! test -z "$TMP" ; then
-+#   DEFAULT_SOCKET_DIR=$TMP
-+#else
-+#   DEFAULT_SOCKET_DIR=/tmp
-+#fi
-+
-+# checks disabled to avoid expanding this at build time
-+DEFAULT_SOCKET_DIR=/tmp
- 
- if ! test -z "$with_test_socket_dir" ; then
-    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/packages/python/python-dbus_0.23.bb b/packages/python/python-dbus_0.23.bb
deleted file mode 100644
index cb208d6338..0000000000
--- a/packages/python/python-dbus_0.23.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
-SECTION = "devel/python"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
-RDEPENDS = "dbus"
-PR = "ml1"
-
-SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
-	   file://gettext.patch;patch=1"
-S = "${WORKDIR}/dbus-${PV}"
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x --enable-python"
-
-FILES_${PN} = "${libdir}/python2.4/site-packages/dbus.* ${libdir}/python2.4/site-packages/dbus_bindings.so"
-
diff --git a/packages/python/python-dbus_0.71.bb b/packages/python/python-dbus_0.71.bb
new file mode 100644
index 0000000000..2ef0ffa8dd
--- /dev/null
+++ b/packages/python/python-dbus_0.71.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
+RDEPENDS = "dbus"
+PR = "ml0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
+S = "${WORKDIR}/dbus-python-${PV}"
+
+inherit distutils
+
-- 
cgit v1.2.3


From 4dd04de4d4ef4ef090338b045fff6d422bd83220 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 14:55:40 +0000
Subject: openzaurus-unstable: set glibc version to same as in release
 versions: 2.3.5+cvs20050627 - probably will close #1421 bug

---
 conf/distro/openzaurus-unstable.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 51922b8ad4..6be29e5c1b 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -55,6 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_VERSION_binutils-cross = "2.16"
 PREFERRED_VERSION_binutils = "2.16"
 
+PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 #
 # Opie
 #
-- 
cgit v1.2.3


From 7b55d42bc99057d51ec5c8b4c3c8eb0f20407265 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 15 Oct 2006 17:34:36 +0000
Subject: generic-unstable.conf: remove generic.conf: use gcc 4.1.1 / glibc 2.4

---
 conf/distro/generic-unstable.conf | 72 ---------------------------------------
 conf/distro/generic.conf          | 20 +++++++----
 2 files changed, 14 insertions(+), 78 deletions(-)
 delete mode 100644 conf/distro/generic-unstable.conf

diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf
deleted file mode 100644
index 80fd25ae19..0000000000
--- a/conf/distro/generic-unstable.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Bleeding Edge
-#@DESCRIPTION: An experimental distribution configuration
-#@--------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "generic-unstable-glibc"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
-#DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
-
-#
-# Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
-INHERIT += "debian multimachine"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-#
-# Target OS & FPU system
-# 
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_VERSION_glibc = "2.4"
-PREFERRED_VERSION_glibc-intermediate = "2.4"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_tslib ?= tslib
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 08520f0dfe..11c9af4111 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -28,6 +28,12 @@ INHERIT += "debian multimachine"
 INHERIT += "package_ipk"
 IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
 
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
 #
 # Binutils & Compiler
 #
@@ -35,11 +41,14 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_binutils ?= "2.17"
+PREFERRED_VERSION_binutils-cross ?= "2.17"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
+PREFERRED_VERSION_glibc ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
 #
 # Target OS & FPU system
@@ -49,7 +58,6 @@ TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 
 #
 # Bootstrap & Init
-- 
cgit v1.2.3