merge of '1c81965a2b4441230dcc780cb75b714800217cf4'

     and 'd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf'

9 files changed, 288 insertions, 41 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index df5435a3e5..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
@@ -207,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-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 c780056f9e..fd79eff276 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -19,7 +19,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 -frename-registers -fomit-frame-pointer -Os"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index f53f1fb8bd..c7415a7d8b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -76,8 +76,11 @@ ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
+TARGET_FPU_ppc405 ?= "soft"
 
-TARGET_FPU_dht-walnut ?= "soft"
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv7a ?= "hard"
+TARGET_FPU_ppc603e ?= "hard"
 
 #Set the right arch for the feeds
 #Alphabetically sorted
@@ -284,11 +287,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/oplinux.inc b/conf/distro/include/oplinux.inc
index 843f8e18ba..a7eac524bc 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -1,10 +1,10 @@
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
+
 # extra checking for needed tools
 #
-
 # set minimal version of BitBake needed
-BB_MIN_VERSION = "1.6.7"
+BB_MIN_VERSION = "1.8.10"
 
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
@@ -33,15 +33,16 @@ IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/"
+#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/"
 
+PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/"
 
 #
 # Bootstrap & Init
 PREFERRED_PROVIDER_task-bootstrap = "task-base"
 
 # We want images supporting the following features (for task-base
-DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs ext2 usbhost pci"
 
 
 #We need to set this to avoid problems when building for if host=target
@@ -53,17 +54,21 @@ OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc"
 
 #Dir config
 IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 #Set the name of the generated images
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${MACHINE}-${DATE}-${SVN_REV}"
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 
+#Do not ship kernel image with the rootfs
+IMAGE_PREPROCESS_COMMAND_append = "if [ -f ${IMAGE_ROOTFS}/boot/bzImage ]; then rm \
+${IMAGE_ROOTFS}/boot/bzImage*;fi;"
 
 
 
 #
-#feed definitions
+#Feed definitions
+#
 #i32 machines
 #i486 machines
 FEED_ARCH_x86           ="i486"
@@ -75,9 +80,6 @@ FEED_ARCH_epia          = "i586"
 
 #i686 machines
 FEED_ARCH_i686-generic  = "i686"
-FEED_ARCH_guinness      = "i686"
-FEED_ARCH_progear       = "i686"
-
 
 #powerpc machines
 #ppc405
@@ -91,12 +93,27 @@ FEED_ARCH_sequoia       = "ppc440e"
 #ppc603e
 FEED_ARCH_efika         = "ppc603e"
 
+#ppce300c2
+FEED_ARCH_mpc8323e-rdb  = "ppce300c2"
+
+#avr32
+FEED_ARCH_atngw100      = "avr32"
+FEED_ARCH_at32stk100    = "avr32"
+
+
 
 #
 #Preferred versions of packages we need
 #
 PREFERRED_VERSION_busybox = "1.2.1"
 PREFERRED_VERSION_u-boot ?= "1.1.4"
+PREFERRED_VERSION_fakeroot ?= "1.7.1"
+PREFERRED_VERSION_fakeroot-native ?= "1.7.1"
+PREFERRED_VERSION_makedev ?= "2.3.1"
+PREFERRED_VERSION_makedevs ?= "1.0.0"
+PREFERRED_VERSION_makedevs-native ?= "1.0.0"
+
+
 # Latest linphone supports yeaphone
 PREFERRED_VERSION_linphone ?= "1.6.0"
 
@@ -106,3 +123,6 @@ PREFERRED_VERSION_linphone ?= "1.6.0"
 DISTRO_SSH_DAEMON ?= "dropbear"
 
 
+#PREFERRED_VERSION_opsis-asterisk-bri_dht-walnut = "1.2.17"
+#PREFERRED_VERSION_zaptel-bri_dht-walnut = "1.2.19"
+#PREFERRED_VERSION_libpri_dht-walnut = "1.2.4"
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