merge of c251cce67b945ec4058e85c1e9a492c346fb51f3

     and e9d9eeb04f51b32dc71e4c98438e6880915a44da

24 files changed, 292 insertions, 9 deletions

diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg
new file mode 100644
index 0000000000..66b68d1e5c
--- /dev/null
+++ b/packages/altboot/files/poodle/altboot-2.6.cfg
@@ -0,0 +1,39 @@
+#
+# Altboot machine configuration for: Akita / Kernel 2.6
+#
+
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM. 
+ENABLE_ALTBOOT="yes"
+TIMEOUT="4"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+
+IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
+FSCK_IMAGES="yes"
+ENABLE_IMAGECONF="yes"
+
+SD_DEVICE="/dev/mmcblk0p1"
+SD_KERNEL_MODULE=""
+
+USB_HOST_AVAILABLE="yes"
+USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
+USB_STORAGE_PARTITION="/dev/sda1"
+USB_STORAGE_WAIT="4"
+
+USB_NETWORKING_AVAILABLE="yes"
+USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether"
+USB_NW_DEVICE="usb0"
+
+KEXEC_KERNEL_DIR="/boot"
+KEXEC_BIN="/usr/sbin/kexec"
+
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/altboot/files/tosa/altboot-2.6.cfg b/packages/altboot/files/tosa/altboot-2.6.cfg
new file mode 100644
index 0000000000..66b68d1e5c
--- /dev/null
+++ b/packages/altboot/files/tosa/altboot-2.6.cfg
@@ -0,0 +1,39 @@
+#
+# Altboot machine configuration for: Akita / Kernel 2.6
+#
+
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM. 
+ENABLE_ALTBOOT="yes"
+TIMEOUT="4"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+
+IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
+FSCK_IMAGES="yes"
+ENABLE_IMAGECONF="yes"
+
+SD_DEVICE="/dev/mmcblk0p1"
+SD_KERNEL_MODULE=""
+
+USB_HOST_AVAILABLE="yes"
+USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
+USB_STORAGE_PARTITION="/dev/sda1"
+USB_STORAGE_WAIT="4"
+
+USB_NETWORKING_AVAILABLE="yes"
+USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether"
+USB_NW_DEVICE="usb0"
+
+KEXEC_KERNEL_DIR="/boot"
+KEXEC_BIN="/usr/sbin/kexec"
+
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/blueprobe/blueprobe-0.17/h2200-fixup.patch b/packages/blueprobe/blueprobe-0.17/h2200-fixup.patch
new file mode 100644
index 0000000000..965bbf405e
--- /dev/null
+++ b/packages/blueprobe/blueprobe-0.17/h2200-fixup.patch
@@ -0,0 +1,11 @@
+--- /tmp/blueprobe.init	2006-05-10 18:38:42.581557352 +0200
++++ blueprobe-0.17/blueprobe.init	2006-05-10 18:38:54.001821208 +0200
+@@ -28,7 +28,7 @@
+   case `module_id` in
+     "HP iPAQ H2200")
+ 	BLUETOOTH=yes
+-	PORT=/dev/tts/3
++	PORT=/dev/ttyS3
+ 	SPEED=921600
+ 	PROBE=no
+ 	RADIO_VER=`h2200_radio_version`
diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb
index cdba961b96..433f3dfbd0 100644
--- a/packages/blueprobe/blueprobe_0.17.bb
+++ b/packages/blueprobe/blueprobe_0.17.bb
@@ -2,6 +2,7 @@ SECTION = "base"
 LICENSE = "GPL"
 inherit gpe
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI += "file://hx4700.patch;patch=1"
+SRC_URI += "file://hx4700.patch;patch=1\
+	    file://h2200-fixup.patch;patch=1"
diff --git a/packages/libmimedir/files/.mtn2git_empty b/packages/libmimedir/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmimedir/files/.mtn2git_empty
diff --git a/packages/libmimedir/files/mimedir-duration.diff b/packages/libmimedir/files/mimedir-duration.diff
new file mode 100644
index 0000000000..6f991f6aa2
--- /dev/null
+++ b/packages/libmimedir/files/mimedir-duration.diff
@@ -0,0 +1,77 @@
+2006-05-10  Neal H. Walfield  <neal@gnu.org>
+
+	* mimedir/mimedir-vcomponent.c
+	(mimedir_vcomponent_get_value_duration): Be more accepting when
+	parsing the DURATION field.
+
+
+--- libmimedir-gnome-0.3.1/mimedir/mimedir-vcomponent.c.orig	2005-11-03 18:04:21.000000000 +0100
++++ libmimedir-gnome-0.3.1/mimedir/mimedir-vcomponent.c	2006-05-10 14:17:24.000000000 +0200
+@@ -951,52 +951,33 @@ mimedir_vcomponent_get_value_duration (M
+ 
+ 		s++;
+ 
+-		num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err);
+-		if (err) {
+-			g_propagate_error (error, err);
+-			return 0;
+-		}
+-		if (s[0] != 'H') {
+-			g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
+-			return 0;
+-		}
+-		s++;
+-		duration += num * SECS_PER_HOUR;
+-
+-		if (s[0]) {
++		while (s[0] != '\0') {
+ 			num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err);
+ 			if (err) {
+ 				g_propagate_error (error, err);
+ 				return 0;
+ 			}
+-			if (s[0] != 'M') {
+-				g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
+-				return 0;
+-			}
+-			s++;
+-			duration += num * SECS_PER_MINUTE;
+-		}
+ 
+-		if (s[0]) {
+-			num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err);
+-			if (err) {
+-				g_propagate_error (error, err);
+-				return 0;
+-			}
+-			if (s[0] != 'S') {
++			switch (s[0]) {
++			case 'H':
++				s++;
++				duration += num * SECS_PER_HOUR;
++				break;
++			case 'M':
++				s++;
++				duration += num * SECS_PER_MINUTE;
++				break;
++			case 'S':
++				s++;
++				duration += num;
++				break;
++			default:
+ 				g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
+ 				return 0;
+ 			}
+-			s++;
+-			duration += num;
+ 		}
+ 	}
+ 
+-	if (s[0] != '\0') {
+-		g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
+-		return 0;
+-	}
+-
+ 	return neg ? -duration : duration;
+ }
+ 
diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb
index 21fb6c7d8f..7739b45184 100644
--- a/packages/libmimedir/libmimedir_0.3.1.bb
+++ b/packages/libmimedir/libmimedir_0.3.1.bb
@@ -3,11 +3,12 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = 1
 
-SRC_URI = "http://www.rittau.org/mimedir/${P}.tar.gz"
+SRC_URI = "http://www.rittau.org/mimedir/${P}.tar.gz \
+	   file://mimedir-duration.diff;patch=1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/linux/linux-jlime-sh3_2.6.11.bb b/packages/linux/linux-jlime-sh3_2.6.11.bb
index b646c1a3b8..a83347bf7b 100644
--- a/packages/linux/linux-jlime-sh3_2.6.11.bb
+++ b/packages/linux/linux-jlime-sh3_2.6.11.bb
@@ -3,6 +3,10 @@ DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx"
 LICENSE = "GPL"
 PR = "r0"
 
+
+COMPATIBLE_HOST = "sh.*-linux"
+COMPATIBLE_MACHINE = 'jornada6xx'
+
 SRC_URI = "http://www.jlime.com/downloads/releases/shrek/kernels/6xx/sources/linuxsh-snapshot-050320-jlimepatched-3.tar.bz2 \
            file://defconfig_jlime"
 
diff --git a/packages/pcmciautils/pcmciautils-013/.mtn2git_empty b/packages/pcmciautils/pcmciautils-013/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-013/.mtn2git_empty
diff --git a/packages/pcmciautils/pcmciautils-013/makefile_fix.patch b/packages/pcmciautils/pcmciautils-013/makefile_fix.patch
new file mode 100644
index 0000000000..a45f9e20e3
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-013/makefile_fix.patch
@@ -0,0 +1,20 @@
+Hardcoded paths are bad...
+
+Index: pcmciautils-013/Makefile
+===================================================================
+--- pcmciautils-013.orig/Makefile	2006-03-26 11:56:41.000000000 +0100
++++ pcmciautils-013/Makefile	2006-05-09 22:10:16.000000000 +0100
+@@ -69,11 +69,11 @@
+ mandir =	${prefix}/usr/share/man
+ srcdir = .
+ 
+-INSTALL = /usr/bin/install -c
++INSTALL = install -c
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA  = ${INSTALL} -m 644
+ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+-SYMLINK = /usr/bin/ln -sf
++SYMLINK = ln -sf
+ 
+ # place to put our hotplug scripts nodes
+ hotplugdir =	${etcdir}/hotplug
diff --git a/packages/pcmciautils/pcmciautils-013/version_workaround.patch b/packages/pcmciautils/pcmciautils-013/version_workaround.patch
new file mode 100644
index 0000000000..ff34e139b3
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-013/version_workaround.patch
@@ -0,0 +1,16 @@
+PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly 
+under arm gcc 3.4.x so we work around it.
+
+Index: pcmciautils-013/src/pccardctl.c
+===================================================================
+--- pcmciautils-013.orig/src/pccardctl.c	2006-03-26 11:56:41.000000000 +0100
++++ pcmciautils-013/src/pccardctl.c	2006-05-09 22:11:09.000000000 +0100
+@@ -350,7 +350,7 @@
+ }
+ 
+ static void print_header(void) {
+-	printf("pcmciautils %s\n", PCMCIAUTILS_VERSION);
++	printf("pcmciautils 013\n");
+ 	printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n");
+ 	printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n");
+ }
diff --git a/packages/pcmciautils/pcmciautils_013.bb b/packages/pcmciautils/pcmciautils_013.bb
new file mode 100644
index 0000000000..3dde683012
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils_013.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
+DEPENDS = "sysfsutils udev module-init-tools"
+RDEPENDS = "udev module-init-tools"
+HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \
+           file://makefile_fix.patch;patch=1 \
+	   file://version_workaround.patch;patch=1"
+S = "${WORKDIR}/pcmciautils-${PV}"
+
+PR = "r0"
+
+export HOSTCC = "${BUILD_CC}"
+export etcdir = "${sysconfdir}"
+export sbindir = "${base_sbindir}"
+export pcmciaconfdir = "${sysconfdir}/pcmcia"
+export udevrulesdir = "${sysconfdir}/udev/rules.d"
+export UDEV = 1
+LD = "${CC}"
+CFLAGS =+ "-I${S}/src"
+CFLAGS =+ '-DPCMCIAUTILS_VERSION=013'
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
+
+CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
+RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc
index 0178d4e186..abc6278e04 100644
--- a/packages/python/python-2.4.3-manifest.inc
+++ b/packages/python/python-2.4.3-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Mar 30 17:39:30 2006
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Wed May 10 13:57:16 2006
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -41,9 +41,9 @@ RDEPENDS_python-datetime="python-core python-codecs"
 FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml0"
+PR_python-core="ml1"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml0"
@@ -195,7 +195,7 @@ PR_python-unittest="ml0"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
 FILES_python-unittest="${libdir}/python2.4/unittest.* "
 
-DESCRIPTION_python-stringold="Python Deprecated String APIs"
+DESCRIPTION_python-stringold="Python String APIs [deprecated]"
 PR_python-stringold="ml0"
 RDEPENDS_python-stringold="python-core python-re"
 FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* "
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb
index 30ce73abe2..64e927c871 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.3.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml3"
+PR = "ml4"
 
 PYTHON_MAJMIN = "2.4"
 
diff --git a/packages/qxmp/.mtn2git_empty b/packages/qxmp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qxmp/.mtn2git_empty
diff --git a/packages/qxmp/qxmp_1.0.bb b/packages/qxmp/qxmp_1.0.bb
new file mode 100644
index 0000000000..e0a1acab21
--- /dev/null
+++ b/packages/qxmp/qxmp_1.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Qxmp is a Qt4 media player based on MPlayer"
+LICENSE = "GPL"
+SECTION = "x11/multimedia"
+HOMEPAGE = "http://www.xm1math.net/qxmp/index.html"
+RDEPENDS = "mplayer"
+
+SRC_URI = "http://www.xm1math.net/qxmp/qxmp-${PV}.tar.bz2"
+
+inherit qmake qt4x11
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 qxmp ${D}${bindir}
+}
diff --git a/packages/sylpheed/sylpheed-claws-plugin-maildir-0.22_2.2.0.bb b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.22_2.2.0.bb
new file mode 100644
index 0000000000..56f86e6923
--- /dev/null
+++ b/packages/sylpheed/sylpheed-claws-plugin-maildir-0.22_2.2.0.bb
@@ -0,0 +1,6 @@
+include sylpheed-claws-extra-plugins.inc
+
+DEPENDS_append = " db"
+
+S = ${WORKDIR}/sylpheed-claws-extra-plugins-${PV}/maildir-0.22
+
diff --git a/packages/wxwidgets/.mtn2git_empty b/packages/wxwidgets/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wxwidgets/.mtn2git_empty
diff --git a/packages/wxwidgets/wxwidgets_2.6.3.bb b/packages/wxwidgets/wxwidgets_2.6.3.bb
new file mode 100644
index 0000000000..0cd88334b3
--- /dev/null
+++ b/packages/wxwidgets/wxwidgets_2.6.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "wxWidgets is a cross platform application framework utilizing native widgets."
+HOMEPAGE = "http://www.wxwidgets.org"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz"
+S = "${WORKDIR}/wxWidgets-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+	oe_runconf
+}
+
+#FIXME add sane packaging
diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xlibs/libx11-native_6.2.1.bb
index f27ab343a4..9513c4237e 100644
--- a/packages/xlibs/libx11-native_6.2.1.bb
+++ b/packages/xlibs/libx11-native_6.2.1.bb
@@ -1,4 +1,5 @@
 SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 include libx11_${PV}.bb
 inherit native
 DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
diff --git a/packages/xlibs/libxau-native_0.1.1.bb b/packages/xlibs/libxau-native_0.1.1.bb
index 3897fa6afe..ecb71ce3d6 100644
--- a/packages/xlibs/libxau-native_0.1.1.bb
+++ b/packages/xlibs/libxau-native_0.1.1.bb
@@ -1,4 +1,5 @@
 SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
 include libxau_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
diff --git a/packages/xlibs/libxau-native_cvs.bb b/packages/xlibs/libxau-native_cvs.bb
index eee93dd44c..cd070033ce 100644
--- a/packages/xlibs/libxau-native_cvs.bb
+++ b/packages/xlibs/libxau-native_cvs.bb
@@ -1,4 +1,5 @@
 SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
 include libxau_cvs.bb
 inherit native
 DEPENDS = "xproto-native"
diff --git a/packages/xlibs/libxdmcp-native_0.1.3.bb b/packages/xlibs/libxdmcp-native_0.1.3.bb
index bd6d990f53..8d7162b351 100644
--- a/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ b/packages/xlibs/libxdmcp-native_0.1.3.bb
@@ -1,4 +1,5 @@
 SECTION = "x11/libs"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp"
 include libxdmcp_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb
index 295bae2584..9294b080b7 100644
--- a/packages/xlibs/libxext-native_cvs.bb
+++ b/packages/xlibs/libxext-native_cvs.bb
@@ -1,4 +1,5 @@
 SECTION = "unknown"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
 include libxext_${PV}.bb
 inherit native
 DEPENDS = "libx11-native xextensions-native"