Merge bk://oe-devel.bkbits.net/openembedded

into marsco.kalmiopsis:/home/nslu2/openembedded 2005/06/15 12:55:22+02:00 utwente.nl!koen sapwood_1.20-1.bb: extra install_append, courtesy Florian Boor osso-gnome-vfs2_2.8.4.4-1.bb: adjust depends, courtesy Florian Boor Many files: added, courtesy Florian Boor hildon-libs_0.9.6-2.bb: adjust staging, courtesy Florian Boor 2005/06/15 12:18:24+02:00 uni-frankfurt.de!mickeyl add mathomatic, a small, portable, general purpose CAS. Patch courtesy Simon Pickering 2005/06/15 11:58:18+02:00 utwente.nl!koen Many meamo files: source -> ., courtesy Florian Boor Add gconf-osso, part of the maemo.org suite, courtesy Florian Boor 2005/06/15 11:45:40+02:00 utwente.nl!koen base-files_3.0.14.bb: support nokia770, courtesy Florian Boor 2005/06/15 11:05:24+02:00 handhelds.org!CoreDump Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded 2005/06/15 11:05:02+02:00 handhelds.org!CoreDump altboot: Add a timeout on boot and only show the menu when requested 2005/06/15 10:29:53+02:00 mn-solutions.de!schurig assorted MNCI / RT3000 changes 2005/06/15 10:27:59+02:00 mn-solutions.de!schurig classes/rootfs_ipk.bbclass: allows to keep the Packages file (my own python script to create Packages is way faster :-) 2005/06/14 22:59:08+01:00 reciva.com!pb use mkdir -p, not install -d 2005/06/14 22:02:28+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/14 22:02:15+02:00 utwente.nl!koen xmame_0.95.bb: remove UNNECESSARY and BOGUS qpe crap. Can we please stop committing such nonsonse? virtual/libsdl exists for a reason 2005/06/14 21:01:19+01:00 reciva.com!pb apply PARALLEL_INSTALL_MODULES patch from Erik Hovland 2005/06/14 20:55:08+01:00 reciva.com!pb update xmame to 0.95, courtesy Erik Hovland 2005/06/14 20:52:19+01:00 reciva.com!pb update handhelds-pxa kernel to hh40, courtesy Erik Hovland 2005/06/14 19:10:13+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/06/14 19:00:35+02:00 uni-frankfurt.de!mickeyl Add tslib config files for omap5912osk. Patch courtesy philip@balister.org 2005/06/14 18:59:02+02:00 uni-frankfurt.de!mickeyl Fix Typo in xerces-c. Patch courtesy philip@balister.org 2005/06/14 13:45:03+02:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into marcinj.local:/home/hrw/zaurus/oe/openembedded 2005/06/14 13:44:34+02:00 local!hrw updated kdepimpi to 2.1.5 2005/06/14 13:16:38+02:00 handhelds.org!CoreDump Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded 2005/06/14 13:16:14+02:00 handhelds.org!CoreDump altboot: Update to latest version 2005/06/14 13:13:37+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/14 13:13:23+02:00 utwente.nl!koen Add tune-supersparc.conf for people who have v8 cpu's and want hardware integer multiply and divide. Makes ssh login approx. 30 times faster 2005/06/14 11:55:00+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/14 11:52:01+01:00 reciva.com!pb eliminate spare copy of sun4cdm kernel preference 2005/06/14 12:43:33+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/14 12:43:12+02:00 mn-solutions.de!schurig renamed MACHINE 'ramses' to 'mnci' added new MACHINE 'rt3000' renamed DISTRO 'openmnci' to 'openmn', which now is for both MNCI and RT3000 2005/06/14 09:52:19+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/10 09:37:26+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/08 10:05:02+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/08 09:16:06+02:00 mn-solutions.de!schurig icewm: use sourceforge mirror BKrev: 42b037e5CrddHepCs3gW5YAsfOQ7ng
author: John Bowler <jbowler@nslu2-linux.org> 2005-06-15 14:15:01 +0000
committer: John Bowler <jbowler@nslu2-linux.org> 2005-06-15 14:15:01 +0000
commit: 30224312da542b11730e13c15c051a574ab49c84 (patch)
tree: 8a5416746bf021bfb9c3eff69a86f0719e1570a9
parent: 8e05a4e785df2149e69204ba01d1cb8c03f86486 (diff)
119 files changed, 710 insertions, 867 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 9dca8b2403..7558c33682 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -41,7 +41,16 @@ def get_kernelversion(p):
 			return m.group(1)
 	return None
 
+def get_kernelmajorversion(p):
+	import re
+	r = re.compile("([0-9]+\.[0-9]+).*")
+	m = r.match(p);
+	if m:
+		return m.group(1)
+	return None
+
 KERNEL_VERSION = "${@get_kernelversion('${S}/include/linux/version.h')}"
+KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
 
 KERNEL_LOCALVERSION ?= ""
 
@@ -340,7 +349,7 @@ python populate_packages_prepend () {
 
 	v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
 	if v == "1":
-		kv = bb.data.getVar("KERNEL_VERSION", d, 1)
+		kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)
 		packages = bb.data.getVar("PACKAGES", d, 1)
 		module_re = re.compile("^kernel-module-")
 		for p in packages.split():
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 7ed8342b1e..540d8404f0 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -30,9 +30,11 @@ real_do_rootfs () {
 		
 	mkdir -p ${IMAGE_ROOTFS}/dev
 
-	rm -f ${DEPLOY_DIR_IPK}/Packages
-	touch ${DEPLOY_DIR_IPK}/Packages
-	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+	if -z "${DEPLOY_KEEP_PACKAGES}"; then
+		rm -f ${DEPLOY_DIR_IPK}/Packages
+		touch ${DEPLOY_DIR_IPK}/Packages
+		ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+	fi
 	mkdir -p ${T}
 	echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
 	ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
diff --git a/packages/altboot/altboot_20050614.bb b/conf/distro/openmn.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/altboot/altboot_20050614.bb
+++ b/conf/distro/openmn.conf
diff --git a/conf/distro/openmnci.conf b/conf/distro/openmnci.conf
deleted file mode 100644
index 87d8e2e6b4..0000000000
--- a/conf/distro/openmnci.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-INHERIT += "package_ipk"
-INHERIT += "debian"
-
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "ttyS0"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-#TARGET_ARCH = "arm-linuxeabi"
diff --git a/packages/base-files/base-files/ramses/issue b/conf/machine/mnci.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/ramses/issue
+++ b/conf/machine/mnci.conf
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
deleted file mode 100644
index 06fa1e6c13..0000000000
--- a/conf/machine/ramses.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: M&N MNCI-RX
-#@DESCRIPTION: Machine configuration for the PXA255 based M&N Solutions MNCI-RX
-
-TARGET_ARCH = "arm"
-TARGET_OS = "linux"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_virtual/kernel = "mnci-ramses"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
-
-
-USE_DEVFS = "1"
-GUI_MACHINE_CLASS = "smallscreen"
-
-# For sysvinit:
-USE_VT = "0"
-SERIAL_CONSOLE = "115200 tts/0"
diff --git a/packages/base-files/base-files/ramses/issue.net b/conf/machine/rt3000.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/ramses/issue.net
+++ b/conf/machine/rt3000.conf
diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
index ec4957d442..ee3f34dc34 100644
--- a/conf/machine/sun4cdm.conf
+++ b/conf/machine/sun4cdm.conf
@@ -1,6 +1,5 @@
 TARGET_ARCH = "sparc"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-sun4c"
 IMAGE_FSTYPE = "cramfs"
 
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel module-init-tools udev"
diff --git a/packages/base-files/base-files/ramses/usbd b/conf/machine/tune-supersparc.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/ramses/usbd
+++ b/conf/machine/tune-supersparc.conf
diff --git a/packages/bluez-utils/files/ramses/bluetooth.default b/packages/altboot/altboot_20050616.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-utils/files/ramses/bluetooth.default
+++ b/packages/altboot/altboot_20050616.bb
diff --git a/packages/altboot/altboot_cvs.bb b/packages/altboot/altboot_cvs.bb
index 801f18c260..c4e0c8c796 100644
--- a/packages/altboot/altboot_cvs.bb
+++ b/packages/altboot/altboot_cvs.bb
@@ -5,8 +5,9 @@ PRIORITY = "optional"
 MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
+
 PV = "0.0.1+cvs-${CVSDATE}"
-PR = "r2"
+PR = "r3"
 
 
 SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;module=hentgescvs/hentges-utils/files;method=pserver \
@@ -19,6 +20,7 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	
 	install -m 0644 ${WORKDIR}/altboot.cfg ${D}/etc
+	install -m 0644 ${WORKDIR}/files/altboot.func ${D}/etc
 	install -m 0644 docs/altboot/*.txt ${D}/usr/share/doc/altboot
 	install -m 0755 init.altboot ${D}/sbin	
 	install -m 0755 altboot-menu/*-* ${D}/etc/altboot-menu
diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
index e69de29bb2..fcc100ed33 100644
--- a/packages/altboot/files/collie/altboot.cfg
+++ b/packages/altboot/files/collie/altboot.cfg
@@ -0,0 +1,16 @@
+#
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM. 
+ENABLE_ALTBOOT="yes"
+TIMEOUT="3"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+IMAGE_PATH="boot-images"
+FSCK_IMAGES="yes"
+SD_DEVICE="/dev/mmcda1"
+SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg
index e69de29bb2..fcc100ed33 100644
--- a/packages/altboot/files/poodle/altboot.cfg
+++ b/packages/altboot/files/poodle/altboot.cfg
@@ -0,0 +1,16 @@
+#
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM. 
+ENABLE_ALTBOOT="yes"
+TIMEOUT="3"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+IMAGE_PATH="boot-images"
+FSCK_IMAGES="yes"
+SD_DEVICE="/dev/mmcda1"
+SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/bluez-utils/files/ramses/hcid.conf b/packages/base-files/base-files/nokia770/fstab
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-utils/files/ramses/hcid.conf
+++ b/packages/base-files/base-files/nokia770/fstab
diff --git a/packages/gpe-bootsplash/files/ramses.patch b/packages/base-files/base-files/openmn/fstab
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-bootsplash/files/ramses.patch
+++ b/packages/base-files/base-files/openmn/fstab
diff --git a/packages/gpe-dm/files/ramses.patch b/packages/base-files/base-files/openmn/issue
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-dm/files/ramses.patch
+++ b/packages/base-files/base-files/openmn/issue
diff --git a/packages/initscripts/initscripts-1.0/ramses/extractfs b/packages/base-files/base-files/openmn/issue.net
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/ramses/extractfs
+++ b/packages/base-files/base-files/openmn/issue.net
diff --git a/packages/initscripts/initscripts-1.0/ramses/packages b/packages/base-files/base-files/openmn/profile
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/ramses/packages
+++ b/packages/base-files/base-files/openmn/profile
diff --git a/packages/initscripts/initscripts-1.0/ramses/umountfs b/packages/base-files/base-files/openmn/usbd
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/ramses/umountfs
+++ b/packages/base-files/base-files/openmn/usbd
diff --git a/packages/base-files/base-files/ramses/fstab b/packages/base-files/base-files/ramses/fstab
deleted file mode 100644
index 5a682d1554..0000000000
--- a/packages/base-files/base-files/ramses/fstab
+++ /dev/null
@@ -1,21 +0,0 @@
-# Need to check if this works fine in an nfs-root setup:
-#/dev/mtdblock/2 /             jffs2    rw,noatime                                           1 1
-rootfs           /             rootfs   rw,noatime                                           1 1
-
-proc             /proc         proc     defaults                                             0 0
-tmpfs            /var          tmpfs    defaults                                             0 0
-devfs            /dev          devfs    defaults                                             0 0
-#don't use devpts together with devfs, at least not on Kernel 2.4
-#devpts          /dev/pts      devpts   mode=0620,gid=5                                      0 0
-
-# Compact Flash memory cards
-/dev/hda1        /media/cf     auto     sync,noauto                                          0 0
-
-# SD/MMC in kernel 2.4
-/dev/mmcda1      /media/card   auto     sync,noauto                                          0 0
-# SD/MMC in kernel 2.6
-/dev/mmcblk0p1   /media/card   auto     sync,noauto                                          0 0
-
-# USB Storage
-usbdevfs         /proc/bus/usb usbdevfs noauto                                               0 0
-/dev/sda1        /media/usbhdd vfat     noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
diff --git a/packages/base-files/base-files/ramses/profile b/packages/base-files/base-files/ramses/profile
deleted file mode 100644
index 48db09b3e7..0000000000
--- a/packages/base-files/base-files/ramses/profile
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-OPIEDIR=/opt/QtPalmtop
-QPEDIR=/opt/QtPalmtop
-QTDIR=/opt/QtPalmtop
-PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
-
-PS1='$ '
-if [ "`id -u`" -eq 0 ]; then
-   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
-   PS1='# '
-fi
-
-if [ -d /etc/profile.d ]; then
-  for i in `ls /etc/profile.d/`; do
-    . /etc/profile.d/$i
-  done
-  unset i
-fi
-
-case "`cat /proc/sys/board/lcd_type`" in
-        2)      export QWS_DISPLAY=Transformed:Rot90 ;;
-        *)      export QWS_DISPLAY=Transformed:Rot180 ;;
-esac
-alias ll="ls -lAF"
-
-export PATH PS1 OPIEDIR QPEDIR QTDIR
-
-umask 022
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 3a08535ee9..0934d9f5f7 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r34"
+PR = "r35"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -38,14 +38,16 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
 	   ${localstatedir}/lock/subsys ${localstatedir}/log \
 	   ${localstatedir}/run ${localstatedir}/spool \
 	   /mnt /media /media/card /media/cf /media/net /media/ram \
-	   /media/union /media/realroot /media/hdd"
+	   /media/union /media/realroot /media/hdd \ 
+           /media/mmc1"
 conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
 	     ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
 	     ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
 	     ${sysconfdir}/default"
 
 hostname = "openembedded"
-hostname_ramses = "MNCI"
+hostname_mnci = "MNCI"
+hostname_rt3000 = "MNRT"
 hostname_openslug = "openslug"
 
 do_install () {
@@ -138,7 +140,7 @@ do_install () {
 }
 
 
-do_install_append_ramses () {
+do_install_append_mnci () {
 	rmdir ${D}/tmp
 	mkdir -p ${D}${localstatedir}/tmp
 	ln -s var/tmp ${D}/tmp
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
index e69de29bb2..1afae5b0ef 100644
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "Base system password/group files."
+SECTION = "base"
+PR = "r0"
+LICENSE = "GPL"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
+	   file://configure.patch;patch=1 \
+	   file://nobash.patch;patch=1 \
+	   file://root-home.patch;patch=1"
+
+S = "${WORKDIR}/base-passwd"
+
+inherit autotools
+
+FILES_${PN}-doc += "${docdir}"
+
+do_install () {
+	install -d -m 755 ${D}${sbindir}
+	install -p -m 755 update-passwd ${D}${sbindir}/
+	install -d -m 755 \
+		${D}${mandir}/man8 ${D}${mandir}/pl/man8
+	install -p -m 644 man/update-passwd.8 \
+		${D}${mandir}/man8/
+	install -p -m 644 man/update-passwd.pl.8 \
+		${D}${mandir}/pl/man8/update-passwd.8
+	gzip -9 ${D}${mandir}/man8/* \
+		${D}${mandir}/pl/man8/*
+	install -d -m 755 ${D}${datadir}/base-passwd
+	install -p -m 644 passwd.master \
+		${D}${datadir}/base-passwd/
+	install -p -m 644 group.master \
+		${D}${datadir}/base-passwd/
+
+	install -d -m 755 ${D}${docdir}/${PN}
+	install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
+	gzip -9 ${D}${docdir}/${PN}/*
+	install -p -m 644 README ${D}${docdir}/${PN}/
+	install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
+}
+
+
+do_install_append_openmn() {
+	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
+}
+
+
+pkg_postinst () {
+	set -e
+
+	if [ ! -e $D${sysconfdir}/passwd ] ; then
+		cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
+	fi
+	
+	if [ ! -e $D${sysconfdir}/group ] ; then
+		cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
+	fi
+	exit 0
+}
diff --git a/packages/modutils/files/ramses/modules b/packages/bluez-utils/files/openmn/bluetooth.default
index e69de29bb2..e69de29bb2 100644
--- a/packages/modutils/files/ramses/modules
+++ b/packages/bluez-utils/files/openmn/bluetooth.default
diff --git a/packages/modutils/files/ramses/modules-ramses b/packages/bluez-utils/files/openmn/hcid.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/modutils/files/ramses/modules-ramses
+++ b/packages/bluez-utils/files/openmn/hcid.conf
diff --git a/packages/modutils/files/ramses/modutils.sh b/packages/busybox/busybox-1.00/openmn/defconfig
index e69de29bb2..e69de29bb2 100644
--- a/packages/modutils/files/ramses/modutils.sh
+++ b/packages/busybox/busybox-1.00/openmn/defconfig
diff --git a/packages/busybox/busybox-1.00/ramses/defconfig b/packages/busybox/busybox-1.00/ramses/defconfig
deleted file mode 100644
index f98af91853..0000000000
--- a/packages/busybox/busybox-1.00/ramses/defconfig
+++ /dev/null
@@ -1,475 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# General Configuration
-#
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_FEATURE_DEVFS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_LFS is not set
-# USING_CROSS_COMPILER is not set
-EXTRA_CFLAGS_OPTIONS=""
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-PREFIX="./_install"
-
-#
-# Archival Utilities
-#
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-CONFIG_CPIO=y
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-CONFIG_CMP=y
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_DF=y
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-# CONFIG_INSTALL is not set
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_OD=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SEQ=y
-# CONFIG_SHA1SUM is not set
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_STTY=y
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-# CONFIG_FEATURE_FANCY_TAIL is not set
-CONFIG_TEE=y
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-# CONFIG_FEATURE_TEST_64 is not set
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WATCH=y
-CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls and more
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_GETKEY=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_SETKEYCODES=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_RUN_PARTS=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_PATCH is not set
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_NEWER=y
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-# CONFIG_INIT is not set
-# CONFIG_HALT is not set
-# CONFIG_POWEROFF is not set
-# CONFIG_REBOOT is not set
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_USE_BB_PWD_GRP is not set
-CONFIG_ADDGROUP=y
-CONFIG_DELGROUP=y
-CONFIG_ADDUSER=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_U_W_TMP=y
-CONFIG_LOGIN=y
-# CONFIG_FEATURE_SECURETTY is not set
-CONFIG_PASSWD=y
-CONFIG_SU=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Common options for adduser, deluser, login, su
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_CROND is not set
-# CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_LAST is not set
-# CONFIG_HDPARM is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_MT is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-CONFIG_TIME=y
-# CONFIG_WATCHDOG is not set
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-CONFIG_FEATURE_2_4_MODULES=y
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-CONFIG_FEATURE_INSMOD_LOAD_MAP=y
-CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
-CONFIG_LSMOD=y
-CONFIG_MODPROBE=y
-CONFIG_RMMOD=y
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-CONFIG_ARPING=y
-# CONFIG_FTPGET is not set
-CONFIG_FTPPUT=y
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-CONFIG_IFUPDOWN=y
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_INETD is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-CONFIG_NETSTAT=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-CONFIG_ROUTE=y
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_TFTP is not set
-CONFIG_TRACEROUTE=y
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_PIDOF is not set
-CONFIG_PS=y
-CONFIG_RENICE=y
-CONFIG_TOP=y
-FEATURE_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
-# CONFIG_SYSCTL is not set
-
-#
-# Another Bourne-like Shell
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
-CONFIG_ASH_GETOPTS=y
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-CONFIG_FEATURE_COMMAND_HISTORY=31
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-# CONFIG_FBSET is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-# FDISK_SUPPORT_LARGE_DISKS is not set
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-CONFIG_GETOPT=y
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_LOSETUP=y
-CONFIG_MKSWAP=y
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_RDATE is not set
-# CONFIG_SWAPONOFF is not set
-CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_MOUNT_FORCE=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
diff --git a/packages/gcc-csl/gcc-csl_2004-q1a.bb b/packages/gcc-csl/gcc-csl_2004-q1a.bb
index 4a3d02333d..77c7513ea5 100644
--- a/packages/gcc-csl/gcc-csl_2004-q1a.bb
+++ b/packages/gcc-csl/gcc-csl_2004-q1a.bb
@@ -158,7 +158,7 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
 EXTRA_OECONF_DEP = ""
 EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
 EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
-EXTRA_OECONF_append_ramses = " --with-float=soft "
+EXTRA_OECONF_append_openmn = " --with-float=soft "
 
 python __anonymous () {
     import bb, re
diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb
index 7922558cc4..fcabfdc5f3 100644
--- a/packages/gdb/gdb_6.3.bb
+++ b/packages/gdb/gdb_6.3.bb
@@ -5,7 +5,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
-RDEPENDS_ramses = "libthread-db1"
+RDEPENDS_openmn = "libthread-db1"
 
 PACKAGES =+ 'gdbserver '
 FILES_gdbserver = '${bindir}/gdbserver'
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 013956b8af..0f5c704542 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -36,7 +36,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.dat
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
 
-SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 953f599501..c70148c95c 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -55,7 +55,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.dat
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
 
-SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 79f95671d3..bf1607a6c0 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -38,7 +38,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.dat
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
 
-SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 94326fd93e..c110619bc4 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -40,7 +40,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.dat
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
 
-SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 3eec2f67b6..3a05f82ef6 100644
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -57,7 +57,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
 # seems to fail on tls platforms
 #SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
 
-SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/netbase/netbase/ramses/hosts b/packages/gpe-bootsplash/files/mnci.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/netbase/netbase/ramses/hosts
+++ b/packages/gpe-bootsplash/files/mnci.patch
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index 311dafbeb3..20667e6917 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -9,7 +9,7 @@ PR = "r2"
 
 SRC_URI += "file://splash-p.svg file://splash-l.svg \
             file://c7x0-rotation.patch;patch=1"
-SRC_URI_append_ramses = " file://ramses.patch;patch=1"
+SRC_URI_append_mnci = " file://mnci.patch;patch=1"
 
 FILES_${PN} += "${datadir}/gpe"
 
diff --git a/packages/netbase/netbase/ramses/interfaces b/packages/gpe-dm/files/mnci.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/netbase/netbase/ramses/interfaces
+++ b/packages/gpe-dm/files/mnci.patch
diff --git a/packages/gpe-dm/gpe-dm_0.44.bb b/packages/gpe-dm/gpe-dm_0.44.bb
index 1aed569fec..7c63680671 100644
--- a/packages/gpe-dm/gpe-dm_0.44.bb
+++ b/packages/gpe-dm/gpe-dm_0.44.bb
@@ -13,4 +13,4 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
 
 SRC_URI += " file://source-xsession-scripts.patch;patch=1 \
 	     file://collie-suspend-hack.patch;patch=1"
-SRC_URI_append_ramses = " file://ramses.patch;patch=1"
+SRC_URI_append_mnci = " file://mnci.patch;patch=1"
diff --git a/packages/gpe-dm/gpe-dm_0.45.bb b/packages/gpe-dm/gpe-dm_0.45.bb
index e69de29bb2..9f52edf0a1 100644
--- a/packages/gpe-dm/gpe-dm_0.45.bb
+++ b/packages/gpe-dm/gpe-dm_0.45.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r0"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
+
+SRC_URI += " file://source-xsession-scripts.patch;patch=1 \
+	     file://collie-suspend-hack.patch;patch=1"
+SRC_URI_append_mnci = " file://mnci.patch;patch=1"
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index e69de29bb2..3d6eba69f0 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -0,0 +1,22 @@
+SECTION = "x11/wm"
+DESCRIPTION = "IceWM Window Manager"
+LICENSE = "GPL"
+DEPENDS = "x11 xext xcomposite libxfixes xdamage libxrender xinerama xpm xrandr xft"
+PR = "r1" 
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
+	   file://makefile.patch;patch=1"
+
+S = "${WORKDIR}/icewm-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
+
+pkg_postinst() {
+update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager /usr/bin/icewm-session
+}
+\ No newline at end of file
diff --git a/packages/qte/qte-2.3.10/ramses-touchscreen.patch b/packages/initscripts/initscripts-1.0/openmn/extractfs
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10/ramses-touchscreen.patch
+++ b/packages/initscripts/initscripts-1.0/openmn/extractfs
diff --git a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp b/packages/initscripts/initscripts-1.0/openmn/packages
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp
+++ b/packages/initscripts/initscripts-1.0/openmn/packages
diff --git a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h b/packages/initscripts/initscripts-1.0/openmn/umountfs
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h
+++ b/packages/initscripts/initscripts-1.0/openmn/umountfs
diff --git a/packages/squeak/files/ramses/Makefile.in b/packages/ipkg/ipkg-collateral/openmn/src
index e69de29bb2..e69de29bb2 100644
--- a/packages/squeak/files/ramses/Makefile.in
+++ b/packages/ipkg/ipkg-collateral/openmn/src
diff --git a/packages/ipkg/ipkg-collateral/ramses/src b/packages/ipkg/ipkg-collateral/ramses/src
deleted file mode 100644
index b6c0599566..0000000000
--- a/packages/ipkg/ipkg-collateral/ramses/src
+++ /dev/null
@@ -1,2 +0,0 @@
-src mnci54 http://www.mn-solutions.de/feed/mnci54
-src opie54 http://www.mn-solutions.de/feed/mnci54/opie
diff --git a/packages/kdepimpi/kdepimpi_2.1.4.bb b/packages/kdepimpi/kdepimpi_2.1.4.bb
deleted file mode 100644
index 47aafd653f..0000000000
--- a/packages/kdepimpi/kdepimpi_2.1.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
-PR="r1"
-
-include kdepimpi-base.inc
diff --git a/packages/sysvinit/sysvinit/ramses/inittab b/packages/kdepimpi/kdepimpi_2.1.5.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/sysvinit/sysvinit/ramses/inittab
+++ b/packages/kdepimpi/kdepimpi_2.1.5.bb
diff --git a/packages/kdepimpi/pwmpi_2.1.4.bb b/packages/kdepimpi/pwmpi_2.1.4.bb
deleted file mode 100644
index 257e66b668..0000000000
--- a/packages/kdepimpi/pwmpi_2.1.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
-PR="r1"
-
-include pwmpi.inc
diff --git a/packages/sysvinit/sysvinit/ramses/rcS b/packages/kdepimpi/pwmpi_2.1.5.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/sysvinit/sysvinit/ramses/rcS
+++ b/packages/kdepimpi/pwmpi_2.1.5.bb
diff --git a/packages/libgphoto2/libgphoto2_2.1.4.bb b/packages/libgphoto2/libgphoto2_2.1.4.bb
index 680f908ff2..fed7c41e40 100644
--- a/packages/libgphoto2/libgphoto2_2.1.4.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.4.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "libgphoto2 allows you to access digital cameras"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
 
-EXTRA_OECONF_ramses = "--with-drivers=canon --without-serial"
+EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial"
 LICENSE = "GPL"
 inherit autotools pkgconfig
 
diff --git a/packages/libgphoto2/libgphoto2_2.1.5.bb b/packages/libgphoto2/libgphoto2_2.1.5.bb
index e69de29bb2..67efc38785 100644
--- a/packages/libgphoto2/libgphoto2_2.1.5.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.5.bb
@@ -0,0 +1,32 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+RPEDENDS = "libusb"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
+
+EXTRA_OECONF = " --with-drivers=all"
+EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial"
+LICENSE = "GPL"
+inherit autotools pkgconfig
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true
+	oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR}
+
+	install -d ${STAGING_LIBDIR}/gphoto2/2.0
+	oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0
+
+        install -d ${STAGING_INCDIR}/gphoto2
+        for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h
+        do
+                install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+        for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h
+        do
+                install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+}
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index fa7378eb00..3e7c74e7ef 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -21,7 +21,7 @@ CXXFLAGS_append_tosa =  " -DOPIE_NO_WINDOWED "
 CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
 CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
 
-do_compile_prepend_ramses () {
+do_compile_prepend_mnci () {
 	ln -s custom-ramses.h custom.h
 }
 
diff --git a/packages/tslib/tslib/ramses/ts.conf b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h3900
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/ramses/ts.conf
+++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h3900
diff --git a/packages/tslib/tslib/ramses/tslib.sh b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/ramses/tslib.sh
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
diff --git a/packages/update-modules/update-modules-1.0/ramses/update-modules b/packages/maemo/gconf-osso/gconf-update.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/update-modules/update-modules-1.0/ramses/update-modules
+++ b/packages/maemo/gconf-osso/gconf-update.patch
diff --git a/packages/wpa-supplicant/files/ramses/defaults b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/wpa-supplicant/files/ramses/defaults
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
diff --git a/packages/maemo/hildon-home/source.patch b/packages/maemo/hildon-home/source.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/hildon-home/source.patch
diff --git a/packages/maemo/hildon-home_0.8.20-2.bb b/packages/maemo/hildon-home_0.8.20-2.bb
index e69de29bb2..241288f2ce 100644
--- a/packages/maemo/hildon-home_0.8.20-2.bb
+++ b/packages/maemo/hildon-home_0.8.20-2.bb
@@ -0,0 +1,13 @@
+PR         = "r1"
+LICENSE    = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+
+DEPENDS = "gtk+-2.6.4-1.osso7 hildon-lgpl libosso hildon-base-lib hildon-libs osso-gnome-vfs2 osso-thumbnail"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
+           file://source.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/hildon-home-0.8.20"
+
+inherit autotools pkgconfig
+
diff --git a/packages/maemo/hildon-initscripts/hildon-initscripts-source.patch b/packages/maemo/hildon-initscripts/hildon-initscripts-source.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/hildon-initscripts/hildon-initscripts-source.patch
diff --git a/packages/maemo/hildon-initscripts_0.8.14-1.bb b/packages/maemo/hildon-initscripts_0.8.14-1.bb
index e69de29bb2..dca8e571e9 100644
--- a/packages/maemo/hildon-initscripts_0.8.14-1.bb
+++ b/packages/maemo/hildon-initscripts_0.8.14-1.bb
@@ -0,0 +1,13 @@
+PR         = "r1"
+LICENSE    = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+
+DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
+           file://hildon-initscripts-source.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/hildon-initscripts-0.8.14"
+
+inherit autotools pkgconfig
+
diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/maemo/hildon-libs_0.9.6-2.bb
index e69de29bb2..aabd6b7fa7 100644
--- a/packages/maemo/hildon-libs_0.9.6-2.bb
+++ b/packages/maemo/hildon-libs_0.9.6-2.bb
@@ -0,0 +1,23 @@
+PR =		"r1"
+LICENSE = 	"LGPL"
+MAINTAINER = 	"Koen Kooi <koen@handhelds.org>"
+
+DEPENDS =	"dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7"
+SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-libs/hildon-libs_${PV}.tar.gz \
+		file://hildon-libs-no-werror.patch;patch=1"
+
+S =	"${WORKDIR}/hildon-libs-0.9.6"
+
+inherit pkgconfig autotools
+EXTRA_OECONF =	"--disable-gtk-doc"
+
+
+do_stage() {
+  install -d ${STAGING_LIBDIR}/outo
+  install -m755 ${S}/ut/.libs/libhildonwidgets_unittests.so  ${STAGING_LIBDIR}/outo
+  install -m755 ${S}/ut/.libs/libhildonwidgets_clock_unittests.so  ${STAGING_LIBDIR}/outo
+  install -m755 ${S}/hildon-widgets/.libs/libhildonwidgets.so* ${STAGING_LIBDIR}
+  install -d ${STAGING_INCDIR}/hildon-widgets
+  install -m 644 hildon-widgets/*.h ${STAGING_INCDIR}/hildon-widgets
+}
+
diff --git a/packages/maemo/hildon-navigator/source.patch b/packages/maemo/hildon-navigator/source.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/hildon-navigator/source.patch
diff --git a/packages/maemo/hildon-navigator_0.9.6-2.bb b/packages/maemo/hildon-navigator_0.9.6-2.bb
index e69de29bb2..26560a3a07 100644
--- a/packages/maemo/hildon-navigator_0.9.6-2.bb
+++ b/packages/maemo/hildon-navigator_0.9.6-2.bb
@@ -0,0 +1,14 @@
+PR         = "r2"
+LICENSE    = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
+
+DEPENDS = "gtk+-2.6.4-1.osso7 libmatchbox gconf hildon-lgpl libosso osso-af-settings hildon-base-lib"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
+           file://source.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/hildon-navigator-0.9.6"
+
+inherit autotools pkgconfig
+
+#FILES_${PN} += " ${libdir}/outo/*.so" 
diff --git a/packages/maemo/hildon-status-bar/source.patch b/packages/maemo/hildon-status-bar/source.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/hildon-status-bar/source.patch
diff --git a/packages/maemo/hildon-status-bar_0.8.11-1.bb b/packages/maemo/hildon-status-bar_0.8.11-1.bb
index e69de29bb2..f6f0eab873 100644
--- a/packages/maemo/hildon-status-bar_0.8.11-1.bb
+++ b/packages/maemo/hildon-status-bar_0.8.11-1.bb
@@ -0,0 +1,13 @@
+PR         = "r1"
+LICENSE    = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+
+DEPENDS = "hildon-lgpl libosso hildon-libs"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
+           file://source.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/hildon-status-bar-0.8.11"
+
+inherit autotools pkgconfig
+
diff --git a/packages/maemo/osso-af-startup/osso-af-startup-source.patch b/packages/maemo/osso-af-startup/osso-af-startup-source.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/osso-af-startup/osso-af-startup-source.patch
diff --git a/packages/maemo/osso-af-startup_0.28-1.bb b/packages/maemo/osso-af-startup_0.28-1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/osso-af-startup_0.28-1.bb
diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
index e69de29bb2..44a53a4433 100644
--- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
+++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -0,0 +1,88 @@
+LICENSE = GPL
+SECTION = "x11/gnome"
+PR = "r1"
+PROVIDES = "gnome-vfs"
+RPROVIDES = "gnome-vfs"
+
+inherit gnome pkgconfig
+
+DEPENDS = "libxml2 gconf-osso dbus bzip2 gnome-mime-data zlib samba osso-gwconnect"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
+           file://gconftool-lossage.patch;patch=1;pnum=1"
+
+EXTRA_OECONF = "--with-ipc=dbus --enable-ext-dbus-daemon --disable-orbit"
+
+S = ${WORKDIR}/${PN}-2.8.4.4
+
+FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+GNOME_VFS_HEADERS = " \
+gnome-vfs-utils.h \
+gnome-vfs-application-registry.h \
+gnome-vfs-async-ops.h \
+gnome-vfs-ops.h \
+gnome-vfs-uri.h \
+gnome-vfs-standard-callbacks.h \
+gnome-vfs-module-callback.h \
+gnome-vfs-context.h \
+gnome-vfs-file-info.h \
+gnome-vfs-directory.h \
+gnome-vfs-mime-monitor.h \
+gnome-vfs-mime-handlers.h \
+gnome-vfs-result.h \
+gnome-vfs-job-limit.h \
+gnome-vfs-file-size.h \
+gnome-vfs-mime-utils.h \
+gnome-vfs-find-directory.h \
+gnome-vfs-init.h \
+gnome-vfs-handle.h \
+gnome-vfs.h \
+gnome-vfs-cancellation.h \
+gnome-vfs-xfer.h \
+gnome-vfs-monitor.h \
+gnome-vfs-types.h \
+gnome-vfs-volume-monitor.h \
+gnome-vfs-drive.h \
+gnome-vfs-volume.h \
+gnome-vfs-enum-types.h \
+gnome-vfs-address.h \
+gnome-vfs-dns-sd.h \
+gnome-vfs-mime-info-cache.h \
+gnome-vfs-resolve.h"
+
+GNOME_VFS_MODULE_HEADERS = " \
+gnome-vfs-mime-info.h \
+gnome-vfs-transform.h \
+gnome-vfs-ssl.h \
+gnome-vfs-inet-connection.h \
+gnome-vfs-socket.h \
+gnome-vfs-parse-ls.h \
+gnome-vfs-method.h \
+gnome-vfs-cancellable-ops.h \
+gnome-vfs-module.h \
+gnome-vfs-module-shared.h \
+gnome-vfs-module-callback-module-api.h \
+gnome-vfs-mime.h \
+gnome-vfs-socket-buffer.h"
+
+do_stage() {
+	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
+	for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
+	install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
+	for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
+}
+
+do_install() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
diff --git a/packages/maemo/sapwood_1.20-1.bb b/packages/maemo/sapwood_1.20-1.bb
index f024b09f85..207c5fee73 100644
--- a/packages/maemo/sapwood_1.20-1.bb
+++ b/packages/maemo/sapwood_1.20-1.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engine Sapwood"
@@ -15,3 +15,10 @@ S = ${WORKDIR}/${PN}-1.20
 EXTRA_OECONF = "--enable-abstract-sockets=no"
 
 inherit autotools pkgconfig
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/osso-af-init
+	install -m755 ${S}/debian/sapwood-server.sh  ${D}${sysconfdir}/osso-af-init/sapwood-server.sh
+}
+
+
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 191f58af92..1b94761335 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF_append_h3600 = " --enable-small-icons "
 EXTRA_OECONF_append_h3900 = " --enable-small-icons "
 EXTRA_OECONF_append_collie = " --enable-small-icons "
 EXTRA_OECONF_append_poodle = " --enable-small-icons "
-EXTRA_OECONF_append_ramses = " --enable-small-icons "
+EXTRA_OECONF_append_mnci = " --enable-small-icons "
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/applications \
diff --git a/packages/mathomatic/mathomatic.inc b/packages/mathomatic/mathomatic.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mathomatic/mathomatic.inc
diff --git a/packages/mathomatic/mathomatic_12.4.2.bb b/packages/mathomatic/mathomatic_12.4.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mathomatic/mathomatic_12.4.2.bb
diff --git a/packages/mathomatic/mathomatic_unstable.bb b/packages/mathomatic/mathomatic_unstable.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mathomatic/mathomatic_unstable.bb
diff --git a/packages/meta/maemo-image.bb b/packages/meta/maemo-image.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/meta/maemo-image.bb
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/meta/meta-maemo.bb
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index bb39694983..70a2f715c2 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -69,7 +69,7 @@ OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
 
 # Zaurus models can benefit from the VT and logout applets
 OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet"
-OPIE_BASE_APPLETS_append_ramses     = " opie-vtapplet opie-logoutapplet"
+OPIE_BASE_APPLETS_append_mnci       = " opie-vtapplet opie-logoutapplet"
 
 #
 # Additional things for a standard 16MB distribution
diff --git a/packages/modutils/files/mnci/modules b/packages/modutils/files/mnci/modules
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/modutils/files/mnci/modules
diff --git a/packages/modutils/files/mnci/modules-ramses b/packages/modutils/files/mnci/modules-ramses
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/modutils/files/mnci/modules-ramses
diff --git a/packages/modutils/files/mnci/modules.conf b/packages/modutils/files/mnci/modules.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/modutils/files/mnci/modules.conf
diff --git a/packages/modutils/files/mnci/modutils.sh b/packages/modutils/files/mnci/modutils.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/modutils/files/mnci/modutils.sh
diff --git a/packages/modutils/files/ramses/modules.conf b/packages/modutils/files/ramses/modules.conf
deleted file mode 100644
index 310e5bb6c8..0000000000
--- a/packages/modutils/files/ramses/modules.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-alias irda0 pxa_ir
-alias usbd0 usbdmonitor
-alias usbf usb-eth
-alias sound-slot-0 pxa-ac97
-alias sound-slot-1 pxa-ac97
-
-# Affix modules
-alias net-pf-27 affix
-alias char-major-60 affix_rfcomm
-
-# BlueZ modules
-alias net-pf-31 bluez
-alias bt-proto-0 l2cap
-alias bt-proto-2 sco
-alias bt-proto-3 rfcomm
-alias bt-proto-4 bnep
-alias bt-proto-5 cmtp
-alias bt-proto-6 hidp
-alias tty-ldisc-15 hci_uart
-alias char-major-10-250 hci_vhci
diff --git a/packages/mythfront/mythfront-session.bb b/packages/mythfront/mythfront-session.bb
index 1e03a4bae3..c24808a410 100644
--- a/packages/mythfront/mythfront-session.bb
+++ b/packages/mythfront/mythfront-session.bb
@@ -1,5 +1,4 @@
-
-PV = "1.2"
+PV = "1.3"
 LICENSE = "MIT"
 SRC_URI = "file://mythfront.sh"
 
diff --git a/packages/mythfront/mythfront-session/mythfront.sh b/packages/mythfront/mythfront-session/mythfront.sh
index e69de29bb2..b5c9ffbb56 100644
--- a/packages/mythfront/mythfront-session/mythfront.sh
+++ b/packages/mythfront/mythfront-session/mythfront.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir -p $HOME/.mythtv
+ln -sf /var/lib/config/lircrc $HOME/.mythtv/lircrc
+
+exec mythfrontend
+
diff --git a/packages/netbase/netbase/openmn/hosts b/packages/netbase/netbase/openmn/hosts
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/openmn/hosts
diff --git a/packages/netbase/netbase/openmn/interfaces b/packages/netbase/netbase/openmn/interfaces
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/openmn/interfaces
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 06e3a3c1b9..3426d1ae97 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -8,8 +8,8 @@ inherit update-rc.d
 
 INITSCRIPT_NAME = "networking"
 INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
-# On MNCI, start very late so that our own apps come up faster
-INITSCRIPT_PARAMS_ramses = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
+# On MNCI etc, start very late so that our own apps come up faster
+INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
 # On OpenSlug delay the stop until after network apps have exited
 # Do not stop in single user - there's no way to sulogin!
 INITSCRIPT_PARAMS_openslug = "start 40 S 0 6 ."
diff --git a/packages/nonworking/qtopia/qtopia_1.7.0.bb b/packages/nonworking/qtopia/qtopia_1.7.0.bb
index e69de29bb2..1086c59a07 100644
--- a/packages/nonworking/qtopia/qtopia_1.7.0.bb
+++ b/packages/nonworking/qtopia/qtopia_1.7.0.bb
@@ -0,0 +1,81 @@
+DESCRIPTION="Qtopia PDA"
+MAINTAINER="Lorn Potter <lpotter@trolltech.com>"
+LICENSE="GPL/QPL"
+SRC_URI="ftp://ftp.trolltech.com/pub/qtopia/source/qtopia-free-${PV}.tar.gz \
+	file://${FILESDIR}/nofreetype.patch;patch=1 \
+	file://${FILESDIR}/ft2.patch;patch=1 \
+	file://${FILESDIR}/embeddedkonsole.patch;patch=1 \
+	file://${FILESDIR}/konsoleEnv.patch;patch=1 \
+	file://${FILESDIR}/makefile2.patch;patch=1 \
+	file://${FILESDIR}/performance.patch;patch=1 \
+	file://${FILESDIR}/qpe.patch;patch=1 \
+	file://${FILESDIR}/security.patch;patch=1 \
+	file://${FILESDIR}/storage.patch;patch=1"
+
+DEPENDS=base/zlib base/libpng base/jpeg qte-for-qtopia tmake e2fsprogs-libs uicmoc
+PROVIDES=virtual/qtopia virtual/libqpe virtual/libqtopia
+S="${WORKDIR}/qtopia-free-${PV}"
+
+# strip off leading and trailing whitespace, and made the vars single word
+#CXX:="${@bb.data.getVar('CXX', d, 1).strip().split()[-1]}"
+#CC:="${@bb.data.getVar('CC', d, 1).strip().split()[-1]}"
+#BUILD_CXX:="${@bb.data.getVar('BUILD_CXX', d, 1).strip().split()[-1]}"
+#BUILD_CC:="${@bb.data.getVar('BUILD_CC', d, 1).strip().split()[-1]}"
+#CFLAGS:="${@bb.data.getVar('CFLAGS', d, 1).strip()}"
+#CXXFLAGS:="${@bb.data.getVar('CXXFLAGS', d, 1).strip()}"
+#LDFLAGS:="${@bb.data.getVar('LDFLAGS', d, 1).strip()}"
+
+export QPEDIR = ${S}
+export QTDIR = ${STAGING_DIR}/target
+
+EXTRA_OECONF_CONFIG =
+EXTRA_OECONF_ARCH = -xplatform ${TARGET_OS}-${TARGET_ARCH}-g++
+EXTRA_OECONF_ARCH_collie = -xplatform ${TARGET_OS}-sharp-g++
+EXTRA_OECONF_ARCH_mnci = -xplatform ${TARGET_OS}-mnci-g++
+EXTRA_OECONF = ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}
+EXTRA_OEMAKE = -e
+
+export SYSCONF_CC = ${CC}
+export SYSCONF_CXX = ${CXX}
+export SYSCONF_LINK = ${CC}
+export SYSCONF_SHLIB = ${CC}
+export SYSCONF_CFLAGS = ${CFLAGS}
+export SYSCONF_CXXFLAGS = ${CXXFLAGS} -DQWS -pipe -fno-exceptions -fno-rtti -DNO_DEBUG -DQT_NO_WIZARD
+export SYSCONF_LFLAGS = ${LDFLAGS}
+export SYSCONF_MOC = ${STAGING_BINDIR}/moc
+export SYSCONF_UIC = ${STAGING_BINDIR}/uic
+
+do_configure() {
+	unset CC CXX LD LINK CPP CFLAGS CXXFLAGS LDFLAGS
+	if [ "$BUILD_ARCH" = "i686" ]; then
+		BUILD_ARCH=x86
+	fi
+	cd ${S}/src
+	echo ./configure -platform ${BUILD_OS}-${BUILD_ARCH}-g++ $EXTRA_OECONF
+	./configure -platform ${BUILD_OS}-${BUILD_ARCH}-g++ $EXTRA_OECONF
+}
+
+
+do_compile() {
+	unset CC CXX LD LINK CPP CFLAGS CXXFLAGS LDFLAGS
+	unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS SYSCONF_SHLIB CROSS SYSCONF_LFLAGS
+	cd ${S}/src
+	export SYSCONF_LFLAGS="-L${S}/lib -L${STAGING_LIBDIR} -Wl,-rpath,${S}/lib -Wl,-rpath,${STAGING_LIBDIR} -Wl,-rpath-link,${S}/lib -Wl,-rpath-link,${STAGING_LIBDIR}"
+	# Fix to make oe freetype2 available as freetype
+	ln -sf  ${STAGING_INCDIR}/freetype2/freetype  ${STAGING_INCDIR}/freetype
+	oe_runmake
+	# Clean the mess
+	rm ${STAGING_INCDIR}/freetype
+}
+
+do_stage () {
+	cp -a lib/* ${STAGING_LIBDIR}/
+	cp -a -R -f --dereference include/qtopia ${STAGING_DIR}/target/include/
+	ln -sf ${STAGING_DIR}/target/include/qtopia ${STAGING_DIR}/target/include/qpe
+}
+
+do_install () {
+	die "no install yet"
+#	install -d ${D}/usr/lib/qte2/lib
+#	install -m 0755 lib/libqte.so.* ${D}/usr/lib/qte2/lib/
+}
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
index e69de29bb2..0a8d410e47 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin/libmadplugin.pro
@@ -0,0 +1,51 @@
+TEMPLATE 	= lib
+CONFIG   	+=  qt warn_on 
+HEADERS   	= libmadplugin.h libmadpluginimpl.h
+SOURCES   	= libmadplugin.cpp libmadpluginimpl.cpp
+TARGET   	= madplugin
+DESTDIR   	= $(OPIEDIR)/plugins/codecs
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH      +=  ..
+LIBS            += -lqpe -lm -lmad
+VERSION   =   1.0.0
+
+include ( $(OPIEDIR)/include.pro )
+	
+DEFINES += FPM_INTEL
+
+system(echo $QMAKESPEC | grep -s sharp) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_ARM
+}
+
+system(echo $QMAKESPEC | grep -s ipaq) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_ARM
+}
+
+system(echo $QMAKESPEC | grep -s mipsel) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_MIPS
+}
+
+system(echo $QMAKESPEC | grep -s mnci) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_ARM
+}
+
+system(echo $QMAKESPEC | grep -s arm) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_ARM
+}
+
+system(echo $QMAKESPEC | grep -s simpad) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_ARM
+}
+
+system(echo $QMAKESPEC | grep -s yopy) {
+	DEFINES -= FPM_INTEL
+	DEFINES += FPM_ARM
+}
+
+
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index 21052b3b4b..d9f46af533 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -88,7 +88,7 @@ do_install() {
         install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
 }
 
-updatercd_postinst_ramses() {
+updatercd_postinst_mnci() {
 if test "x$D" != "x"; then
         D="-r $D"
 else
diff --git a/packages/opie-taskbar/opie-taskbar/mnci/opie b/packages/opie-taskbar/opie-taskbar/mnci/opie
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/mnci/opie
diff --git a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf b/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf
diff --git a/packages/opie-taskbar/opie-taskbar/ramses/opie b/packages/opie-taskbar/opie-taskbar/ramses/opie
deleted file mode 100644
index d5e2955b10..0000000000
--- a/packages/opie-taskbar/opie-taskbar/ramses/opie
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-# export QWS_KEYBOARD=KernelTTY
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
-    echo Opie not installed
-    exit 0 
-fi
-
-. /etc/profile
-
-if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
-    mkdir -p $HOME/Settings
-    cp $OPIEDIR/etc/skel/* $HOME/Settings
-fi
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
-    mkdir -p $HOME/systeminfo/
-    echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
-    ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
-    if [ -x "$OPIEDIR/bin/opie-login" ]; then
-            echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
-    else
-        $OPIEDIR/bin/opie-reorgfiles >/dev/null
-        if [ -x /usr/bin/ssh-agent ]; then
-             SSHAGENT=/usr/bin/ssh-agent
-        else
-             SSHAGENT=""
-        fi
-        
-        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
-            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
-        fi           
-        echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 2>/dev/null
-    fi
-
-    ;;
-
-'stop')
-    echo "Stopping Opie..."
-        killall qpe 2>/dev/null
-        killall opie-login 2>/dev/null
-        killall quicklauncher 2>/dev/null
-	sleep 1
-        killall -9 qpe 2>/dev/null
-        killall -9 opie-login 2>/dev/null
-        killall -9 quicklauncher 2>/dev/null
-
-    ;;
-
-'restart')
-	$0 stop && $0 start
-
-	;;
-
-*)
-    echo "usage: $0 { start | stop | restart }"
-
-    ;;
-
-esac
-
diff --git a/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf b/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf
deleted file mode 100644
index 8efe771ad0..0000000000
--- a/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-[Appearance]
-Decoration = libflat.so
-FontFamily = vera
-FontSize = 10
-FontStyle = Regular
-LeftHand = 0
-Style = libflatstyle.so
-rotatedir = 0
-[Battery]
-[Date]
-ClockApplet = 0
-LongOrder = 273
-Separator = .
-ShortOrder = 273
-[InputMethod]
-current = Multikey
-[Keyboard]
-[Startup]
-FirstUse = 0
-[Time]
-AMPM = 0
-MONDAY = 1
-[Volume]
-[Wireless]
-UpdateFrequency = 2
diff --git a/packages/qte/qte-2.3.10/mnci-touchscreen.patch b/packages/qte/qte-2.3.10/mnci-touchscreen.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/mnci-touchscreen.patch
diff --git a/packages/qte/qte-2.3.10/mnci.patch b/packages/qte/qte-2.3.10/mnci.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/mnci.patch
diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp
diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h
diff --git a/packages/qte/qte-2.3.10/ramses.patch b/packages/qte/qte-2.3.10/ramses.patch
deleted file mode 100644
index c2e0e079d9..0000000000
--- a/packages/qte/qte-2.3.10/ramses.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~ramses.patch
-+++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp
-@@ -249,20 +249,12 @@
- 
- static void writeTerm(const char* termctl, int sizeof_termctl)
- {
--#ifdef QT_QWS_DEVFS
--    const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0};
--#else
--    const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0};
--#endif
--    const char** dev=tt;
--    while (*dev) {
--	int tty=::open(*dev,O_WRONLY);
-+qWarning("writeTerm");
-+        int tty=::open("/dev/vc/2", O_WRONLY);
- 	if ( tty>=0 ) {
- 	    ::write(tty,termctl,sizeof_termctl);
- 	    ::close(tty);
- 	}
--	dev++;
--    }
- }
- 
- /*!
-@@ -275,6 +267,7 @@
- 
- bool QLinuxFbScreen::initDevice()
- {
-+qWarning("QLinuxFbScreen::initDevice");
-     /* Setting up the VT parameters is done in qapplication_qws.cpp
-     const char termctl[]="\033[9;0]\033[?33l\033[?25l";
-     writeTerm(termctl,sizeof(termctl)); */
-@@ -765,9 +758,12 @@
-     }
- */
- 
-+qWarning("QLinuxFbScreen::shutdownDevice");
-+/*
-     // Blankin' screen, blinkin' cursor!
-     const char termctl[] = "\033[9;15]\033[?33h\033[?25h\033[?0c";
-     writeTerm(termctl,sizeof(termctl));
-+*/
- }
- 
- /*!
---- qt-2.3.10/src/kernel/qapplication_qws.cpp~ramses.patch
-+++ qt-2.3.10/src/kernel/qapplication_qws.cpp
-@@ -1756,8 +1756,6 @@
-      */
-     if ( qws_daemon )
-     {
--        qWarning( "qt_init() - starting in daemon mode..." );
--
-         int pid1 = fork();
-         if ( pid1 == -1 )
-         {
-@@ -1791,7 +1789,6 @@
-         }
-         if ( pid2 )
-         {
--             syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 );
-             _exit( 0 ); // ok, second fork performed
-         }
-     }
-@@ -1828,9 +1825,12 @@
-     #if defined(_OS_LINUX_)
-     if ( qws_terminal_id )
-     {
--        qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id );
-         struct vt_stat console_stat;
-+#ifdef QT_QWS_DEVFS
-+        int console_fd = ::open( QString().sprintf( "/dev/vc/%d", qws_terminal_id ).latin1(), O_RDWR );
-+#else
-         int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR );
-+#endif
-         if ( console_fd == -1)
-         {
-             qWarning( "qt_init() - can't open tty: %s", strerror( errno ) );
-@@ -1927,7 +1927,11 @@
-         {
-             qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old );
- 
-+#ifdef QT_QWS_DEVFS
-+            int console_fd = ::open( "/dev/vc/0", O_RDWR );
-+#else
-             int console_fd = ::open( "/dev/tty0", O_RDWR );
-+#endif
-             if ( console_fd == -1)
-             {
-                 qWarning( "qt_init() - can't open tty: %s", strerror( errno ) );
---- qt-2.3.10/src/kernel/qwindowsystem_qws.cpp~ramses.patch
-+++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
-@@ -1791,6 +1791,7 @@
- }
- 
- #ifndef QT_NO_QWS_KEYBOARD
-+#ifndef QT_QWS_RAMSES
- static int keyUnicode(int keycode)
- {
-     const QWSServer::KeyMap *km = QWSServer::keyMap();
-@@ -1803,6 +1804,7 @@
-     return 0xffff;
- }
- #endif
-+#endif
- /*!
-   Send a key event. You can use this to send key events generated by
-   "virtual keyboards".
-@@ -1845,8 +1847,10 @@
- 
-     event.simpleData.unicode = 
- #ifndef QT_NO_QWS_KEYBOARD
-+#ifndef QT_QWS_RAMSES
- 	unicode < 0 ? keyUnicode(keycode) : 
- #endif
-+#endif
- 	unicode;
-     event.simpleData.keycode = keycode;
-     event.simpleData.modifiers = modifiers;
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index f8b630cced..fb0df5c28d 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
-DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
+DEPENDS_mnci = "zlib libpng jpeg uicmoc-native"
 DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PROVIDES = "virtual/qte virtual/libqte2"
 PR = "r17"
@@ -39,9 +39,9 @@ SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-
 SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
 SRC_URI_append_jornada7xx       = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 SRC_URI_append_jornada56x       = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_ramses           = "file://devfs.patch;patch=1 \
-                                   file://ramses.patch;patch=1 \
-                                   file://ramses-touchscreen.patch;patch=1 \
+SRC_URI_append_mnci             = "file://devfs.patch;patch=1 \
+                                   file://mnci.patch;patch=1 \
+                                   file://mnci-touchscreen.patch;patch=1 \
 				   file://qkeyboard_qws.h \
 				   file://qkeyboard_qws.cpp "
 SRC_URI_append_h3600            = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
@@ -88,7 +88,7 @@ EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_S
 EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
 EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
 EXTRA_DEFINES_beagle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
-EXTRA_DEFINES_ramses 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
+EXTRA_DEFINES_mnci 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
 
 export SYSCONF_CC = "${CC}"
 export SYSCONF_CXX = "${CXX}"
@@ -99,11 +99,11 @@ export SYSCONF_LINK_SHLIB = "${CCLD}"
 export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
-export SYSCONF_LFLAGS_ramses = "${LDFLAGS}"
+export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
 export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 
-do_configure_prepend_ramses() {
+do_configure_prepend_mnci() {
 	chmod -R a+w ${S}/src/kernel
 	cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
 	cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
diff --git a/packages/setmixer/setmixer_27DEC94.bb b/packages/setmixer/setmixer_27DEC94.bb
index ce4a81f18d..d56e5d0b8e 100644
--- a/packages/setmixer/setmixer_27DEC94.bb
+++ b/packages/setmixer/setmixer_27DEC94.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Holger Schurig <no@spam.de>"
 SRC_URI = "${DEBIAN_MIRROR}/main/s/setmixer/setmixer_${PV}.orig.tar.gz \
 	   file://setmixer.patch;patch=1"
-SRC_URI_append_ramses = " file://devfs.patch;patch=1"
+SRC_URI_append_mnci = " file://devfs.patch;patch=1"
 
 S = "${WORKDIR}/${PN}-${PV}.orig"
 
diff --git a/packages/speex/speex_1.1.7.bb b/packages/speex/speex_1.1.7.bb
index e69de29bb2..7ce34a80eb 100644
--- a/packages/speex/speex_1.1.7.bb
+++ b/packages/speex/speex_1.1.7.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
+SECTION = "libs"
+LICENSE = "BSD"
+HOMEPAGE = "http://www.speex.org"
+DEPENDS = "libogg"
+PR = "r0"
+
+SRC_URI = "http://www.speex.org/download/speex-${PV}.tar.gz"
+
+inherit autotools
+
+# Some interesting options are:
+#
+#	--enable-arm4-asm
+#	--enable-arm5e-asm
+#	--enable-fixed-point
+#
+
+EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point"
+
+do_configure_append() {
+	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
+	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
+	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
+	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
+	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
+}
+
+do_stage() {
+	oe_libinstall -C libspeex/.libs -so libspeex ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/speex
+	install -m 0644 include/speex/speex.h ${STAGING_INCDIR}/speex
+	install -m 0644 include/speex/speex_bits.h ${STAGING_INCDIR}/speex
+	install -m 0644 include/speex/speex_callbacks.h ${STAGING_INCDIR}/speex
+	install -m 0644 include/speex/speex_header.h ${STAGING_INCDIR}/speex
+	install -m 0644 include/speex/speex_stereo.h ${STAGING_INCDIR}/speex
+}
diff --git a/packages/squeak/files/mnci/Makefile.in b/packages/squeak/files/mnci/Makefile.in
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/squeak/files/mnci/Makefile.in
diff --git a/packages/sysvinit/sysvinit/mnci/inittab b/packages/sysvinit/sysvinit/mnci/inittab
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysvinit/sysvinit/mnci/inittab
diff --git a/packages/sysvinit/sysvinit/openmn/rcS b/packages/sysvinit/sysvinit/openmn/rcS
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysvinit/sysvinit/openmn/rcS
diff --git a/packages/sysvinit/sysvinit/rt3000/inittab b/packages/sysvinit/sysvinit/rt3000/inittab
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysvinit/sysvinit/rt3000/inittab
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 969bbb08b8..d7b68ebce7 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -91,15 +91,3 @@ EOF
 	done
 	mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.sysvinit
 }
-
-
-do_install_append_ramses () {
-	cat <<EOF >>${D}${sysconfdir}/inittab
-# Bluetooth
-#1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1
-# External serial port
-4:2345:respawn:${base_sbindir}/getty -L 115200 tts/4
-# Framebuffer
-v1:2345:respawn:${base_sbindir}/getty -L 115200 vc/1
-EOF
-}
diff --git a/packages/tslib/tslib/mnci/ts.conf b/packages/tslib/tslib/mnci/ts.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/mnci/ts.conf
diff --git a/packages/tslib/tslib/mnci/tslib.sh b/packages/tslib/tslib/mnci/tslib.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/mnci/tslib.sh
diff --git a/packages/tslib/tslib/omap5912osk/ts.conf b/packages/tslib/tslib/omap5912osk/ts.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/omap5912osk/ts.conf
diff --git a/packages/tslib/tslib/omap5912osk/tslib.sh b/packages/tslib/tslib/omap5912osk/tslib.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/omap5912osk/tslib.sh
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 2193cad59e..f83be14b44 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -5,15 +5,15 @@ PR = "r19"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
-PACKAGE_ARCH_ramses = "${MACHINE}"
+PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
 	   file://ts.conf \
 	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 \
 	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
 	   file://tslib.sh"
-SRC_URI_append_ramses += " file://devfs.patch;patch=1"
-SRC_URI_append_ramses += " file://event1.patch;patch=1"
+SRC_URI_append_mnci += " file://devfs.patch;patch=1"
+SRC_URI_append_mnci += " file://event1.patch;patch=1"
 S = "${WORKDIR}/tslib"
 LICENSE = "LGPL"
 CONFFILES_${PN} = "${sysconfdir}/ts.conf"
@@ -21,8 +21,8 @@ CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 inherit autotools
 
 PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
-EXTRA_OECONF = "--enable-shared"
-EXTRA_OECONF_ramses = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
+EXTRA_OECONF        = "--enable-shared"
+EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
 do_stage () {
diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/uboot/u-boot_1.1.2.bb
index e69de29bb2..8ddcfbd4b4 100644
--- a/packages/uboot/u-boot_1.1.2.bb
+++ b/packages/uboot/u-boot_1.1.2.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "U-boot bootloader"
+PROVIDES = "virtual/bootloader"
+SECTION = "bootloader"
+MAINTAINER = "Holger Schurig"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+	   file://arm_flags.patch;patch=1 "
+SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch;patch=1"
+SRC_URI_append_mnci   = "file://mnci.patch;patch=1 \
+                         file://mnci-jffs2.patch;patch=1 \
+                         file://cmd-arm-linux.patch;patch=1 \
+                         file://command-names.patch;patch=1"
+# TODO: SRC_URI_append_rt3000
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+UBOOT_MACHINE ?= "${MACHINE}_config"
+UBOOT_MACHINE_mnci   = "mnci_config"
+UBOOT_MACHINE_vibren = "pxa255_idp_config"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
+
+inherit base
+
+do_compile () {
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_stage() {
+	install -m755 tools/mkimage ${STAGING_BINDIR}
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
+
+
+#########################################################
+
+RDEPENDS_append_mnci = " hwctrl"
+
+FILES_${PN}_mnci = "/tmp/${UBOOT_IMAGE}"
+do_install_openmn() {
+	install -d ${D}/tmp
+	install ${S}/u-boot.bin ${D}/tmp/${UBOOT_IMAGE}
+}
+
+pkg_postinst_mnci() {
+ldconfig
+A=/tmp/bootargs
+hwctrl kernel_conf_get bootargs >$A
+cp /tmp/${UBOOT_IMAGE} /dev/mtdblock/0
+rm /tmp/${UBOOT_IMAGE}
+hwctrl kernel_conf_set bootargs "`cat $A`"
+cat /dev/mtdblock/0 >/dev/null
+exit 0
+}
diff --git a/packages/update-modules/update-modules-1.0/openmn/update-modules b/packages/update-modules/update-modules-1.0/openmn/update-modules
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/update-modules/update-modules-1.0/openmn/update-modules
diff --git a/packages/wpa-supplicant/files/openmn/defaults b/packages/wpa-supplicant/files/openmn/defaults
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wpa-supplicant/files/openmn/defaults
diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb
index e69de29bb2..862642027e 100644
--- a/packages/xerces-c/xerces-c_2.6.0.bb
+++ b/packages/xerces-c/xerces-c_2.6.0.bb
@@ -0,0 +1,36 @@
+PR = "r0"
+DESCRIPTION = "Xerces-c xml"
+SECTION =  "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Balister philip@balister.org"
+LICENSE = "MIT"
+
+S=${WORKDIR}/xerces-c-src_2_6_0
+
+SRC_URI = "http://www.axint.net/apache/xml/xerces-c/xerces-c-src_2_6_0.tar.gz"
+
+inherit pkgconfig 
+
+do_compile () {
+        export XERCESCROOT=${S}
+        cd src/xercesc
+# runConfigure is going to bust CC and CXX I bet
+        CC_SAVE="${CC}"
+        CXX_SAVE="${CXX}"
+	./runConfigure -plinux -c${CC} -x${CXX} -minmem -nsocket -tnative -rpthread
+        CC="${CC_SAVE}"
+        CXX="${CXX_SAVE}"
+        oe_runmake
+}
+
+do_stage () {
+	oe_libinstall lib/libxerces-c ${STAGING_LIBDIR}
+	oe_libinstall lib/libxerces-depdom ${STAGING_LIBDIR}
+
+	cp -a include/xercesc ${STAGING_INCDIR}
+}
+
+do_install () {
+	oe_libinstall lib/libxerces-c ${D}${libdir}
+	oe_libinstall lib/libxerces-depdom ${D}${libdir}
+}
diff --git a/packages/xmame/xmame_0.95.bb b/packages/xmame/xmame_0.95.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xmame/xmame_0.95.bb
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 3802ad8b8b..d1910bdd6e 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -36,7 +36,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;
 	file://kmode.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1"
 
-SRC_URI_append_ramses = " file://onlyfb.patch;patch=1 \
+SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1 \
                           file://devfs.patch;patch=1 \
                           file://disable-apm.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
diff --git a/packages/xserver/xserver-kdrive_20050610.bb b/packages/xserver/xserver-kdrive_20050610.bb
index e69de29bb2..4031db9c2b 100644
--- a/packages/xserver/xserver-kdrive_20050610.bb
+++ b/packages/xserver/xserver-kdrive_20050610.bb
@@ -0,0 +1,47 @@
+PV = "0.0cvs${FIXEDCVSDATE}"
+FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
+DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
+DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
+DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
+DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
+DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+PR = "r10"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-ati = "${bindir}/Xati"
+FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
+FILES_xserver-kdrive-via = "${bindir}/Xvia"
+FILES_xserver-kdrive-mga = "${bindir}/Xmga"
+FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
+	file://kmode.patch;patch=1 \
+	file://fbdev-not-fix.patch;patch=1"
+
+SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/xserver"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index cbea0c136c..c3fccd636b 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -34,7 +34,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver
 	file://kmode.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1"
 
-SRC_URI_append_ramses = " file://onlyfb.patch;patch=1"
+SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
 PACKAGE_ARCH_poodle = "poodle"
author	John Bowler <jbowler@nslu2-linux.org>	2005-06-15 14:15:01 +0000
committer	John Bowler <jbowler@nslu2-linux.org>	2005-06-15 14:15:01 +0000
commit	30224312da542b11730e13c15c051a574ab49c84 (patch)
tree	8a5416746bf021bfb9c3eff69a86f0719e1570a9
parent	8e05a4e785df2149e69204ba01d1cb8c03f86486 (diff)