13 files changed, 296 insertions, 55 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index eb83cbcbb5..6631dc2068 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -11,7 +11,7 @@
 # with the org.openembedded.angstrom-2007.12-stable branch
 #
 # Use this at your own risk, we welcome bugreports filed at 
-#    http://bugs.openembedded.org
+#    http://bugs.openembedded.net
 #
 # Again, in doubt, use DISTRO="angstrom-2007.1" with the 
 # org.openembedded.angstrom-2007.12-stable branch
@@ -70,12 +70,9 @@ KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_D
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
 #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc 		= "2.6.1"
-PREFERRED_VERSION_glibc-intermediate 	= "2.6.1"
-PREFERRED_VERSION_glibc-initial 	= "2.6.1"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
-
+PREFERRED_VERSION_glibc 		?= "2.6.1"
+PREFERRED_VERSION_glibc-intermediate 	?= "2.6.1"
+PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
 
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	?= "2.12.3"
@@ -134,18 +131,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 
-#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
-
 # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
 PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
 PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
@@ -222,5 +207,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     openssh-sftp-server \
     "
 
-SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index e38a3abd06..92c44fe630 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -255,5 +255,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     openssh-sftp-server \
     "
 
-SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 2612734422..382d562426 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,5 +1,5 @@
 PREFERRED_VERSION_busybox 	= "1.9.2"
-PREFERRED_VERSION_dbus 		= "1.1.20"
+PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_glib-2.0 	= "2.16.1"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_libtool 	= "1.5.10"
@@ -7,3 +7,4 @@ PREFERRED_VERSION_pango 	= "1.18.3"
 PREFERRED_VERSION_pulseaudio 	= "0.9.9"
 PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_dropbear 	= "0.50"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 837aec9f2d..394ec7c2d4 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -16,7 +16,7 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 29b34f9665..fd79eff276 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -5,11 +5,21 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
+#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc-intermediate"
+
+
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 7c713e65ea..4b68293faf 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -3,6 +3,12 @@
 PREFERRED_PROVIDER_virtual/libc = "uclibc"
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
 PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index f53f1fb8bd..f6330981c5 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -284,11 +284,11 @@ TINDER_REPORT     = "1"
 # in their local.conf
 
 # seppuku bbclass
-SEPPUKU_LOGIN        = "http://bugs.openembedded.org/query.cgi?"
-SEPPUKU_QUERY        = "http://bugs.openembedded.org/buglist.cgi?"
-SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-SEPPUKU_ATTACHMENT   = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_LOGIN        = "http://bugs.openembedded.net/query.cgi?"
+SEPPUKU_QUERY        = "http://bugs.openembedded.net/buglist.cgi?"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ATTACHMENT   = "http://bugs.openembedded.net/attachment.cgi?"
 SEPPUKU_AUTOBUILD    = "1"
 
 SEPPUKU_PRODUCT      = "Openembedded"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d04bb829be..8feb23d740 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,6 +14,8 @@
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-assassin ?= "41"
 SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-uclibc ?= "21926"
+SRCREV_pn-uclibc-initial ?= "21926"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 3c4dc11bb8..b8c7dae22e 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -6,6 +6,9 @@
 DISTRO_NAME = "jlime"
 DISTRO_VERSION = "donkey"
 
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
 export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
 
 #<>----------------------------------------------------------------->
@@ -36,33 +39,40 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
 PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/xserver  = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/libx11    = "libx11"
-PREFERRED_VERSION_liblbxutil         = "X11R7.0-1.0.0"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
 
 #<>----------------------------------------------------------------->
 #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
 #<>-----------------------------------------------------------------<
-PREFERRED_VERSION_binutils = "2.17"
-PREFERRED_VERSION_binutils-cross = "2.17"
-PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7"
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
-PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"                                             		    
-PREFERRED_VERSION_glibc = "2.5"
-PREFERRED_VERSION_glibc-initial = "2.3.2"
-PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+PREFERRED_VERSION_binutils-cross-sdk = "2.18"
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_linux-libc-headers = "2.6.23"                                             		    
+PREFERRED_VERSION_glibc = "2.6.1"
+PREFERRED_VERSION_glibc-initial = "2.6.1"
+PREFERRED_VERSION_glibc-intermediate = "2.6.1"
 
 #<>------------------------------------------------------------------>
 #<>
 #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
 #<>------------------------------------------------------------------<
-PREFERRED_VERSION_xserver-kdrive  = "0.0+cvs20060312"
+#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
 PREFERRED_PROVIDER_tslib          = "tslib"
 PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 
 #<>------------------------------------------------------------------>
+#<>
+#<>System-critical software with known working versions.
+#<>------------------------------------------------------------------<
+PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_busybox = "1.9.1"
+
+#<>------------------------------------------------------------------>
 #<>Other Specific stuff.
 #<>
 #<>
@@ -90,8 +100,8 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests
 #<>------------------------------------------------------------------<
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
-OPIE_VERSION = "1.2.2"
-require conf/distro/include/preferred-opie-versions.inc
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions-1.2.3.inc
 
 
 #<>------------------------------------------------------------------>
@@ -119,9 +129,10 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
 #<> General non-essential programs with known working versions
 #<>
 #<>------------------------------------------------------------------<
-PREFERRED_VERSION_irssi = "0.8.10"
-PREFERRED_VERSION_mc = "4.6.1"
-PREFERRED_VERSION_nano = "1.3.9"
-PREFERRED_VERSION_ncurses = "5.4"
-PREFERRED_VERSION_ncftp = "3.1.9"
-PREFERRED_VERSION_osb-jscore = "0.5.0"
-\ No newline at end of file
+PREFERRED_VERSION_tightvnc = "1.3.9"
+PREFERRED_VERSION_xmonobut = "0.4"
+PREFERRED_VERSION_konqueror-embedded = "20070212"
+#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
+PREFERRED_VERSION_icewm = "1.2.34"
+PREFERRED_VERSION_xchat = "1.8.11"
+PREFERRED_VERSION_rxvt = "2.6.4"
diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf
new file mode 100644
index 0000000000..68353b0bd9
--- /dev/null
+++ b/conf/distro/jlime-henchman.conf
@@ -0,0 +1,106 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Henchman <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              NEC Mobile Pro 900/900c handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Henchman"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "fixed"
+TARGET_FPU_armeb = "fixed"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf
new file mode 100644
index 0000000000..6fb00f1452
--- /dev/null
+++ b/conf/distro/jlime-mongo.conf
@@ -0,0 +1,107 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Mongo <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              HP Jornada 720/728 handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Mongo"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+#INHERIT += "package_tar"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 6c71bc00c7..f1abee076b 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -126,15 +126,15 @@ BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
 SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild"
 SEPPUKU_USER[doc]     = "The login-name for the bugzilla account"
 SEPPUKU_PASS[doc]     = "The password for this account"
-#SEPPUKU_LOGIN         = "http://bugs.openembedded.org/query.cgi?"
+#SEPPUKU_LOGIN         = "http://bugs.openembedded.net/query.cgi?"
 SEPPUKU_LOGIN[doc]    = "path to the login script of the bugzilla, note the ? at the end"
-#SEPPUKU_QUERY         = "http://bugs.openembedded.org/buglist.cgi"
+#SEPPUKU_QUERY         = "http://bugs.openembedded.net/buglist.cgi"
 SEPPUKU_QUERY[doc]    = "The query script of the bugzilla"
-#SEPPUKU_NEWREPORT     = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+#SEPPUKU_NEWREPORT     = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &"
-#SEPPUKU_ADDCOMMENT     = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+#SEPPUKU_ADDCOMMENT     = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment"
-#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi"
+#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi"
 SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments."
 
 
diff --git a/conf/machine/mp900c.conf b/conf/machine/mp900c.conf
new file mode 100644
index 0000000000..37055be2bb
--- /dev/null
+++ b/conf/machine/mp900c.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: NEC Mobile Pro 900/900c 
+#@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+require conf/machine/include/tune-xscale.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-mobilepro900"
+PCMCIA_MANAGER = "pcmciautils"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"