summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/.mtn2git_empty0
-rw-r--r--conf/distro/amsdelta-oe.conf3
-rw-r--r--conf/distro/angstrom-2007.1.conf409
-rw-r--r--conf/distro/angstrom-2008.1-legacy.conf (renamed from conf/distro/angstrom-2007.1-legacy.conf)2
-rw-r--r--conf/distro/angstrom-2008.1.conf207
-rw-r--r--conf/distro/asusoe.conf2
-rw-r--r--conf/distro/celinux-test.conf12
-rw-r--r--conf/distro/chinook-compat.conf238
-rw-r--r--conf/distro/colinuxoe.conf2
-rw-r--r--conf/distro/corecdp.conf43
-rw-r--r--conf/distro/ezx.conf82
-rw-r--r--conf/distro/foonas.conf9
-rw-r--r--conf/distro/generic-uclibc.conf25
-rw-r--r--conf/distro/generic.conf94
-rw-r--r--conf/distro/gmustix.conf5
-rw-r--r--conf/distro/include/.mtn2git_empty0
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc234
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc68
-rw-r--r--conf/distro/include/angstrom-eglibc.inc25
-rw-r--r--conf/distro/include/angstrom-glibc.inc27
-rw-r--r--conf/distro/include/angstrom-ldflags.inc26
-rw-r--r--conf/distro/include/angstrom-package-deb.inc4
-rw-r--r--conf/distro/include/angstrom-package-ipk.inc4
-rw-r--r--conf/distro/include/angstrom-package-rpm.inc1
-rw-r--r--conf/distro/include/angstrom-uclibc.inc29
-rw-r--r--conf/distro/include/angstrom-uclinux-uclibc.inc21
-rw-r--r--conf/distro/include/angstrom.inc180
-rw-r--r--conf/distro/include/angstromoabi.inc4
-rw-r--r--conf/distro/include/eglibc.inc20
-rw-r--r--conf/distro/include/fso-autorev.inc45
-rw-r--r--conf/distro/include/glibc-external.inc21
-rw-r--r--conf/distro/include/glibc-internal.inc21
-rw-r--r--conf/distro/include/glibc.inc20
-rw-r--r--conf/distro/include/insane-srcrevs.inc97
-rw-r--r--conf/distro/include/kaeilos-2009-preferred-versions.inc86
-rw-r--r--conf/distro/include/kaeilos.inc212
-rw-r--r--conf/distro/include/openmoko-srcdate-now.inc18
-rw-r--r--conf/distro/include/openmoko.inc142
-rw-r--r--conf/distro/include/oplinux.inc41
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.8.inc6
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2131
-rw-r--r--conf/distro/include/preferred-om-2009-versions.inc27
-rw-r--r--conf/distro/include/preferred-openmoko-versions.inc60
-rw-r--r--conf/distro/include/preferred-opie-cvs-versions.inc4
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3.inc4
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.4.inc (renamed from conf/distro/include/preferred-opie-versions-1.2.4-pre.inc)210
-rw-r--r--conf/distro/include/preferred-shr-versions.inc50
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc70
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.0.inc6
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.1.inc6
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.2.inc5
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.3.inc287
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc7
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4.inc262
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc126
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.5.inc291
-rw-r--r--conf/distro/include/preferred-xorg-versions-live.inc357
-rw-r--r--conf/distro/include/preferred-xorg-versions.inc226
-rw-r--r--conf/distro/include/sane-feed-deb.inc6
-rw-r--r--conf/distro/include/sane-feed-ipk.inc4
-rw-r--r--conf/distro/include/sane-feed.inc170
-rw-r--r--conf/distro/include/sane-srcdates.inc116
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc48
-rw-r--r--conf/distro/include/sane-srcrevs.inc417
-rw-r--r--conf/distro/include/sane-toolchain-eglibc.inc16
-rw-r--r--conf/distro/include/sane-toolchain-glibc.inc23
-rw-r--r--conf/distro/include/sane-toolchain-oabi.inc2
-rw-r--r--conf/distro/include/sane-toolchain-uclibc.inc35
-rw-r--r--conf/distro/include/sane-toolchain-uclinux-uclibc.inc20
-rw-r--r--conf/distro/include/sane-toolchain.inc205
-rw-r--r--conf/distro/include/shr-autorev.inc18
-rw-r--r--conf/distro/include/slugos.inc148
-rw-r--r--conf/distro/include/toolchain-external.inc6
-rw-r--r--conf/distro/include/toolchain-internal.inc6
-rw-r--r--conf/distro/include/uclibc.inc11
-rw-r--r--conf/distro/iphone-compat.conf19
-rw-r--r--conf/distro/jlime-2010.1.conf118
-rw-r--r--conf/distro/jlime-donkey.conf127
-rw-r--r--conf/distro/jlime-shrek.conf52
-rw-r--r--conf/distro/kaeilos.conf198
-rw-r--r--conf/distro/maemo-1.0.conf38
-rw-r--r--conf/distro/mamona.conf114
-rw-r--r--conf/distro/micro-uclibc.conf26
-rw-r--r--conf/distro/micro.conf107
-rw-r--r--conf/distro/minimal-uclibc.conf41
-rw-r--r--conf/distro/minimal.conf134
-rw-r--r--conf/distro/mokoslug.conf5
-rw-r--r--conf/distro/nylon.conf141
-rw-r--r--conf/distro/openmn.conf2
-rw-r--r--conf/distro/openmoko.conf95
-rw-r--r--conf/distro/openprotium.conf95
-rw-r--r--conf/distro/openwrt-sdk.conf33
-rw-r--r--conf/distro/oplinux-uclibc.conf6
-rw-r--r--conf/distro/oplinux.conf21
-rw-r--r--conf/distro/sharprom-compatible.conf21
-rw-r--r--conf/distro/shr.conf207
-rw-r--r--conf/distro/slugos.conf12
-rw-r--r--conf/distro/ucslugc.conf3
-rw-r--r--conf/distro/unslung.conf76
-rw-r--r--conf/distro/wrt54oe.conf5
100 files changed, 7652 insertions, 1909 deletions
diff --git a/conf/distro/.mtn2git_empty b/conf/distro/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/conf/distro/.mtn2git_empty
+++ /dev/null
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6d3ad7bd6b..7935672795 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -1,8 +1,7 @@
-DISTRO = "amsdelta-oe"
DISTRO_NAME = "AmsDelta Linux"
DISTRO_VERSION = "unstable-${DATE}"
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
deleted file mode 100644
index dee674abea..0000000000
--- a/conf/distro/angstrom-2007.1.conf
+++ /dev/null
@@ -1,409 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Angstrom <http://www.angstrom-distribution.org>
-#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@--------------------------------------------------------------------
-
-#DISTRO_VERSION = "2007.4"
-DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "46"
-
-require conf/distro/include/sane-srcdates.inc
-
-#Images built can have to modes:
-# 'debug': empty rootpassword, strace and gdb included
-# 'release' no root password, no strace and gdb by default
-DISTRO_TYPE ?= "debug"
-#DISTRO_TYPE = "release"
-
-# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
-# shipping some adhoc subset will be still useless and size burden for
-# users of all other languages/countries. Instead, worth to make it easy
-# to install additional languages: installer/wizard + metapackages which
-# will RRECOMMEND as much as possible content for a given language
-# (locales, UI transalations, help, etc. - useless for pros, but really
-# helpful for common users).
-# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
-IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
-
-#Set the right arch for the feeds
-#Alphabetically sorted
-
-FEED_ARCH ?= "${TARGET_ARCH}"
-
-#blackfin machines
-FEED_ARCH_bfin = "blackfin"
-
-#armv4t machines
-
-FEED_ARCH_acern30 = "armv4t"
-FEED_ARCH_amsdelta = "armv4t"
-FEED_ARCH_ep93xx = "armv4t"
-FEED_ARCH_eteng500 = "armv4t"
-FEED_ARCH_fic-gta01 = "armv4t"
-FEED_ARCH_fic-gta02 = "armv4t"
-FEED_ARCH_h1940 = "armv4t"
-FEED_ARCH_h6300 = "armv4t"
-FEED_ARCH_kb9202 = "armv4t"
-FEED_ARCH_ks8695 = "armv4t"
-FEED_ARCH_rx1950 = "armv4t"
-FEED_ARCH_rx3000 = "armv4t"
-FEED_ARCH_sarge-at91 = "armv4t"
-FEED_ARCH_smdk2440 = "armv4t"
-FEED_ARCH_smdk2443 = "armv4t"
-
-#armv5t machines
-
-FEED_ARCH_a1200 = "armv5te"
-FEED_ARCH_a780 = "armv5te"
-FEED_ARCH_akita = "armv5te"
-FEED_ARCH_asus620 = "armv5te"
-FEED_ARCH_asus730 = "armv5te"
-FEED_ARCH_at91sam9263ek = "armv5te"
-FEED_ARCH_aximx50 = "armv5te"
-FEED_ARCH_aximx50v = "armv5te"
-FEED_ARCH_c7x0 = "armv5te"
-FEED_ARCH_compulab-pxa270 = "armv5te"
-FEED_ARCH_devkitidp-pxa255 = "armv5te"
-FEED_ARCH_e680 = "armv5te"
-FEED_ARCH_er0100 = "armv5te"
-FEED_ARCH_gumstix = "armv5te"
-FEED_ARCH_h1910 = "armv5te"
-FEED_ARCH_h2200 = "armv5te"
-FEED_ARCH_h3900 = "armv5te"
-FEED_ARCH_h4000 = "armv5te"
-FEED_ARCH_h5000 = "armv5te"
-FEED_ARCH_htcalpine = "armv5te"
-FEED_ARCH_htcapache = "armv5te"
-FEED_ARCH_htcblueangel = "armv5te"
-FEED_ARCH_htchimalaya = "armv5te"
-FEED_ARCH_htcsable = "armv5te"
-FEED_ARCH_htctornado = "armv5te"
-FEED_ARCH_htcuniversal = "armv5te"
-FEED_ARCH_hx2000 = "armv5te"
-FEED_ARCH_hx4700 = "armv5te"
-FEED_ARCH_ixp4xxle = "armv5te"
-FEED_ARCH_logicpd-pxa270 = "armv5te"
-FEED_ARCH_looxc550 = "armv5te"
-FEED_ARCH_lsarm = "armv5te"
-FEED_ARCH_magician = "armv5te"
-FEED_ARCH_mainstone = "armv5te"
-FEED_ARCH_mnci = "armv5te"
-FEED_ARCH_mtx-3 = "armv5te"
-FEED_ARCH_mx21ads = "armv5te"
-FEED_ARCH_n2100 = "armv5te"
-FEED_ARCH_navman-icn330 = "armv5te"
-FEED_ARCH_netbook-pro = "armv5te"
-FEED_ARCH_nokia770 = "armv5te"
-FEED_ARCH_rokre2 = "armv5te"
-FEED_ARCH_nslu2le = "armv5te"
-FEED_ARCH_omap1510inn = "armv5te"
-FEED_ARCH_omap1610h2 = "armv5te"
-FEED_ARCH_omap1710h3 = "armv5te"
-FEED_ARCH_omap5912osk = "armv5te"
-FEED_ARCH_palmld = "armv5te"
-FEED_ARCH_palmt650 = "armv5te"
-FEED_ARCH_palmt680 = "armv5te"
-FEED_ARCH_palmtc = "armv5te"
-FEED_ARCH_palmtt = "armv5te"
-FEED_ARCH_palmtt3 = "armv5te"
-FEED_ARCH_palmtt5 = "armv5te"
-FEED_ARCH_palmtx = "armv5te"
-FEED_ARCH_palmz31 = "armv5te"
-FEED_ARCH_palmz71 = "armv5te"
-FEED_ARCH_palmz72 = "armv5te"
-FEED_ARCH_poodle = "armv5te"
-FEED_ARCH_qemuarm = "armv5te"
-FEED_ARCH_spitz = "armv5te"
-FEED_ARCH_tosa = "armv5te"
-FEED_ARCH_triton = "armv5te"
-
-FEED_ARCH_ixp4xxbe = "armv5teb"
-FEED_ARCH_nslu2be = "armv5teb"
-
-#i486 machines
-FEED_ARCH_geodegx = "i486"
-FEED_ARCH_geodelx = "i486"
-FEED_ARCH_netvista = "i486"
-FEED_ARCH_wrap = "i486"
-FEED_ARCH_x86 = "i486"
-
-#i586 machines
-FEED_ARCH_epia = "i586"
-FEED_ARCH_i586-generic = "i586"
-FEED_ARCH_qemux86 = "i586"
-
-#i686 machines
-
-FEED_ARCH_alix = "i686"
-FEED_ARCH_colinux = "i686"
-FEED_ARCH_guinness = "i686"
-FEED_ARCH_i686-generic = "i686"
-FEED_ARCH_progear = "i686"
-
-#powerpc machines
-
-FEED_ARCH_dht-walnut = "ppc405"
-FEED_ARCH_magicbox = "ppc405"
-FEED_ARCH_xilinx-ml403 = "ppc405"
-FEED_ARCH_xilinx-ml410 = "ppc405"
-FEED_ARCH_sequoia = "ppc440e"
-FEED_ARCH_efika = "ppc603e"
-FEED_ARCH_lite5200 = "ppc603e"
-FEED_ARCH_lsppchd = "ppc603e"
-FEED_ARCH_lsppchg = "ppc603e"
-FEED_ARCH_storcenter = "ppc603e"
-FEED_ARCH_turbostation = "ppc603e"
-
-
-#strongarm machines, no EABI
-
-FEED_ARCH_collie = "arm-oabi"
-FEED_ARCH_h3600 = "arm-oabi"
-FEED_ARCH_h3800 = "arm-oabi"
-FEED_ARCH_htcwallaby = "arm-oabi"
-FEED_ARCH_jornada56x = "arm-oabi"
-FEED_ARCH_jornada7xx = "arm-oabi"
-FEED_ARCH_shark = "arm-oabi"
-FEED_ARCH_simpad = "arm-oabi"
-
-
-#Tweak packaging for strongarm machines since they can't use EABI
-
-PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
-
-FEED_URIS += " \
- no-arch##${ANGSTROM_URI}/unstable/feed/all \
- base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
- perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
- python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
- debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
- gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
- ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
-# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
-# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
-# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
-
-#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
-CVS_TARBALL_STASH ?= "\
- http://www.angstrom-distribution.org/unstable/sources/ \
- http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
- "
-
-
-# We will lock down a SRCDATE when we go into release mode
-#SRCDATE = "20070703"
-
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-PCMCIA_MANAGER = "pcmciautils"
-
-#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12"
-RDEPENDS_kernel-base_hx4700 = ""
-RDEPENDS_kernel-base_htcuniversal = ""
-
-PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
-
-# Needed for crappy ipaqs with broken hostap in the kernel
-PREFERRED_VERSION_hostap-modules ?= "0.4.7"
-PREFERRED_VERSION_hostap-utils ?= "0.4.7"
-
-PREFERRED_VERSION_file = "4.18"
-PREFERRED_VERSION_file_native = "4.18"
-
-PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.4"
-PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.10"
-PREFERRED_VERSION_glib-2.0 = "2.12.12"
-PREFERRED_VERSION_pango = "1.16.4"
-PREFERRED_VERSION_atk = "1.10.3"
-PREFERRED_VERSION_gtk+ = "2.10.14"
-
-# newer poppler cvs breaks some apps, fix until popper 6 and apps
-# catch up with api changes
-# PREFERRED_VERSION_poppler = "0.5.4"
-
-# older gtk-webcore releases don't work on ARM/EABI
-# We need to switch to a fixed SRCDATE or release as soon as possible
-PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
-PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
-
-#Small machines prefer kdrive, but we might ship full Xorg in other images
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-
-PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
-PREFERRED_VERSION_libxrandr ?= "1.2.1"
-PREFERRED_VERSION_xrandr ?= "1.2.0"
-PREFERRED_VERSION_randrproto ?= "1.2.1"
-
-PREFERRED_VERSION_libgnomeui = "2.18.1"
-PREFERRED_VERSION_prismstumbler = "0.7.3"
-
-#use EABI ready toolchain
-PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
-
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
-
-#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
-PREFERRED_VERSION_avr32-gcc = "4.1.2"
-PREFERRED_VERSION_avr32-gcc-cross = "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
-
-PREFERRED_VERSION_binutils_avr32 = "2.17"
-PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
-PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
-
-#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
-PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21"
-
-#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
-
-#there's is no avr32 patch for 0.9.29
-PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
-PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
-
-PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-
-PREFERRED_VERSION_glibc-initial ?= "2.5"
-
-# To use an EABI compatible version 3 series gcc, either uncomment
-# the lines below or set them in local.conf:
-#
-# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
-
-
-# Busybox <1.1.0 doesn't have EABI support
-PREFERRED_VERSION_busybox = "1.2.1"
-
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
-
-PREFERRED_VERSION_wpa-supplicant = "0.5.5"
-
-
-#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions.inc
-
-
-# Virtuals:
-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"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-
-# Others:
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_esound ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp ?= "ntp"
-PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_libxss = "libxss"
-
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+ ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
-
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-require conf/distro/include/angstrom${ARM_ABI}.inc
-
-# do some task-base stuff here
-
-# We want to ship extra debug utils in the rootfs when doing a debug build
-DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
-
-#this should go away soon
-EXTRA_STUFF ?= ""
-
-
-# Angstrom want to ship some extra stuff. This should be moved into task-base eventually
-# contains ipkg specific stuff as well :(
-DISTRO_EXTRA_RDEPENDS += "\
- update-modules \
- ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
- angstrom-version \
- ipkg ipkg-collateral \
- util-linux-mount util-linux-umount \
- avahi-daemon \
- avahi-autoipd \
- ${EXTRA_STUFF} \
- ${DEBUG_APPS} \
- "
-
-DISTRO_EXTRA_RRECOMMENDS += " \
- kernel-module-vfat \
- kernel-module-ext2 \
- kernel-module-af-packet \
- "
diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2008.1-legacy.conf
index 298c8589e3..358ed06cf2 100644
--- a/conf/distro/angstrom-2007.1-legacy.conf
+++ b/conf/distro/angstrom-2008.1-legacy.conf
@@ -4,6 +4,6 @@
# * no sysfs
# * no EABI for ARM
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
# We'll have to fill this in as we go.
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7fc656fb5e..85d6f3f48a 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -2,35 +2,200 @@
#@TYPE: Distribution
#@NAME: Angstrom <http://www.angstrom-distribution.org>
#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
+#@MAINTAINER: Graeme 'XorA' Gregory <dp@xora.org.uk>
+#@MAINTAINER: Koen Kooi <koen@openembedded.org>
+#@MAINTAINER: Philip 'Crofton' Balister <philip@balister.org>
#@--------------------------------------------------------------------
-# This is a testbed for unstable and/or untested things, while angstrom-2007.1
-# is aiming for stability and a release.
-# Use this at your own risk, we welcome bugreports filed at
-# http://bugs.openembedded.org
-# In doubt, use DISTRO="angstrom-2007.1"
+# This is a aimed to be the next stable angstrom release.
+# If you want something stable *right now*, use angstrom-2008.1
+# with the stable/2009 branch
+#
+# Use this at your own risk, we welcome bugreports sent to
+# angstrom-distro-devel@linuxtogo.org
+#
+# For more contact info please visit
+# http://www.angstrom-distribution.org/contact
+#
+# Again, in doubt, use DISTRO="angstrom-2008.1" with the
+# stable/2009 branch
-require conf/distro/angstrom-2007.1.conf
+#DISTRO_VERSION = "2009.X"
+DISTRO_VERSION = "2009.X-test-${DATE}"
+DISTRO_REVISION = "3"
+DISTRO_PR = ".5"
-#DISTRO_VERSION = "2008.1"
-DISTRO_VERSION = "2008.1-test-${DATE}"
-DISTRO_REVISION = "0"
+OLDEST_KERNEL ?= "2.6.16"
-PREFERRED_VERSION_gcc ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross ?= "4.2.1"
+#build staging from packages
+INHERIT += "packaged-staging"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/angstrom-2008-preferred-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+
+#Images built can have to modes:
+# 'debug': empty rootpassword, strace included
+# 'release' no root password, no strace and gdb by default
+DISTRO_TYPE ?= "debug"
+#DISTRO_TYPE = "release"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
+# shipping some adhoc subset will be still useless and size burden for
+# users of all other languages/countries. Instead, worth to make it easy
+# to install additional languages: installer/wizard + metapackages which
+# will RRECOMMEND as much as possible content for a given language
+# (locales, UI transalations, help, etc. - useless for pros, but really
+# helpful for common users).
+# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
+IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
+
+
+# set feed path variables
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+
+
+#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
+CVS_TARBALL_STASH ?= "\
+ http://www.angstrom-distribution.org/unstable/sources/ \
+ "
+
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+PCMCIA_MANAGER = "pcmciautils"
+
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
+
+#Initramfs for kernels
+#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/"
+#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
+
+#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
+PREFERRED_VERSION_glibc ?= "2.9"
+PREFERRED_VERSION_glibc-initial ?= "2.9"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
+
+#powerpc needs additional patches to gcc
+ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+
+# Blackfin has its on gcc
+ANGSTROM_GCC_VERSION_bfin = "4.1.2"
+
+# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
+#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
+KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
+
+#avr32 only has support for gcc 4.2.2
+ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
+
+#armv4 needs at least gcc 4.4.2 for eabi
+ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2"
+
+#Everybody else can just use this:
+ANGSTROM_GCC_VERSION ?= "4.3.3"
+
+ANGSTROM_BINUTILS_VERSION ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20"
+ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7"
+
+PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk ?= "${ANGSTROM_BINUTILS_VERSION}"
+
+PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
+
+#avr32 only has patches for binutils 2.17 in OE
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+
+# Toolchain virtuals:
+require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
+
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+PREFERRED_PROVIDER_hotplug = "udev"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl"
+
+ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
+
+ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough"
+
+require conf/distro/include/angstrom.inc
+
+# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
+# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
+IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+
+# Select xserver-xorg as default, since kdrive has been EOL'ed
+XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
+
+# do some task-base stuff here
+
+# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
+# bluez 3.x
+DISTRO_BLUETOOTH_MANAGER = "\
+ blueprobe \
+ bluez4 \
+ "
+
+# We want to ship extra debug utils in the rootfs when doing a debug build
+DEBUG_APPS ?= ""
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
-#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.6"
-PREFERRED_VERSION_glibc-intermediate ?= "2.6"
-PREFERRED_VERSION_glibc-initial ?= "2.6"
+# This hooks into task-base, so it won't do anything if your images doesn't include task-base.
+# angstrom-version: ship this to have an identifiable rootfs so user can report bugs against a specific version
+# ANGSTROM_FEED_CONFIGS: configfiles for the online feeds
+# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken
+# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink
+DISTRO_EXTRA_RDEPENDS += "\
+ angstrom-version \
+ ${ANGSTROM_FEED_CONFIGS} \
+ util-linux-ng-mount util-linux-ng-umount \
+ angstrom-libc-fixup-hack \
+ "
+# This also hooks into task-base, but isn't mandatory.
+# If you don't want parts of this in your task-base using images you can put this in the image recipe:
+# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd"
+# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass, not angstrom
+# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
+# avahi: makes finding your device on the network a lot easier
+# openssh-sftp-server: provides sftp which combined with avahi makes it real easy to use things like sshfs
+# psplash-angstrom: angstrom branded psplash, you can add your own psplash-foo to an image, it uses update-alternatives
+# DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier
+DISTRO_EXTRA_RRECOMMENDS += " \
+ kernel-module-vfat \
+ kernel-module-ext2 \
+ kernel-module-ext3 \
+ kernel-module-af-packet \
+ avahi-daemon \
+ avahi-autoipd \
+ openssh-sftp-server \
+ ${DEBUG_APPS} \
+"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+ARM_INSTRUCTION_SET_pn-uclibc = "arm"
+ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"
diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf
index 35be6a4fab..efc4efccd4 100644
--- a/conf/distro/asusoe.conf
+++ b/conf/distro/asusoe.conf
@@ -7,6 +7,8 @@ DISTRO_VERSION = "0.1-alpha"
TARGET_OS = "linux-uclibc"
TARGET_SYS = "${TARGET_ARCH}-uclibc"
+LIBC = "uclibc"
+require conf/distro/include/${LIBC}.inc
CROSS_DIR = "/opt/brcm/hndtools-mipsel-uclibc"
diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf
index 03dcd22d79..fbc96e19bf 100644
--- a/conf/distro/celinux-test.conf
+++ b/conf/distro/celinux-test.conf
@@ -11,9 +11,6 @@
# we want IPKG packages and Debian style naming
INHERIT += " package_ipk debian"
-# enable if build for many machines
-#INHERIT += " multimachine"
-
# we want images supporting the following features (for task-base)
DISTRO_FEATURES = "nfs pcmcia usbhost"
@@ -38,10 +35,10 @@ SRCDATE ?= "20060927"
# toolchain
#
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
PREFERRED_VERSION_binutils = "2.16"
PREFERRED_VERSION_binutils-cross = "2.16"
@@ -49,13 +46,12 @@ PREFERRED_VERSION_binutils-cross = "2.16"
PREFERRED_VERSION_gcc = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4"
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-# glibc provides iconv and intl
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
#
# omap5912osk settings
#
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
new file mode 100644
index 0000000000..448931b8bf
--- /dev/null
+++ b/conf/distro/chinook-compat.conf
@@ -0,0 +1,238 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Chinook-compatible
+#@DESCRIPTION: Distribution which allows building packages compatible to OS 2008
+#@--------------------------------------------------------------------
+
+# Note: This is not a complete distribution. Just some definitions to make
+# it possible to build packages that are compatible to Nokia's OS2008.
+# You should *not* replace core libraries of the operating system (glibc,
+# glib, gtk+, ..) with those you build in OE.
+#
+# Furthermore it may be possible that OpenEmbedded lacks specific versions
+# of some packages. If you encounter such a problem please provide a recipe
+# or file a bug!
+
+DISTRO_NAME = "Chinook-compat"
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+# Needed for e.g. libffi builds on armv6
+OVERRIDES .= ":${FEED_ARCH}"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+LIBC = "glibc"
+require conf/distro/include/angstrom-glibc.inc
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
+
+INHERIT += "package_deb debian"
+TARGET_OS = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_nokia800 = "hard"
+
+DPKG_ARCH_nokia770 = "armel"
+DPKG_ARCH_nokia800 = "armel"
+
+FEED_ARCH_nokia770 = "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet.
+FEED_ARCH_nokia800 = "armv5te"
+#FEED_ARCH_nokia800 = "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_util-linux = "util-linux"
+
+
+PREFERRED_VERSION_automake-native = "1.9.6"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+PREFERRED_VERSION_gcc-cross-intermediate = "4.1.1"
+
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+
+# Use recent enough version of the headers to let HAL build successfully.
+PREFERRED_VERSION_linux-libc-headers = "2.6.20"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-initial = "2.5"
+
+PREFERRED_VERSION_libtool-native = "1.5.10"
+PREFERRED_VERSION_libtool-cross = "1.5.10"
+PREFERRED_VERSION_libtool = "1.5.6"
+
+require conf/distro/include/sane-srcrevs.inc
+
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_freetype = "2.2.1"
+PREFERRED_VERSION_freetype-native = "2.2.1"
+PREFERRED_VERSION_cairo = "1.4.10"
+PREFERRED_VERSION_glib-2.0 = "2.12.12"
+PREFERRED_VERSION_pango = "1.16.4"
+PREFERRED_VERSION_atk = "1.18.0"
+PREFERRED_VERSION_gtk+ = "2.10.14"
+PREFERRED_VERSION_libpng = "1.2.12"
+PREFERRED_VERSION_expat = "1.95.7"
+
+# only dbus-glib 0.74 works with older dbus 1.0.x
+PREFERRED_VERSION_dbus = "1.0.3"
+PREFERRED_VERSION_dbus-glib = "0.74"
+
+PREFERRED_VERSION_gnome-vfs = "2.22.0"
+
+# 3.9.1 would be correct
+PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2"
+PREFERRED_VERSION_libxml2 = "2.7.2"
+# 2.16 would be correct
+PREFERRED_VERSION_gconf = "2.6.1"
+
+# gstreamer
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gstreamer = "0.10.17"
+PREFERRED_VERSION_gst-plugins-good = "0.10.6"
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gst-plugins-base = "0.10.14"
+# 0.11.3 would be correct ( + maemo patches)
+PREFERRED_VERSION_gst-ffmpeg = "0.10.2"
+
+PREFERRED_VERSION_bluez-libs = "3.33"
+
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+# This is a hack to avoid building mesa which crashes the compiler
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
+PREFERRED_VERSION_libsdl-directfb = "1.2.11"
+PREFERRED_VERSION_libsdl-image = "1.2.3"
+PREFERRED_VERSION_libsdl-mixer = "1.2.6"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+PREFERRED_VERSION_libxrandr = "1.2.1"
+PREFERRED_VERSION_xrandr = "1.2.0"
+PREFERRED_VERSION_randrproto = "1.2.1"
+PREFERRED_VERSION_libx11 = "1.1.5"
+
+PREFERRED_VERSION_libgnomeui = "2.18.1"
+
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+"
+
+PREFERRED_PROVIDER_gconf = "gconf-dbus"
+
+PREFERRED_VERSION_pixman = "0.9.6"
+
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
+PREFERRED_PROVIDER_avahi = "avahi"
+
+PREFERRED_VERSION_avahi = "0.6.20"
+
+PREFERRED_VERSION_libsoup = "2.2.7"
+PREFERRED_VERSION_libglade = "2.4.2"
+PREFERRED_VERSION_gnutls = "1.4.5"
+PREFERRED_VERSION_libgpg-error = "1.4"
+PREFERRED_VERSION_libgcrypt = "1.4.0"
+
+PREFERRED_VERSION_gpe-scap = "1.3"
+
+# various Maemo4 specific libraries
+PREFERRED_VERSION_mce-dev = "1.6.3"
+PREFERRED_VERSION_libosso = "2.13"
+PREFERRED_VERSION_libhildon = "1.99.0"
+PREFERRED_VERSION_libhildonmime = "1.10.0"
+PREFERRED_VERSION_libhildonfm = "1.9.46"
+PREFERRED_VERSION_hildon-thumbnail = "0.14"
+PREFERRED_VERSION_osso-gwconnect = "1.0.12"
+PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
+
+PREFERRED_VERSION_shared-mime-info = "0.22"
+
+# Java stuff
+PREFERRED_PROVIDER_midpath = "midpath-maemo"
+PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
+
+# Need jamvm-initial since cacao 0.98 seems to get miscompiled with newer GCCs.
+PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial"
+
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_VERSION_classpath = "0.98"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4"
+
+# Does not build with later versions
+PREFERRED_VERSION_fakeroot-native = "1.9.6"
+
+# newer Versions needs newer autotools we cant relay on
+PREFERRED_VERSION_guile-native = "1.8.2"
+
+# WARNING: If you change these values after the respective package has
+# been built the change will have no effect. Edit the package's file in
+# ${STAGING}/pkgdata/runtime then.
+PKG_ncurses = "libncurses5"
+PKG_ncurses-tools = "ncurses-bin"
+PKG_ncurses-terminfo = "ncurses-base"
+
+PKG_gtk+ = "libgtk2.0-0"
+PKG_pango = "libpango1.0-0"
+PKG_atk = "libatk1.0-0"
+PKG_glib-2.0 = "libglib2.0-0"
+PKG_gconf = "libgconf2-6"
+DEBIANNAME_dbus_pn-dbus = "dbus"
+PKG_libhildon = "libhildon1"
+DEBIANNAME_eds-dbus_pn-libedataserver-1.2 = "libedataserver"
+
+PKG_zlib = "zlib1g"
+PKG_libglade = "libglade2-0"
+PKG_libsoup = "libsoup2.2-8"
+
+PKG_libsdl-mixer = "libsdl-mixer1.2"
+PKG_libsdl-image = "libsdl-image1.2"
+PKG_libsdl-directfb = "libsdl1.2"
+PKG_libsdl-ttf = "libsdl-ttf2.0-0"
+PKG_libsdl-gfx = "libsdl-gfx1.2-4"
+
+PKG_bluez-libs = "libbluetooth2"
+
+PKG_osso-ic-oss = "osso-ic"
+PKG_libconic = "libconic0"
+
+PKG_libgcc = "libgcc1"
diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf
index 7454c0167f..25ea04a1f5 100644
--- a/conf/distro/colinuxoe.conf
+++ b/conf/distro/colinuxoe.conf
@@ -2,6 +2,8 @@
#@NAME: coLinuxoe
#@DESCRIPTION: Generic OE built distro for the coLinux MACHINE
+TARGET_OS = "linux"
+
INHERIT += "package_ipk debian"
# MACHINE decides that linux-colinux is the correct kernel.
diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf
new file mode 100644
index 0000000000..39ca74a170
--- /dev/null
+++ b/conf/distro/corecdp.conf
@@ -0,0 +1,43 @@
+#@TYPE: Distribution
+#@NAME: CoreCDP <http://www.multitech.net>
+#@DESCRIPTION: CoreCDP Linux Distribution for the MTCDP Cellular Development Platform
+#@MAINTAINER: Multi-Tech Systems <oe-devel@multitech.net>
+
+# Angstrom-based distribution by Multi-Tech Systems, Inc.
+require conf/distro/angstrom-2008.1.conf
+
+# allow use of amend.inc files in FILESPATH to add to existing recipes
+require conf/amend-recipes.inc
+
+DISTRO_NAME = "CoreCDP"
+DISTRO = "corecdp"
+DISTRO_VERSION = "1.1.1"
+DISTRO_TYPE = "release"
+TARGET_VENDOR = "-corecdp"
+BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}"
+
+# Add Multi-Tech mirror for source download as a backup
+INHERIT += "corecdp-mirrors"
+
+IPKG_VARIANT = "opkg-nogpg-nocurl corecdp-version"
+
+# use busybox instead of tinylogin
+IMAGE_LOGIN_MANAGER = "busybox"
+
+DEFAULT_TIMEZONE = "America/Chicago"
+
+# Java versions that work together
+# initial verions
+PREFERRED_VERSION_jamvm-initial ?= "1.4.5"
+PREFERRED_VERSION_classpath-initial ?= "0.93"
+
+# native versions
+PREFERRED_VERSION_jamvm-native ?= "1.5.3"
+PREFERRED_VERSION_classpath-native ?= "0.98"
+
+# target device
+PREFERRED_VERSION_jamvm ?= "1.5.2"
+PREFERRED_VERSION_classpath ?= "0.98"
+
+# don't build bluez4 and the large amount of deps just for libpcap
+PREFERRED_PROVIDER_libpcap = "libpcap-nobluetooth"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
deleted file mode 100644
index 5b12b6f93b..0000000000
--- a/conf/distro/ezx.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: EZX <http://www.openezx.org>
-#@DESCRIPTION: A Linux Distribution for Motorola GSM phones
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@--------------------------------------------------------------------
-
-DISTRO_NAME = "OpenEZX"
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
-
-INHERIT += " package_ipk debian"
-
-# libc setting:
-# specify whether you want a glibc or uclibc based distribution
-#TARGET_OS = "linux-uclibc"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-#FEED_URIS += " \
-# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-SRCDATE ?= "20060507"
-
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# fix some iconv issues, needs to be commented out when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Base
-#
-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"
-
-# ezx-kernel has problems with newer g++ atm.
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-
-#
-# Utilities
-#
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 234c92f62a..57d73a0a2a 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -6,11 +6,11 @@
#@MAINTAINER: Øyvind Repvik <repvik@foonas.org>
#@--------------------------------------------------------------------
-FOONAS_MODE ?= "glibc"
-ANGSTROM_MODE = ${FOONAS_MODE}
-require conf/distro/angstrom-2007.1.conf
+LIBC ?= "glibc"
+FOONAS_MODE ?= "${LIBC}"
+ANGSTROMLIBC = "${LIBC}"
+require conf/distro/angstrom-2008.1.conf
-DISTRO = "foonas"
DISTRO_NAME = "foonas"
DISTRO_VERSION = "1.0-dev"
DISTRO_REVISION = "1"
@@ -21,7 +21,6 @@ DISTRO_FEATURES_n2100 += "raid"
DISTRO_FEATURES_storcenter += "raid"
DISTRO_FEATURES_lsppchd += "raid"
DISTRO_FEATURES_lsppchg += "raid"
-DISTRO_FEATURES_lsarm += "raid"
# This isn't actually in OE yet
#DISTRO_EXTRA_RDEPENDS = "openlink-machine"
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
deleted file mode 100644
index b77b3e9c87..0000000000
--- a/conf/distro/generic-uclibc.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Generic uClibC
-#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration
-#
-#@COMMENT: This distribution configuration serves as a starting point for
-#@COMMENT: the integration of new target platforms, machines, or distributions.
-#@COMMENT: It bases on conservative settings and should always be buildable.
-#-----------------------------------------------------------------------------
-
-require conf/distro/generic.conf
-
-#
-# Header
-#
-DISTRO_NAME = "generic-uClibC"
-
-#
-# Target OS & FPU system
-#
-TARGET_OS = "linux-uclibc"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
-PREFERRED_PROVIDER_virtual/libintl = "libintl"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
deleted file mode 100644
index a9d667372f..0000000000
--- a/conf/distro/generic.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Generic
-#@DESCRIPTION: Generic Embedded Linux Distribution Configuration
-#
-#@COMMENT: This distribution configuration serves as a starting point for
-#@COMMENT: the integration of new target platforms, machines, or distributions.
-#@COMMENT: It bases on conservative settings and should always be buildable.
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "generic-glibc"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
-#DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
-
-#
-# Naming schemes
-#
-INHERIT += "debian multimachine"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2"
-
-#
-# 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.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-
-#
-# 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
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc
diff --git a/conf/distro/gmustix.conf b/conf/distro/gmustix.conf
index b359c926b0..17f805617a 100644
--- a/conf/distro/gmustix.conf
+++ b/conf/distro/gmustix.conf
@@ -3,18 +3,21 @@
#@DESCRIPTION: Gumstix distribution for GMU (George Mason University)
INHERIT += "package_tar package_ipk"
+LIBC = "uclibc"
+require conf/distro/include/${LIBC}.inc
TARGET_OS = "linux-uclibc"
TARGET_FPU = "soft"
IMAGE_FSTYPES = "jffs2"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:uclibc"
PREFERRED_PROVIDER_classpath = "classpath-minimal"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
PREFERRED_VERSION_gcc = "3.4.4"
diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/conf/distro/include/.mtn2git_empty
+++ /dev/null
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
new file mode 100644
index 0000000000..6741bae3e1
--- /dev/null
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -0,0 +1,234 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Angstrom <http://www.angstrom-distribution.org>
+#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
+#@MAINTAINER: Koen Kooi <koen@openembedded.org>
+#@--------------------------------------------------------------------
+
+DISTRO_VERSION = "2007.11RC3"
+DISTRO_REVISION = "51"
+
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#Images built can have to modes:
+# 'debug': empty rootpassword, strace included
+# 'release' no root password, no strace and gdb by default
+DISTRO_TYPE ?= "debug"
+#DISTRO_TYPE = "release"
+
+# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
+# shipping some adhoc subset will be still useless and size burden for
+# users of all other languages/countries. Instead, worth to make it easy
+# to install additional languages: installer/wizard + metapackages which
+# will RRECOMMEND as much as possible content for a given language
+# (locales, UI transalations, help, etc. - useless for pros, but really
+# helpful for common users).
+# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
+IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
+
+# set feed path variables
+FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+
+
+#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
+CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+PCMCIA_MANAGER = "pcmciautils"
+
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
+RDEPENDS_kernel-base_hx4700 = ""
+RDEPENDS_kernel-base_htcuniversal = ""
+
+PREFERRED_PROVIDER_libgsmd = "libgsmd"
+
+# older gtk-webcore releases don't work on ARM/EABI
+# We need to switch to a fixed SRCDATE or release as soon as possible
+PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
+PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
+
+PREFERRED_PROVIDER_avahi = "avahi"
+
+#Small machines prefer kdrive, but we might ship full Xorg in other images
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+
+#use EABI ready toolchain
+PREFERRED_VERSION_gcc ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2"
+
+PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-intermediate_dht-walnut ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-intermediate_xilinx-ml403 ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-intermediate_mpc8323e-rdb ?= "4.1.1"
+
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
+
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
+PREFERRED_VERSION_avr32-gcc = "4.1.2"
+PREFERRED_VERSION_avr32-gcc-cross = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
+PREFERRED_VERSION_gcc-cross-intermediate_avr32 = "4.0.2"
+
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
+PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21"
+
+#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
+PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
+
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
+
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+
+# To use an EABI compatible version 3 series gcc, either uncomment
+# the lines below or set them in local.conf:
+#
+# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
+# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+# PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4+csl-arm-2005q3"
+
+#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/preferred-xorg-versions.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-e-versions.inc
+
+
+# Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+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/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc"
+
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-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"
+PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
+
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+
+# Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+PREFERRED_PROVIDER_esound ?= "pulseaudio"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_tslib-conf ?= "tslib"
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp ?= "ntp"
+PREFERRED_PROVIDER_hotplug = "udev"
+PREFERRED_PROVIDER_libxss = "libxss"
+
+# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+
+
+#Silence a warning during parsing
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
+
+# do some task-base stuff here
+
+# We want to ship extra debug utils in the rootfs when doing a debug build
+DEBUG_APPS ?= ""
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
+
+#this should go away soon
+EXTRA_STUFF ?= ""
+
+
+# Angstrom want to ship some extra stuff. This should be moved into task-base eventually
+# contains ipkg specific stuff as well :(
+
+#work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails
+DISTRO_EXTRA_DEPENDS += " \
+ mtd-utils-native \
+ "
+
+DISTRO_EXTRA_RDEPENDS += "\
+ update-modules \
+# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \
+ angstrom-version \
+ opkg opkg-collateral distro-feed-configs \
+ util-linux-mount util-linux-umount \
+ ${EXTRA_STUFF} \
+ ${DEBUG_APPS} \
+ "
+
+DISTRO_EXTRA_RRECOMMENDS += " \
+ kernel-module-vfat \
+ kernel-module-ext2 \
+ kernel-module-af-packet \
+ openssh-sftp-server \
+ "
+
+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
new file mode 100644
index 0000000000..18df733fa1
--- /dev/null
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -0,0 +1,68 @@
+ANGSTROM_QT_VERSION ?= "4.6.0"
+
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_automake-native = "1.10.2"
+PREFERRED_VERSION_busybox = "1.13.2"
+PREFERRED_VERSION_cairo = "1.8.8"
+PREFERRED_VERSION_dbus = "1.2.3"
+PREFERRED_VERSION_dropbear = "0.51"
+PREFERRED_VERSION_fontconfig = "2.6.0"
+PREFERRED_VERSION_glib-2.0 = "2.22.1"
+PREFERRED_VERSION_glib-2.0-native = "2.22.1"
+PREFERRED_VERSION_glibmm = "2.22.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gtk+ = "2.18.3"
+PREFERRED_VERSION_gtkmm = "2.18.1"
+PREFERRED_VERSION_hal = "0.5.13"
+PREFERRED_VERSION_libgemwidget = "1.0"
+PREFERRED_VERSION_libgpephone = "0.4"
+PREFERRED_VERSION_libsdl-x11 = "1.2.14"
+PREFERRED_VERSION_libtool = "2.2.6a"
+PREFERRED_VERSION_libtool-native = "2.2.6a"
+PREFERRED_VERSION_libtool-cross = "2.2.6a"
+PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
+PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165"
+PREFERRED_VERSION_pango = "1.24.4"
+#PREFERRED_VERSION_pixman = "0.13.2"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.15"
+PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+PREFERRED_VERSION_samba = "3.3.9"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+
+PREFERRED_VERSION_udev = "141"
+UDEV_GE_141 = "1"
+
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
+
+
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index dc3929c3a7..6a1f93bfb6 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,32 +1,29 @@
# eglibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
-PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
+require conf/distro/include/eglibc.inc
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
+ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used"
+TARGET_OS = "linux"
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
-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']]}"
+#TARGET_OS = "linux-gnuspe"
#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"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3"
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-BUILD_OPTIMIZATION = "-Os"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
BUILD_OPTIMIZATION_pn-perl = "-O1"
BUILD_OPTIMIZATION_sparc = "-O2"
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
+
CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 957042d7e4..298e250362 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -1,22 +1,31 @@
# glibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc ?= "glibc"
+require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc
-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']]}"
+ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used"
+
+TARGET_OS = "linux"
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
#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"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3"
+
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
+
+# This is only used for -native packages
+BUILD_OPTIMIZATION = "-O2 -g"
+BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g"
+
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
-BUILD_OPTIMIZATION = "-Os"
-BUILD_OPTIMIZATION_pn-perl = "-O1"
-BUILD_OPTIMIZATION_sparc = "-O2"
+# Disable -Wl,as-needed for now till all the test come back OK
+#require conf/distro/include/angstrom-ldflags.inc
CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/conf/distro/include/angstrom-ldflags.inc b/conf/distro/include/angstrom-ldflags.inc
new file mode 100644
index 0000000000..6c60568798
--- /dev/null
+++ b/conf/distro/include/angstrom-ldflags.inc
@@ -0,0 +1,26 @@
+
+# Set as-need to an intermediate var...
+ASNEEDED = "-Wl,--as-needed"
+
+# ...so we can blacklist it for recipes that break with it
+ASNEEDED_pn-console-tools = ""
+ASNEEDED_pn-distcc = ""
+ASNEEDED_pn-openobex = ""
+ASNEEDED_pn-icu = ""
+ASNEEDED_pn-xserver-kdrive-xomap = ""
+ASNEEDED_pn-minimo = ""
+ASNEEDED_pn-pciutils = ""
+ASNEEDED_pn-puzzles = ""
+ASNEEDED_pn-dialer = ""
+ASNEEDED_pn-pulseaudio = ""
+ASNEEDED_pn-python = ""
+ASNEEDED_pn-libproxy = ""
+ASNEEDED_pn-libxsettings-client = ""
+ASNEEDED_pn-libmatchbox = ""
+ASNEEDED_pn-faac = ""
+ASNEEDED_pn-wireless-tools = ""
+ASNEEDED_pn-ffmpeg = ""
+
+# Append it to TARGET_LDLFLAGS
+TARGET_LDFLAGS += "${ASNEEDED}"
+
diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
new file mode 100644
index 0000000000..e060bb1ccf
--- /dev/null
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -0,0 +1,4 @@
+INHERIT += "package_deb"
+
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc
new file mode 100644
index 0000000000..14206bda2d
--- /dev/null
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -0,0 +1,4 @@
+INHERIT += "package_ipk"
+
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/angstrom-package-rpm.inc b/conf/distro/include/angstrom-package-rpm.inc
new file mode 100644
index 0000000000..86bef129d0
--- /dev/null
+++ b/conf/distro/include/angstrom-package-rpm.inc
@@ -0,0 +1 @@
+INHERIT += "package_rpm"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 59d40957d5..4ca68389f7 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -1,18 +1,33 @@
# uclibc:
-#fix some iconv issues, needs to be adjusted when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libc = "uclibc"
-PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
-PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+require conf/distro/include/uclibc.inc
+
+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"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
-TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
#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
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-BUILD_OPTIMIZATION = "-Os"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
+
+#Gcc will die with 'internal consistency error when using the above optimizations
+#with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
+#However, some packages require optimizations to compile (e.g. libmad).
+#It appears the guilty optimization is "-frename-registers", leaving that one
+#out allows the build to proceed normally. -fexpensive-optimizations may be OK,
+#it was removed while debugging an issue that ultimately turned out to be due
+#to the ICE fixed by gcc-pr32889.patch. It needs to be tested again.
+#Note that this testing was done without the gcc-pr32889.patch.
+FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
+
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
+
CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
new file mode 100644
index 0000000000..92b8d8ba7e
--- /dev/null
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -0,0 +1,21 @@
+# uclibc:
+require conf/distro/include/uclibc.inc
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
+
+TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+
+#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
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
+BUILD_OPTIMIZATION = "-O2 -ggdb3"
+
+#Gcc will die with 'internal consistency error when using the above optimizations
+FULL_OPTIMIZATION_avr32 = ""
+BUILD_OPTIMIZATION_avr32 = ""
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 5522a12728..8bbd28ee93 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -1,48 +1,202 @@
#@TYPE: Distribution
#@NAME: Angstrom
-#@DESCRIPTION: Distribution configuration for Angstrom
+#@DESCRIPTION: Release independent distribution configuration for Angstrom
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
DISTRO = "angstrom"
DISTRO_NAME = "Angstrom"
+BUILDNAME = "Angstrom ${DISTRO_VERSION}"
+
TARGET_VENDOR = "-angstrom"
+SOC_FAMILY ?= "Unknown"
+
+# Add FEED_ARCH and SOC_FAMILY to overrides
+OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
+
# Can be "glibc", "eglibc" or "uclibc"
-ANGSTROM_MODE ?= "glibc"
+ANGSTROMLIBC ?= "glibc"
+LIBC ?= "${ANGSTROMLIBC}"
+PSTAGE_EXTRAPATH = "${LIBC}"
+
+CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}"
+require conf/distro/include/angstrom-${LIBC}.inc
+
+# ARM920T and up can use thumb mode to decrease binary size at the expense of speed
+# (the complete story is a bit more nuanced due to cache starvation)
+# Angstrom turns on thumb for armv4t machine according to this RFC:
+# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
+
+# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
+ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
+
+
+ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
+# "arm" "thumb"
+# The instruction set the compiler should use when generating application
+# code. The kernel is always compiled with arm code at present. arm code
+# is the original 32 bit ARM instruction set, thumb code is the 16 bit
+# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
+# but requires more instructions (140% for 70% smaller code) so may be
+# slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+# Whether to compile with code to allow interworking between the two
+# instruction sets. This allows thumb code to be executed on a primarily
+# arm system and vice versa. It is strongly recommended that DISTROs not
+# turn this off - the actual cost is very small.
-DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
-require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
#Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org"
+ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
+
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
#Set the default maintainer to angstrom-dev
MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
-#use ipkg package format with debian style naming
-#use multimachine buildrules
-INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors insane"
+#use debian style naming
+INHERIT += "debian"
+
+#activate config checker
+INHERIT += "sanity"
+
+#activate the blacklister
+INHERIT += "angstrom"
+
+#make devshell available as task
+INHERIT += "devshell"
+
+#use angstrom source mirrors to combat 404s
+INHERIT += "angstrom-mirrors"
+
+#run QA tests on builds and packages and log them
+INHERIT += "insane"
+# INHERIT += "packagehistory"
+QA_LOG = "1"
+
+#run QA tests on recipes
+INHERIT += "recipe_sanity"
+
+#save statistical info on images
+INHERIT += "testlab"
+
+ANGSTROM_PKG_FORMAT ?= "ipk"
+require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
+
+
+# We don't want to keep OABI compat
+ARM_KEEP_OABI = "0"
+# Do keep OABI compat for om-gta01 to keep the gllin binary working
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
+
#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
PREFERRED_PROVIDER_qemu-native = "qemu-native"
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
-#qemu doesn't like armv6/eabi/vfp
-ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+#qemu doesn't like this fp
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
+
+#qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
#ARM EABI is softfloat by default, but let's make sure :)
#make it overridable for platforms with FPU, like ep93xx or i.mx31
TARGET_FPU_arm ?= "soft"
TARGET_FPU_armeb ?= "soft"
TARGET_FPU_ixp4xx ?= "soft"
+TARGET_FPU_ppc405 ?= "soft"
+
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv6-novfp ?= "soft"
+TARGET_FPU_armv7a ?= "hard"
+TARGET_FPU_ppc603e ?= "hard"
+
+# webkit-gtk and cairo have alignment issues with double instructions on armv5 so
+# disable them here
+TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
+TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
+
+#Set the right arch for the feeds
+#Alphabetically sorted
+
+FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
+
+#blackfin machines
+FEED_ARCH_bfin = "blackfin"
#Name the generated images in a sane way
-IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
# Angstrom *always* has some form of release config, so error out if someone thinks he knows better
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# Configuration for tinderbox, so people only need:
+# INHERIT += "tinderclient"
+# in their local.conf
+
+#Name of the client
+TINDER_MACHINE = "${MACHINE}-${LIBC}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG = "${TMPDIR}/tinder.log"
+TINDER_TREE = "Angstrom"
+
+# HTTP posting
+TINDER_HOST ?= "ewi546.ewi.utwente.nl"
+TINDER_URL ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH = "org.openembedded.dev"
+
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER = "1"
+
+## Do a report at all
+TINDER_REPORT = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku oestats-client"
+# SEPPUKU_USER = "your_bugzilla@user.id"
+# SEPPUKU_PASS = "your_bugzilla_password"
+# OESTATS_BUILDER = "your_name"
+# in their local.conf
+
+# seppuku bbclass
+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"
+SEPPUKU_COMPONENT = "org.openembedded.dev"
+
+OESTATS_SERVER ?= "tinderbox.openembedded.org"
+
# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
-DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam"
+
+# Use-like features
+DISTRO_FEATURES += "tk"
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
deleted file mode 100644
index bb7bc45fbd..0000000000
--- a/conf/distro/include/angstromoabi.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require conf/distro/include/angstrom.inc
-
-PACKAGE_ARCH = "arm-oabi"
-
diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc
new file mode 100644
index 0000000000..04431403e2
--- /dev/null
+++ b/conf/distro/include/eglibc.inc
@@ -0,0 +1,20 @@
+# Add glibc overrides to the overrides for eglibc.
+OVERRIDES .= ":libc-glibc"
+
+# The things eglibc can provide. We default to wanting eglibc to provide them.
+PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
+PREFERRED_PROVIDER_virtual/libc = "eglibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc"
+
+# eglibc is configured for OLDEST_KERNEL kernel version, so we set minimal
+# sane versions there
+
+OLDEST_KERNEL ?= "2.4.0"
+
+# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi"
+# TARGET_OS here, not on architecture which is 'arm' in both cases
+OLDEST_KERNEL_linux-gnueabi ?= "2.6.16"
+OLDEST_KERNEL_sparc64 ?= "2.4.21"
+OLDEST_KERNEL_ppc64 ?= "2.4.21"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
new file mode 100644
index 0000000000..f5c7974d5b
--- /dev/null
+++ b/conf/distro/include/fso-autorev.inc
@@ -0,0 +1,45 @@
+# FSO
+SRCREV_pn-dbus-hlid = "${AUTOREV}"
+SRCREV_pn-frameworkd = "${AUTOREV}"
+SRCREV_pn-frameworkd-devel = "${AUTOREV}"
+SRCREV_pn-fsodatad = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${AUTOREV}"
+SRCREV_pn-fsogsmd = "${AUTOREV}"
+SRCREV_pn-fsotdld = "${AUTOREV}"
+SRCREV_pn-fsomusicd = "${AUTOREV}"
+SRCREV_pn-fsonetworkd = "${AUTOREV}"
+SRCREV_pn-fsotimed = "${AUTOREV}"
+SRCREV_pn-fsousaged = "${AUTOREV}"
+SRCREV_pn-fso-abyss = "${AUTOREV}"
+SRCREV_pn-fso-apm = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
+SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-fso-gpsd = "${AUTOREV}"
+SRCREV_pn-fso-monitord = "${AUTOREV}"
+SRCREV_pn-fso-sounds = "${AUTOREV}"
+SRCREV_pn-fso-specs = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
+SRCREV_pn-gsmd2 = "${AUTOREV}"
+SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libascenario = "${AUTOREV}"
+SRCREV_pn-libeflvala = "${AUTOREV}"
+SRCREV_pn-libfsobasics = "${AUTOREV}"
+SRCREV_pn-libfsoframework = "${AUTOREV}"
+SRCREV_pn-libfsoresource = "${AUTOREV}"
+SRCREV_pn-libfsotransport = "${AUTOREV}"
+SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
+SRCREV_pn-libfso-glib = "${AUTOREV}"
+SRCREV_pn-libgee-native = "${AUTOREV}"
+SRCREV_pn-libgee = "${AUTOREV}"
+SRCREV_pn-libgsm0710 = "${AUTOREV}"
+SRCREV_pn-libgsm0710mux = "${AUTOREV}"
+SRCREV_pn-libpersistence = "${AUTOREV}"
+SRCREV_pn-mickeydbus = "${AUTOREV}"
+SRCREV_pn-mickeyterm = "${AUTOREV}"
+SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-msmcommd = "${AUTOREV}"
+SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
+SRCREV_pn-vala-native = "${AUTOREV}"
+SRCREV_pn-vala = "${AUTOREV}"
+SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/glibc-external.inc b/conf/distro/include/glibc-external.inc
new file mode 100644
index 0000000000..3ddedb640f
--- /dev/null
+++ b/conf/distro/include/glibc-external.inc
@@ -0,0 +1,21 @@
+# Add glibc to the overrides.
+OVERRIDES .= ":libc-glibc"
+
+# The things glibc can provide. We default to wanting glibc to provide them.
+PREFERRED_PROVIDER_virtual/libiconv ?= "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/libintl ?= "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/libc = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_linux-libc-headers ?= "external-toolchain-${TOOLCHAIN_BRAND}"
+
+# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal
+# sane versions there
+
+OLDEST_KERNEL ?= "2.4.0"
+
+# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi"
+# TARGET_OS here, not on architecture which is 'arm' in both cases
+OLDEST_KERNEL_linux-gnueabi ?= "2.6.14"
+OLDEST_KERNEL_sparc64 ?= "2.4.21"
+OLDEST_KERNEL_ppc64 ?= "2.4.21"
diff --git a/conf/distro/include/glibc-internal.inc b/conf/distro/include/glibc-internal.inc
new file mode 100644
index 0000000000..d1cbd5339b
--- /dev/null
+++ b/conf/distro/include/glibc-internal.inc
@@ -0,0 +1,21 @@
+# Add glibc to the overrides.
+OVERRIDES .= ":libc-glibc"
+
+# The things glibc can provide. We default to wanting glibc to provide them.
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
+# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal
+# sane versions there
+
+OLDEST_KERNEL ?= "2.4.0"
+
+# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi"
+# TARGET_OS here, not on architecture which is 'arm' in both cases
+OLDEST_KERNEL_linux-gnueabi ?= "2.6.14"
+OLDEST_KERNEL_sparc64 ?= "2.4.21"
+OLDEST_KERNEL_ppc64 ?= "2.4.21"
diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc
new file mode 100644
index 0000000000..2cb6502322
--- /dev/null
+++ b/conf/distro/include/glibc.inc
@@ -0,0 +1,20 @@
+# Add glibc to the overrides.
+OVERRIDES .= ":libc-glibc"
+
+# The things glibc can provide. We default to wanting glibc to provide them.
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
+
+# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal
+# sane versions there
+
+OLDEST_KERNEL ?= "2.4.0"
+
+# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi"
+# TARGET_OS here, not on architecture which is 'arm' in both cases
+OLDEST_KERNEL_linux-gnueabi ?= "2.6.14"
+OLDEST_KERNEL_sparc64 ?= "2.4.21"
+OLDEST_KERNEL_ppc64 ?= "2.4.21"
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
new file mode 100644
index 0000000000..b0ee16f561
--- /dev/null
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -0,0 +1,97 @@
+SRCREV_pn-aircrack-ng ?= "${AUTOREV}"
+SRCREV_pn-dfu-util ?= "${AUTOREV}"
+SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-eds-dbus ?= "${AUTOREV}"
+SRCREV_pn-eglibc ?= "${AUTOREV}"
+SRCREV_pn-eglibc-initial ?= "${AUTOREV}"
+SRCREV_pn-ezxd ?= "${AUTOREV}"
+SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}"
+SRCREV_pn-fstests ?= "${AUTOREV}"
+SRCREV_pn-gnuradio ?= "${AUTOREV}"
+SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
+SRCREV_pn-hildon-1 ?= "${AUTOREV}"
+SRCREV_pn-kismet ?= "${AUTOREV}"
+SRCREV_pn-kismet-newcore ?= "${AUTOREV}"
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libjana ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
+SRCREV_pn-libowl ?= "${AUTOREV}"
+SRCREV_pn-libxosd ?= "${AUTOREV}"
+SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
+SRCREV_pn-llvm-gcc4 ?= "${AUTOREV}"
+SRCREV_pn-llvm-gcc4-cross ?= "${AUTOREV}"
+SRCREV_pn-maemo-mapper ?= "${AUTOREV}"
+SRCREV_pn-matchbox-desktop-2 ?= "${AUTOREV}"
+SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "${AUTOREV}"
+SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
+SRCREV_pn-neod ?= "${AUTOREV}"
+SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
+SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-common ?= "${AUTOREV}"
+SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
+SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
+SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
+SRCREV_pn-openmoko-session ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
+SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
+SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
+SRCREV_pn-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
+SRCREV_pn-psplash ?= "${AUTOREV}"
+SRCREV_pn-settings-daemon ?= "${AUTOREV}"
+SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
+SRCREV_pn-sphyrna-python ?= "${AUTOREV}"
+SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
+SRCREV_pn-xoo ?= "${AUTOREV}"
+SRCREV_pn-mplayer ?= "${AUTOREV}"
+SRCREV_pn-usbpath ?= "${AUTOREV}"
+SRCREV_pn-usbpath-native ?= "${AUTOREV}"
+SRCREV_pn-libfakekey ?= "${AUTOREV}"
+
+SRCREV ?= "${AUTOREV}"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
new file mode 100644
index 0000000000..8b120f2eb2
--- /dev/null
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -0,0 +1,86 @@
+#@--------------------------------------------------------------------
+#@FILE: conf/distro/include/kaeilos-2009-preferred-versions.inc
+#@TYPE: Distribution
+#@NAME: KaeilOS(R) - http://www.kaeilos.com
+#@DESCRIPTION: KaeilOS Linux Distribution preferred version
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 11-01-2010
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
+#@--------------------------------------------------------------------
+
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_automake-native = "1.10.2"
+PREFERRED_VERSION_busybox = "1.13.2"
+PREFERRED_VERSION_cairo = "1.8.8"
+PREFERRED_VERSION_dbus = "1.2.3"
+PREFERRED_VERSION_dropbear = "0.51"
+PREFERRED_VERSION_fontconfig = "2.6.0"
+PREFERRED_VERSION_glib-2.0 = "2.22.1"
+PREFERRED_VERSION_glib-2.0-native = "2.22.1"
+PREFERRED_VERSION_glibmm = "2.22.1"
+PREFERRED_VERSION_glproto = "1.4.9"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gtk+ = "2.18.3"
+PREFERRED_VERSION_gtkmm = "2.18.1"
+PREFERRED_VERSION_hal = "0.5.13"
+PREFERRED_VERSION_libgemwidget = "1.0"
+PREFERRED_VERSION_libgpephone = "0.4"
+PREFERRED_VERSION_libsdl-x11 = "1.2.14"
+PREFERRED_VERSION_libtool = "2.2.6a"
+PREFERRED_VERSION_libtool-native = "2.2.6a"
+PREFERRED_VERSION_libtool-cross = "2.2.6a"
+PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
+PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165"
+PREFERRED_VERSION_pango = "1.24.4"
+PREFERRED_VERSION_pixman = "0.16.2"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.15"
+PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_samba = "3.3.9"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+
+KAEILOS_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}"
+
+PREFERRED_VERSION_udev = "141"
+UDEV_GE_141 = "1"
+
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+
+# Use latest version available
+#PREFERRED_VERSION_util-macros-native = "1.4.1"
+#PREFERRED_VERSION_util-macros = "1.4.1"
+#PREFERRED_VERSION_xserver-xorg = "1.7.3"
+#PREFERRED_VERSION_xf86-video-xgi = "1.5.1"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
+
+
diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc
new file mode 100644
index 0000000000..ad03976c67
--- /dev/null
+++ b/conf/distro/include/kaeilos.inc
@@ -0,0 +1,212 @@
+#@TYPE: Distribution
+#@NAME: KaeilOS
+#@DESCRIPTION: Release independent distribution configuration for KaeilOS
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
+
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
+DISTRO = "kaeilos"
+DISTRO_NAME = "KaeilOS"
+
+BUILDNAME = "KaeilOS ${DISTRO_VERSION}"
+
+TARGET_VENDOR = "-kaeilos"
+
+# Add FEED_ARCH to overrides
+OVERRIDES .= ":${FEED_ARCH}"
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
+
+# Can be "glibc", "eglibc" or "uclibc"
+KAEILOSLIBC ?= "glibc"
+LIBC ?= "${KAEILOSLIBC}"
+PSTAGE_EXTRAPATH = "${LIBC}"
+
+CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}"
+require conf/distro/include/angstrom-${LIBC}.inc
+
+# ARM920T and up can use thumb mode to decrease binary size at the expense of speed
+# (the complete story is a bit more nuanced due to cache starvation)
+# KaeilOS turns on thumb for armv4t machine according to this RFC:
+# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
+
+# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
+ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
+#ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
+#ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
+
+
+ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
+# "arm" "thumb"
+# The instruction set the compiler should use when generating application
+# code. The kernel is always compiled with arm code at present. arm code
+# is the original 32 bit ARM instruction set, thumb code is the 16 bit
+# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
+# but requires more instructions (140% for 70% smaller code) so may be
+# slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+# Whether to compile with code to allow interworking between the two
+# instruction sets. This allows thumb code to be executed on a primarily
+# arm system and vice versa. It is strongly recommended that DISTROs not
+# turn this off - the actual cost is very small.
+
+
+#Use this variable in feeds and other parts that need a URI
+ANGSTROM_URI ?= "http://www.kaeilos.com"
+
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
+
+#Set the default maintainer of kaeilos
+MAINTAINER = "KaeilOS Mantainer <m.cavallini@koansoftware.com>"
+
+#use debian style naming
+INHERIT += "debian"
+
+#activate config checker
+INHERIT += "sanity"
+
+#activate the blacklister
+INHERIT += "angstrom"
+
+#make devshell available as task
+INHERIT += "devshell"
+
+#use angstrom source mirrors to combat 404s
+INHERIT += "angstrom-mirrors"
+
+#run QA tests on builds and packages and log them
+INHERIT += "insane"
+# INHERIT += "packagehistory"
+QA_LOG = "1"
+
+#run QA tests on recipes
+INHERIT += "recipe_sanity"
+
+#save statistical info on images
+INHERIT += "testlab"
+
+ANGSTROM_PKG_FORMAT ?= "ipk"
+require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
+
+
+# We don't want to keep OABI compat
+ARM_KEEP_OABI = "0"
+# Do keep OABI compat for om-gta01 to keep the gllin binary working
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
+
+
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+#qemu doesn't like this fp
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
+
+#qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+
+#ARM EABI is softfloat by default, but let's make sure :)
+#make it overridable for platforms with FPU, like ep93xx or i.mx31
+TARGET_FPU_arm ?= "soft"
+TARGET_FPU_armeb ?= "soft"
+TARGET_FPU_ixp4xx ?= "soft"
+TARGET_FPU_ppc405 ?= "soft"
+
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv6-novfp ?= "soft"
+TARGET_FPU_armv7a ?= "hard"
+TARGET_FPU_ppc603e ?= "hard"
+
+# webkit-gtk and cairo have alignment issues with double instructions on armv5 so
+# disable them here
+TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
+TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
+
+#Set the right arch for the feeds
+#Alphabetically sorted
+
+FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
+
+#blackfin machines
+FEED_ARCH_bfin = "blackfin"
+
+#Tweak packaging for strongarm machines since they can't use EABI
+
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
+
+
+#Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# KaeilOS *always* has some form of release config, so error out if someone thinks he knows better
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+
+# Configuration for tinderbox, so people only need:
+# INHERIT += "tinderclient"
+# in their local.conf
+
+#Name of the client
+TINDER_MACHINE = "${MACHINE}-${LIBC}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG = "${TMPDIR}/tinder.log"
+TINDER_TREE = "KaeilOS"
+
+# HTTP posting
+#TINDER_HOST ?= "ewi546.ewi.utwente.nl"
+#TINDER_URL ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH = "org.openembedded.dev"
+
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER = "1"
+
+## Do a report at all
+TINDER_REPORT = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku oestats-client"
+# SEPPUKU_USER = "your_bugzilla@user.id"
+# SEPPUKU_PASS = "your_bugzilla_password"
+# OESTATS_BUILDER = "your_name"
+# in their local.conf
+
+# seppuku bbclass
+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"
+SEPPUKU_COMPONENT = "org.openembedded.dev"
+
+OESTATS_SERVER ?= "tinderbox.openembedded.org"
+
+
+
+# We want images supporting the following features (for task-base)
diff --git a/conf/distro/include/openmoko-srcdate-now.inc b/conf/distro/include/openmoko-srcdate-now.inc
deleted file mode 100644
index 7ca0768819..0000000000
--- a/conf/distro/include/openmoko-srcdate-now.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Warning! Builds unupgradable packages!
-
-# OpenMoko
-SRCDATE_libgsmd ?= "now"
-SRCDATE_libmokogsmd2 ?= "now"
-SRCDATE_libmokoui2 ?= "now"
-SRCDATE_libmokojournal2 ?= "now"
-SRCDATE_libmokopanelui2 ?= "now"
-SRCDATE_openmoko-today2 ?= "now"
-SRCDATE_openmoko-dialer2 ?= "now"
-SRCDATE_openmoko-contacts2 ?= "now"
-
-SRCDATE_openmoko-panel-battery ?= "now"
-SRCDATE_openmoko-panel-clock ?= "now"
-SRCDATE_openmoko-panel-gsm ?= "now"
-SRCDATE_openmoko-panel-usb ?= "now"
-SRCDATE_openmoko-panel-bt ?= "now"
-SRCDATE_openmoko-panel-gps ?= "now"
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc
deleted file mode 100644
index 7c3c4a8f41..0000000000
--- a/conf/distro/include/openmoko.inc
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# Header
-#
-DISTRO_NAME = "OpenMoko"
-
-#
-# Naming schemes
-#
-INHERIT += "debian multimachine"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
-IMAGE_FSTYPES_x86 = "tar.gz"
-IMAGE_ROOTFS_SIZE_ext2 = "131072"
-
-#
-# 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"
-
-# EABI stuff
-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/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-#
-# 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_VERSION_linux-libc-headers_x86 = "2.6.15.99"
-PREFERRED_VERSION_linux-libc_headers = "2.6.18"
-#
-# Features
-#
-DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget usbhost"
-
-#
-# Bootstrap & Init
-#
-require conf/distro/include/sane-srcdates.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
-PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
-PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-
-#
-# Gnome
-#
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-#new
-#PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs"
-#old
-PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file = "gnome-vfs"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
-
-PREFERRED_VERSION_dbus-native = "1.0.2"
-PREFERRED_VERSION_dbus = "1.0.2"
-PREFERRED_VERSION_dbus-glib-native = "0.71"
-PREFERRED_VERSION_dbus-glib = "0.71"
-PREFERRED_VERSION_atk = "1.9.0"
-PREFERRED_VERSION_pango = "1.8.2"
-PREFERRED_VERSION_glib-2.0 = "2.12.3"
-PREFERRED_VERSION_gtk+ = "2.6.10"
-PREFERRED_VERSION_gtk-engines = "2.6.5"
-#PREFERRED_VERSION_gnome-vfs = "2.16.3"
-
-PREFERRED_VERSION_fontconfig = "2.4.1"
-
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+ ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
-#
-# GPE
-#
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-
-#
-# O-Hand
-#
-PREFERRED_VERSION_contacts = "0.1"
-PREFERRED_VERSION_dates = "0.1"
-# PREFERRED_VERSION_web = "???"
-
-#
-# Development
-#
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc
-
-#
-# OpenMoko
-#
-
-#We comment this out since external developers don't needs to use SRCDATE="now" as that generated unneed traffic
-#require conf/distro/include/preferred-openmoko-versions.inc
-
diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index 843f8e18ba..36eca58241 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -1,17 +1,14 @@
# 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"
-#oplinux is a multimachine distro
-INHERIT += "multimachine"
-
# check for required tools and minimal BitBake version
INHERIT += "sanity"
@@ -33,15 +30,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 +51,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 +77,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 +90,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 +120,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/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index acc8498262..0bcd834b1a 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -32,7 +32,7 @@ PREFERRED_VERSION_libxsettings-client ?= "0.17"
PREFERRED_VERSION_gpe-icons ?= "0.25"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
PREFERRED_VERSION_gpe-su ?= "0.19"
PREFERRED_VERSION_keylaunch ?= "2.0.10"
@@ -61,7 +61,7 @@ PREFERRED_VERSION_gpe-shield ?= "0.9"
PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
PREFERRED_VERSION_minilite ?= "0.50"
PREFERRED_VERSION_miniclipboard ?= "0.3"
-PREFERRED_VERSION_minimix ?= "0.8"
+PREFERRED_VERSION_minimix ?= "0.9"
PREFERRED_VERSION_gpe-edit ?= "0.40"
PREFERRED_VERSION_gpe-gallery ?= "0.97"
PREFERRED_VERSION_gpe-calculator ?= "0.2"
@@ -78,7 +78,7 @@ PREFERRED_VERSION_gpe-synctool ?= "0.2"
PREFERRED_VERSION_gpe-announce ?= "0.13"
PREFERRED_VERSION_gpe-timesheet ?= "0.32"
PREFERRED_VERSION_gpe-irc ?= "0.08"
-PREFERRED_VERSION_starling ?= "0.2"
+PREFERRED_VERSION_starling ?= "0.9"
PREFERRED_VERSION_gpe-keylock ?= "0.12"
PREFERRED_VERSION_gpe-ownerinfo ?= "0.28"
PREFERRED_VERSION_gpe-question ?= "0.04"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
new file mode 100644
index 0000000000..d881202b09
--- /dev/null
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -0,0 +1,2131 @@
+PREFERRED_VERSION_0xffff ?= "0.2"
+PREFERRED_VERSION_0xffff-native ?= "0.2"
+PREFERRED_VERSION_aalib ?= "1.4rc5"
+PREFERRED_VERSION_abiword ?= "2.5.2"
+PREFERRED_VERSION_abiword-embedded ?= "2.5.2"
+PREFERRED_VERSION_abiword-plugins ?= "2.5.2"
+PREFERRED_VERSION_abuse ?= "0.7.0"
+PREFERRED_VERSION_acpid ?= "1.0.4"
+PREFERRED_VERSION_acx-firmware ?= "1.0"
+PREFERRED_VERSION_addressbook ?= "0.1"
+PREFERRED_VERSION_adns ?= "1.0"
+PREFERRED_VERSION_agg ?= "2.5"
+PREFERRED_VERSION_aircrack ?= "2.41"
+PREFERRED_VERSION_aircrack-ng ?= "0.9.1"
+PREFERRED_VERSION_albumshaper ?= "2.1"
+PREFERRED_VERSION_aliens ?= "1.0.0"
+PREFERRED_VERSION_aliens-qt ?= "1.0.0"
+PREFERRED_VERSION_alsa-lib ?= "1.0.15"
+PREFERRED_VERSION_alsa-oss ?= "1.0.15"
+PREFERRED_VERSION_alsa-plugins ?= "1.0.14"
+PREFERRED_VERSION_alsa-state ?= "0.2.0"
+PREFERRED_VERSION_alsa-utils ?= "1.0.15"
+PREFERRED_VERSION_anthy ?= "7811"
+PREFERRED_VERSION_anthy-native ?= "7811"
+PREFERRED_VERSION_antlr ?= "2.7.7"
+PREFERRED_VERSION_antlr-native ?= "2.7.7"
+PREFERRED_VERSION_apache2 ?= "2.2.3"
+PREFERRED_VERSION_apache2-native ?= "2.2.3"
+PREFERRED_VERSION_apex-env ?= "1.5.8"
+PREFERRED_VERSION_apex-nslu2 ?= "1.5.8"
+PREFERRED_VERSION_apex-nslu2-16mb ?= "1.5.8"
+PREFERRED_VERSION_apmd ?= "3.2.2"
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_appweb ?= "2.0.4"
+PREFERRED_VERSION_apr ?= "1.2.7"
+PREFERRED_VERSION_apr-util ?= "1.2.7"
+PREFERRED_VERSION_apt ?= "0.7.3"
+PREFERRED_VERSION_apt-native ?= "0.7.3"
+PREFERRED_VERSION_argtable ?= "2.7"
+PREFERRED_VERSION_ark3116 ?= "0.4.1"
+PREFERRED_VERSION_arpwatch ?= "2.1a15"
+PREFERRED_VERSION_aspell ?= "0.60.5"
+PREFERRED_VERSION_aspell-native ?= "0.60.5"
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_asterisk-sounds ?= "1.2.1"
+PREFERRED_VERSION_at ?= "3.1.8"
+PREFERRED_VERSION_atd ?= "0.70"
+PREFERRED_VERSION_atftp ?= "0.7"
+PREFERRED_VERSION_atk ?= "1.20.0"
+PREFERRED_VERSION_atmelwlandriver ?= "3.4.1.0"
+PREFERRED_VERSION_atomic ?= "1.0.1"
+PREFERRED_VERSION_audiofile ?= "0.2.6"
+PREFERRED_VERSION_audioplayer ?= "1.0"
+PREFERRED_VERSION_aumix ?= "2.8"
+PREFERRED_VERSION_autoconf ?= "2.61"
+PREFERRED_VERSION_autoconf-native ?= "2.61"
+PREFERRED_VERSION_autofs ?= "4.1.4"
+PREFERRED_VERSION_automake ?= "1.10.2"
+PREFERRED_VERSION_automake-native ?= "1.10.2"
+PREFERRED_VERSION_avahi ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
+PREFERRED_VERSION_avahi-ui ?= "0.6.21"
+PREFERRED_VERSION_avetanabt ?= "20060413"
+PREFERRED_VERSION_bacula-client ?= "1.38.11"
+PREFERRED_VERSION_balsa ?= "2.0.17"
+PREFERRED_VERSION_base-files ?= "3.0.14"
+PREFERRED_VERSION_base-passwd ?= "3.5.20"
+PREFERRED_VERSION_bash ?= "3.2"
+PREFERRED_VERSION_bash-completion ?= "20040711"
+PREFERRED_VERSION_bazaar ?= "1.2"
+PREFERRED_VERSION_bb ?= "1.2"
+PREFERRED_VERSION_bc ?= "1.06"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_beecrypt ?= "3.1.0"
+PREFERRED_VERSION_beecrypt-native ?= "3.1.0"
+PREFERRED_VERSION_beep ?= "1.2.2"
+PREFERRED_VERSION_beepmp ?= "0.9.7"
+PREFERRED_VERSION_beforelight ?= "1.0.2"
+PREFERRED_VERSION_benchfft ?= "3.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
+PREFERRED_VERSION_billiardz ?= "0.1.4"
+PREFERRED_VERSION_bind ?= "9.3.6"
+PREFERRED_VERSION_bing ?= "1.1.3"
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
+PREFERRED_VERSION_bison ?= "2.0"
+PREFERRED_VERSION_bison-native ?= "2.0"
+PREFERRED_VERSION_bitbake ?= "1.8.6"
+PREFERRED_VERSION_bitchx ?= "1.1"
+PREFERRED_VERSION_bluesnarfer ?= "0.1"
+PREFERRED_VERSION_bluez-cups-backend ?= "3.33"
+PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
+PREFERRED_VERSION_bluez-gnome ?= "0.14"
+PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.33"
+PREFERRED_VERSION_bluez-hcidump ?= "1.42"
+PREFERRED_VERSION_bluez-libs ?= "3.33"
+PREFERRED_VERSION_bluez-utils ?= "3.33"
+PREFERRED_VERSION_bluez-utils-alsa ?= "3.33"
+PREFERRED_VERSION_bmon ?= "2.1.0"
+PREFERRED_VERSION_boa ?= "0.94.13"
+PREFERRED_VERSION_bochs ?= "2.1"
+PREFERRED_VERSION_bogofilter ?= "0.96.0"
+PREFERRED_VERSION_boost ?= "1.33.1"
+PREFERRED_VERSION_boost-asio ?= "0.3.7"
+PREFERRED_VERSION_boost-jam-native ?= "3.1.11"
+PREFERRED_VERSION_bootchart ?= "0.9"
+PREFERRED_VERSION_bootmenu ?= "0.7"
+PREFERRED_VERSION_bootsplash ?= "3.0.7"
+PREFERRED_VERSION_bootsplash-native ?= "3.0.7"
+PREFERRED_VERSION_brickout ?= "2002.06.09"
+PREFERRED_VERSION_brutefir ?= "1.0i"
+PREFERRED_VERSION_bt950-cs ?= "0.1"
+PREFERRED_VERSION_btscanner ?= "2.0"
+PREFERRED_VERSION_btsco ?= "0.42"
+PREFERRED_VERSION_btsco-module ?= "0.42"
+PREFERRED_VERSION_btxml ?= "1.0"
+PREFERRED_VERSION_busybox = "1.13.2"
+PREFERRED_VERSION_busybox-static ?= "1.2.1"
+PREFERRED_VERSION_bvi ?= "1.3.1"
+PREFERRED_VERSION_bwmon ?= "1.3"
+PREFERRED_VERSION_bzflag ?= "1.10.6.20040515"
+PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515"
+PREFERRED_VERSION_bzip2 ?= "1.0.2"
+PREFERRED_VERSION_cacao-cldc ?= "0.98"
+PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98"
+PREFERRED_VERSION_cairo ?= "1.6.4"
+PREFERRED_VERSION_cairo-directfb ?= "1.4.8"
+PREFERRED_VERSION_cairomm ?= "1.2.4"
+PREFERRED_VERSION_calendar ?= "1.0"
+PREFERRED_VERSION_came ?= "1.7"
+PREFERRED_VERSION_camera-assistant ?= "0.2.0"
+PREFERRED_VERSION_camsource ?= "0.7.0"
+PREFERRED_VERSION_c-ares ?= "1.3.0"
+PREFERRED_VERSION_cbrpager ?= "0.9.14"
+PREFERRED_VERSION_ccache ?= "2.4"
+PREFERRED_VERSION_cccc ?= "3.pre84"
+PREFERRED_VERSION_ccdv ?= "1.0"
+PREFERRED_VERSION_ccdv-native ?= "1.0"
+PREFERRED_VERSION_ccxstream ?= "1.0.15"
+PREFERRED_VERSION_cdparanoia ?= "9.8alpha"
+PREFERRED_VERSION_cdrtools-native ?= "2.01"
+PREFERRED_VERSION_cdstatus ?= "0.96.05"
+PREFERRED_VERSION_cdtool ?= "2.1.8"
+PREFERRED_VERSION_cdump-native ?= "1.0"
+PREFERRED_VERSION_centericq ?= "4.11.0"
+PREFERRED_VERSION_cetools ?= "0.3"
+PREFERRED_VERSION_cetools-native ?= "0.3"
+PREFERRED_VERSION_cflow ?= "2.0"
+PREFERRED_VERSION_cfu1-modules ?= "2.6"
+PREFERRED_VERSION_check ?= "0.9.2"
+PREFERRED_VERSION_checkers ?= "1.0.5ern"
+PREFERRED_VERSION_cherokee ?= "0.5.5"
+PREFERRED_VERSION_cherokee-nossl ?= "0.5.3"
+PREFERRED_VERSION_chillispot ?= "1.0RC3"
+PREFERRED_VERSION_chkhinge ?= "20040706"
+PREFERRED_VERSION_chmlib ?= "0.38"
+PREFERRED_VERSION_chrpath ?= "0.13"
+PREFERRED_VERSION_chrpath-native ?= "0.13"
+PREFERRED_VERSION_ckermit ?= "211"
+PREFERRED_VERSION_clamav ?= "0.91.1"
+PREFERRED_VERSION_clamsmtp ?= "1.8"
+PREFERRED_VERSION_classpath ?= "0.97.2"
+PREFERRED_VERSION_classpath-gtk ?= "0.97.2"
+PREFERRED_VERSION_classpath-minimal ?= "0.97.2"
+PREFERRED_VERSION_classpath-native ?= "0.97.2"
+PREFERRED_VERSION_clearsilver ?= "0.10.3"
+PREFERRED_VERSION_clish ?= "0.7.1"
+PREFERRED_VERSION_cmake-native ?= "2.4.7"
+PREFERRED_VERSION_cms92init ?= "0.1"
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_comprec ?= "0.02"
+PREFERRED_VERSION_confuse ?= "2.5"
+PREFERRED_VERSION_confuse-native ?= "2.5"
+PREFERRED_VERSION_connect ?= "0.1"
+PREFERRED_VERSION_connman ?= "0.15"
+PREFERRED_VERSION_conserver ?= "8.1.14"
+PREFERRED_VERSION_console-tools ?= "0.3.2"
+PREFERRED_VERSION_contacts ?= "0.7"
+PREFERRED_VERSION_coreutils ?= "7.1"
+PREFERRED_VERSION_coreutils-native ?= "7.1"
+PREFERRED_VERSION_corkscrew ?= "2.0"
+PREFERRED_VERSION_corsair ?= "0.2.6"
+PREFERRED_VERSION_cpio ?= "2.5"
+PREFERRED_VERSION_cppunit ?= "1.10.2"
+PREFERRED_VERSION_cpuburn ?= "1.4"
+PREFERRED_VERSION_cpufreqd ?= "1.1.2"
+PREFERRED_VERSION_cpusage ?= "0.2"
+PREFERRED_VERSION_cpuspeed ?= "1.1"
+PREFERRED_VERSION_cramfs ?= "1.1"
+PREFERRED_VERSION_cramfs-native ?= "1.1"
+PREFERRED_VERSION_crimsonfields ?= "0.4.8"
+PREFERRED_VERSION_crimsonfields-native ?= "0.4.8"
+PREFERRED_VERSION_cron ?= "3.0pl1"
+PREFERRED_VERSION_cross-linkage ?= "1.0"
+PREFERRED_VERSION_crossword ?= "0.0.3"
+PREFERRED_VERSION_cscope ?= "15.5"
+PREFERRED_VERSION_ctags-native ?= "5.5.4"
+PREFERRED_VERSION_ctorrent ?= "1.3.4"
+PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
+PREFERRED_VERSION_cumulus ?= "1.2.1"
+PREFERRED_VERSION_cups ?= "1.2.12"
+PREFERRED_VERSION_curl ?= "7.18.2"
+PREFERRED_VERSION_curl-native ?= "7.18.2"
+PREFERRED_VERSION_custominput ?= "1.1.0"
+PREFERRED_VERSION_cvs ?= "1.12.9"
+PREFERRED_VERSION_cxcrypt ?= "1.0"
+PREFERRED_VERSION_cyrus-imapd ?= "2.2.12"
+PREFERRED_VERSION_cyrus-sasl ?= "2.1.19"
+PREFERRED_VERSION_damageext ?= "1.0"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_dash ?= "0.5.2"
+PREFERRED_VERSION_dasher-gpe ?= "0.0cvs20040828"
+PREFERRED_VERSION_dates ?= "0.4.4"
+PREFERRED_VERSION_davfs2 ?= "0.2.8"
+PREFERRED_VERSION_db3 ?= "3.2.9"
+PREFERRED_VERSION_db3-native ?= "3.2.9"
+PREFERRED_VERSION_db ?= "4.3.29"
+PREFERRED_VERSION_dbench ?= "4.0"
+PREFERRED_VERSION_dbh ?= "1.0-18"
+PREFERRED_VERSION_db-native ?= "4.3.29"
+PREFERRED_VERSION_dbus ?= "1.2.1"
+PREFERRED_VERSION_dbus-native ?= "1.2.1"
+PREFERRED_VERSION_dbus-glib ?= "0.76"
+PREFERRED_VERSION_dbus-glib-native ?= "0.76"
+PREFERRED_VERSION_dbus-native ?= "1.0.3"
+PREFERRED_VERSION_dbus-python ?= "0.71"
+PREFERRED_VERSION_dcetest ?= "1.2"
+PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.4"
+PREFERRED_VERSION_dcopidl-native ?= "3.5.4"
+PREFERRED_VERSION_dcron ?= "2.3.3"
+PREFERRED_VERSION_ddclient ?= "3.6.3"
+PREFERRED_VERSION_debianutils ?= "2.30"
+PREFERRED_VERSION_dejagnu ?= "1.4.4"
+PREFERRED_VERSION_dejagnu-native ?= "1.4.4"
+PREFERRED_VERSION_detect-stylus ?= "0.13"
+PREFERRED_VERSION_device-mapper ?= "1.01.05"
+PREFERRED_VERSION_devimage ?= "0.1"
+PREFERRED_VERSION_devimage-image ?= "1.0"
+PREFERRED_VERSION_devio ?= "1.2"
+PREFERRED_VERSION_devio-native ?= "1.2"
+PREFERRED_VERSION_devlabel ?= "0.48.01"
+PREFERRED_VERSION_devmem2 ?= "1.0"
+PREFERRED_VERSION_devshell ?= "1.0"
+PREFERRED_VERSION_dgen-sdl ?= "1.23"
+PREFERRED_VERSION_dhcdbd ?= "2.0"
+PREFERRED_VERSION_dhclient ?= "2.0pl5"
+PREFERRED_VERSION_dhcp ?= "3.0.2"
+PREFERRED_VERSION_dhcpcd ?= "1.3.22-pl4"
+PREFERRED_VERSION_dhcp-forwarder ?= "0.7"
+PREFERRED_VERSION_didiwiki ?= "0.5"
+PREFERRED_VERSION_diethotplug ?= "0.4"
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_diffstat ?= "1.39"
+PREFERRED_VERSION_diffutils ?= "2.8.1"
+PREFERRED_VERSION_dillo ?= "0.8.6"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_dircproxy ?= "1.1.0"
+PREFERRED_VERSION_directfb ?= "1.1.0"
+PREFERRED_VERSION_directfb-examples ?= "1.0.0"
+PREFERRED_VERSION_display-brightness ?= "1.0.0"
+PREFERRED_VERSION_distcc ?= "2.18.3"
+PREFERRED_VERSION_djvulibre ?= "3.5.19"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
+PREFERRED_VERSION_dnsmasq ?= "2.38"
+PREFERRED_VERSION_docbook-utils ?= "0.6.14"
+PREFERRED_VERSION_docbook-utils-native ?= "0.6.14"
+PREFERRED_VERSION_dosbox ?= "0.70"
+PREFERRED_VERSION_dosfstools ?= "2.11"
+PREFERRED_VERSION_dosfstools-native ?= "2.10"
+PREFERRED_VERSION_dpkg ?= "1.13.25"
+PREFERRED_VERSION_dpkg-native ?= "1.13.25"
+PREFERRED_VERSION_driftnet ?= "0.1.6"
+PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
+PREFERRED_VERSION_dropbear ?= "0.51"
+PREFERRED_VERSION_dsniff ?= "2.3"
+PREFERRED_VERSION_duma ?= "2.5.7"
+PREFERRED_VERSION_dvb-image ?= "1.0"
+PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
+PREFERRED_VERSION_dviviewer ?= "1.0.2"
+PREFERRED_VERSION_e2fsprogs ?= "1.38"
+PREFERRED_VERSION_e2fsprogs-libs ?= "1.41.2"
+PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.35"
+PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
+PREFERRED_VERSION_e2tools ?= "0.0.16"
+PREFERRED_VERSION_e2tools-native ?= "0.0.16"
+PREFERRED_VERSION_eb ?= "4.3"
+PREFERRED_VERSION_ebtables ?= "2.0.6"
+PREFERRED_VERSION_eciadsl ?= "0.11"
+PREFERRED_VERSION_libecj-bootstrap ?= "3.3"
+PREFERRED_VERSION_editres ?= "1.0.2"
+PREFERRED_VERSION_eds-feed ?= "0.3.2"
+PREFERRED_VERSION_eel ?= "2.12.2"
+PREFERRED_VERSION_ekg ?= "1.6"
+PREFERRED_VERSION_elfkickers ?= "2.0a"
+PREFERRED_VERSION_elfkickers-native ?= "2.0a"
+PREFERRED_VERSION_elftoaout ?= "2.3"
+PREFERRED_VERSION_elftoaout-native ?= "2.3"
+PREFERRED_VERSION_elfutils ?= "0.127"
+PREFERRED_VERSION_elvis ?= "2.2.0"
+PREFERRED_VERSION_elvis-tiny ?= "2.2.0"
+PREFERRED_VERSION_emacs ?= "20060801"
+PREFERRED_VERSION_emacs-x11 ?= "20060801"
+PREFERRED_VERSION_emelfm2 ?= "0.0.8"
+PREFERRED_VERSION_empathy ?= "0.5"
+PREFERRED_VERSION_emul ?= "1.0.5"
+PREFERRED_VERSION_enca ?= "1.9"
+PREFERRED_VERSION_enchant ?= "1.3.0"
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_enscript ?= "1.6.4"
+PREFERRED_VERSION_entrance ?= "0.9.0.010"
+PREFERRED_VERSION_epiphany ?= "2.19.6"
+PREFERRED_VERSION_erlang-native ?= "R11B.1"
+PREFERRED_VERSION_erlang ?= "R11B.1"
+PREFERRED_VERSION_esmtp ?= "0.5.1"
+PREFERRED_VERSION_esound ?= "0.2.36"
+PREFERRED_VERSION_espgs ?= "8.15.3"
+PREFERRED_VERSION_etherpuppet ?= "0.2"
+PREFERRED_VERSION_ethload ?= "1.2"
+PREFERRED_VERSION_ettercap ?= "0.6.b"
+PREFERRED_VERSION_e-uae ?= "0.8.28"
+PREFERRED_VERSION_eventlog ?= "0.2.5"
+PREFERRED_VERSION_evieext ?= "1.0.2"
+PREFERRED_VERSION_evince ?= "2.23.4"
+# The only e-wm recipe is a cvs one with SRCDATE floating!
+# PREFERRED_VERSION_e-wm ?= "0.16.999.042"
+PREFERRED_VERSION_exiv2 ?= "0.15"
+PREFERRED_VERSION_exmap-console ?= "0.4.1"
+PREFERRED_VERSION_exml ?= "cvs"
+PREFERRED_VERSION_exo ?= "0.3.2"
+PREFERRED_VERSION_expat ?= "2.0.0"
+PREFERRED_VERSION_expat-native ?= "1.95.7"
+PREFERRED_VERSION_expect ?= "5.44.1"
+PREFERRED_VERSION_ez-ipupdate ?= "3.0.10"
+PREFERRED_VERSION_ezx-boot-usb-native ?= "0.1.0"
+PREFERRED_VERSION_ezx-gpiotool ?= "1877"
+PREFERRED_VERSION_faac ?= "1.24"
+PREFERRED_VERSION_faad2 ?= "2.0"
+PREFERRED_VERSION_fakechroot ?= "2.5"
+PREFERRED_VERSION_fakechroot-native ?= "2.5"
+PREFERRED_VERSION_fakeconnect ?= "1.2.1"
+PREFERRED_VERSION_fakeroot ?= "1.9.6"
+PREFERRED_VERSION_fakeroot-native ?= "1.9.6"
+PREFERRED_VERSION_fam ?= "2.7.0"
+PREFERRED_VERSION_farsight ?= "0.1.5"
+PREFERRED_VERSION_fastcgi ?= "2.4.0"
+PREFERRED_VERSION_fastjar-native ?= "0.95"
+PREFERRED_VERSION_fbgetty ?= "0.1.698"
+PREFERRED_VERSION_fbgrab ?= "1.0"
+PREFERRED_VERSION_fbpanel ?= "4.3"
+PREFERRED_VERSION_fbreader ?= "0.8.2a"
+PREFERRED_VERSION_fbset ?= "2.1"
+PREFERRED_VERSION_fbui-utils ?= "0.9.14c"
+PREFERRED_VERSION_fbvncserver ?= "0.9.4"
+PREFERRED_VERSION_fbvncserver-kmodule ?= "0.9.4"
+PREFERRED_VERSION_fceu ?= "0.98.13-pre"
+PREFERRED_VERSION_fconfig ?= "20060419"
+PREFERRED_VERSION_fcron ?= "3.0.2"
+PREFERRED_VERSION_feh ?= "1.2.7"
+PREFERRED_VERSION_fetchmail ?= "6.2.5"
+PREFERRED_VERSION_fftw ?= "3.1.2"
+PREFERRED_VERSION_fftwf ?= "3.1.2"
+PREFERRED_VERSION_fftwl ?= "3.1.2"
+PREFERRED_VERSION_fget ?= "1.3.3"
+PREFERRED_VERSION_figment ?= "0.3.5"
+PREFERRED_VERSION_file ?= "4.21"
+PREFERRED_VERSION_file-native ?= "4.21"
+PREFERRED_VERSION_findutils ?= "4.2.29"
+PREFERRED_VERSION_findutils-native ?= "4.2.29"
+PREFERRED_VERSION_firefox ?= "3.0.1"
+PREFERRED_VERSION_fis ?= "1.0"
+PREFERRED_VERSION_fish ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_flac ?= "1.1.2"
+PREFERRED_VERSION_flex ?= "2.5.31"
+PREFERRED_VERSION_flexis-zaurus ?= "1.0.0"
+PREFERRED_VERSION_flex-native ?= "2.5.31"
+PREFERRED_VERSION_flnx ?= "0.18"
+PREFERRED_VERSION_fltk ?= "1.1.7"
+PREFERRED_VERSION_flumotion ?= "0.4.1"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2"
+PREFERRED_VERSION_fontconfig ?= "2.4.1"
+PREFERRED_VERSION_fontconfig-native ?= "2.3.91"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
+PREFERRED_VERSION_fontsproto-native ?= "2.0.2"
+PREFERRED_VERSION_fonttosfnt ?= "1.0.3"
+PREFERRED_VERSION_foonas-init ?= "0.10"
+PREFERRED_VERSION_foonas-packages ?= "1.0"
+PREFERRED_VERSION_fortune-mod ?= "1.99.1"
+PREFERRED_VERSION_fpdf ?= "1.53"
+PREFERRED_VERSION_free42-vga ?= "1.4.41"
+PREFERRED_VERSION_freeciv ?= "2.0.8"
+PREFERRED_VERSION_freedoom ?= "0.3"
+PREFERRED_VERSION_freedroid ?= "1.0.2"
+PREFERRED_VERSION_freenote ?= "1.12.0"
+PREFERRED_VERSION_freeze ?= "1.0"
+PREFERRED_VERSION_frodo ?= "4.2"
+PREFERRED_VERSION_froot ?= "0.7.1"
+PREFERRED_VERSION_frotz ?= "2.43"
+PREFERRED_VERSION_frozen-bubble ?= "1.0.0"
+PREFERRED_VERSION_fsi-client ?= "20040803"
+PREFERRED_VERSION_ftdi-eeprom ?= "0.2"
+PREFERRED_VERSION_ftdi-eeprom-native ?= "0.2"
+PREFERRED_VERSION_ftpd-topfield ?= "0.7.4"
+PREFERRED_VERSION_fuse ?= "2.6.5"
+PREFERRED_VERSION_fuse-module ?= "2.6.5"
+PREFERRED_VERSION_fush ?= "0.9.0"
+PREFERRED_VERSION_fxload ?= "0.0.20020411"
+PREFERRED_VERSION_g15daemon ?= "1.2.6a"
+PREFERRED_VERSION_gail ?= "1.20.0"
+PREFERRED_VERSION_gaim ?= "1.5.0"
+PREFERRED_VERSION_gal-2.0 ?= "1.99.11"
+PREFERRED_VERSION_gal-2.1 ?= "2.1.10"
+PREFERRED_VERSION_galago-daemon ?= "0.3.4"
+PREFERRED_VERSION_galculator ?= "1.2.3"
+PREFERRED_VERSION_gallery ?= "1.5.5"
+PREFERRED_VERSION_gamin ?= "0.1.8"
+PREFERRED_VERSION_gammu ?= "1.17.0"
+PREFERRED_VERSION_gawk ?= "3.1.4"
+PREFERRED_VERSION_gawk-native ?= "3.1.4"
+PREFERRED_VERSION_gcalctool ?= "5.7.32"
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_gconf ?= "2.6.1"
+PREFERRED_VERSION_gconf-native ?= "2.6.1"
+PREFERRED_VERSION_gd ?= "2.0.33"
+PREFERRED_VERSION_gdado ?= "2.2"
+PREFERRED_VERSION_gdal ?= "1.3.2"
+PREFERRED_VERSION_gdb ?= "6.8"
+PREFERRED_VERSION_gdb-cross ?= "6.8"
+PREFERRED_VERSION_gdb-cross-sdk ?= "6.8"
+PREFERRED_VERSION_gdbm ?= "1.8.3"
+PREFERRED_VERSION_gdbm-native ?= "1.8.3"
+PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.12.11"
+PREFERRED_VERSION_gdm ?= "2.14.9"
+PREFERRED_VERSION_geda ?= "20050820"
+PREFERRED_VERSION_geda-gattrib ?= "20050820"
+PREFERRED_VERSION_geda-gschem ?= "20050820"
+PREFERRED_VERSION_geda-gsymcheck ?= "20050820"
+PREFERRED_VERSION_geda-symbols ?= "20050820"
+PREFERRED_VERSION_geda-utils ?= "20050820"
+PREFERRED_VERSION_gemdropx ?= "0.9"
+PREFERRED_VERSION_genboot-native ?= "1.0"
+PREFERRED_VERSION_genext2fs ?= "1.3"
+PREFERRED_VERSION_genext2fs-native ?= "1.3"
+PREFERRED_VERSION_genlist ?= "1.0"
+PREFERRED_VERSION_geode-accessbus5536 ?= "2.6.11"
+PREFERRED_VERSION_geode-aeslx ?= "2.6.11"
+PREFERRED_VERSION_geode-alsa5536 ?= "2.6.11"
+PREFERRED_VERSION_gettext ?= "0.17"
+PREFERRED_VERSION_gettext-native ?= "0.17"
+PREFERRED_VERSION_gftp ?= "2.0.18"
+PREFERRED_VERSION_ghettotooth ?= "1.0"
+PREFERRED_VERSION_giac ?= "0.5.0"
+PREFERRED_VERSION_giblib ?= "1.2.4"
+PREFERRED_VERSION_gif2png ?= "2.5.1"
+PREFERRED_VERSION_gift ?= "0.11.5"
+PREFERRED_VERSION_giftcurs ?= "0.6.2"
+PREFERRED_VERSION_gimp ?= "2.3.19"
+PREFERRED_VERSION_ginspector ?= "20050529"
+PREFERRED_VERSION_git ?= "1.6.0.4"
+PREFERRED_VERSION_git-native ?= "1.6.0.4"
+PREFERRED_VERSION_gizmod ?= "2.3"
+PREFERRED_VERSION_gkrellm ?= "2.2.10"
+PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
+PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
+PREFERRED_VERSION_glib-2.0 ?= "2.16.4"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_glibmm ?= "2.12.10"
+PREFERRED_VERSION_glider ?= "1.0.0"
+PREFERRED_VERSION_gloox ?= "0.8.9"
+PREFERRED_VERSION_glproto ?= "1.4.8"
+PREFERRED_VERSION_glrr ?= "20050529"
+PREFERRED_VERSION_glrr-widgets ?= "20050529"
+PREFERRED_VERSION_glurp ?= "0.11.3"
+PREFERRED_VERSION_gmailfs ?= "0.7.3"
+PREFERRED_VERSION_gmp ?= "4.2.2"
+PREFERRED_VERSION_gmpc ?= "0.13.0"
+PREFERRED_VERSION_gmp-native ?= "4.2.2"
+PREFERRED_VERSION_gnash ?= "0.8.3"
+PREFERRED_VERSION_gnocky ?= "0.0.3"
+PREFERRED_VERSION_gnokii ?= "0.6.14"
+PREFERRED_VERSION_gnomebaker ?= "0.6.0"
+PREFERRED_VERSION_gnome-common ?= "2.20.0"
+PREFERRED_VERSION_gnome-cups-manager ?= "0.31"
+PREFERRED_VERSION_gnome-desktop ?= "2.18.3"
+PREFERRED_VERSION_gnome-doc-utils ?= "0.12.0"
+PREFERRED_VERSION_gnome-games ?= "2.6.1"
+PREFERRED_VERSION_gnome-icon-theme ?= "2.22.0"
+PREFERRED_VERSION_gnome-keyring ?= "2.20.0"
+PREFERRED_VERSION_gnome-menus ?= "2.16.1"
+PREFERRED_VERSION_gnome-mime-data ?= "2.18.0"
+PREFERRED_VERSION_gnome-panel ?= "2.18.1"
+PREFERRED_VERSION_gnome-power ?= "0.0.5"
+PREFERRED_VERSION_gnome-power-manager ?= "2.18.3"
+PREFERRED_VERSION_gnomesword ?= "2.1.2"
+PREFERRED_VERSION_gnome-themes ?= "2.6.2"
+PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
+PREFERRED_VERSION_gnome-vfs-extras ?= "0.99.13"
+PREFERRED_VERSION_gnome-vfs-obexftp ?= "0.4"
+PREFERRED_VERSION_gnuchess ?= "5.05"
+PREFERRED_VERSION_gnumeric ?= "1.8.4"
+PREFERRED_VERSION_gnupg ?= "1.4.2.2"
+PREFERRED_VERSION_gnuplot ?= "4.2.2"
+PREFERRED_VERSION_gnuradio ?= "3.0.4"
+PREFERRED_VERSION_gnutls ?= "1.6.3"
+PREFERRED_VERSION_gob2 ?= "2.0.14"
+PREFERRED_VERSION_gobby ?= "0.4.1"
+PREFERRED_VERSION_goffice ?= "0.2.1"
+PREFERRED_VERSION_gparted ?= "0.3.3"
+PREFERRED_VERSION_gpdf ?= "2.10.0"
+PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
+PREFERRED_VERSION_gpe-announce ?= "0.13"
+PREFERRED_VERSION_gpe-applauncher ?= "0.11"
+PREFERRED_VERSION_gpe-appmgr ?= "2.8"
+PREFERRED_VERSION_gpe-autostarter ?= "0.12"
+PREFERRED_VERSION_gpe-beam ?= "0.2.9"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-bootsplash ?= "1.15"
+PREFERRED_VERSION_gpe-bootsplash-theme-e ?= "1.0"
+PREFERRED_VERSION_gpe-bootsplash-theme-gpephone ?= "1.0"
+PREFERRED_VERSION_gpe-buttonbox ?= "0.5"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-calendar ?= "0.91"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
+PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-confd ?= "0.16"
+PREFERRED_VERSION_gpe-contacts ?= "0.47"
+PREFERRED_VERSION_gpe-contacts-hildon ?= "0.42"
+PREFERRED_VERSION_gpe-dm ?= "0.51"
+PREFERRED_VERSION_gpe-edit ?= "0.40"
+PREFERRED_VERSION_gpe-expenses ?= "0.0.6"
+PREFERRED_VERSION_gpe-filemanager ?= "0.30"
+PREFERRED_VERSION_gpe-fsi ?= "0.1"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-helpviewer ?= "1.0"
+PREFERRED_VERSION_gpe-icons ?= "0.25"
+PREFERRED_VERSION_gpe-irc ?= "0.08"
+PREFERRED_VERSION_gpe-keylock ?= "0.12"
+PREFERRED_VERSION_gpe-life ?= "0.2"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+PREFERRED_VERSION_gpe-login ?= "0.91"
+PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
+PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-nmf ?= "0.22"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-ownerinfo ?= "0.28"
+PREFERRED_VERSION_gpe-package ?= "0.4"
+PREFERRED_VERSION_gpe-phonepanel ?= "0.9"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
+PREFERRED_VERSION_gpe-question ?= "0.04"
+PREFERRED_VERSION_gperf ?= "3.0.3"
+PREFERRED_VERSION_gperf-native ?= "3.0.3"
+PREFERRED_VERSION_gperiodic ?= "1.3.3"
+PREFERRED_VERSION_gpe-scap ?= "1.3"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
+PREFERRED_VERSION_gpe-session-scripts-phone ?= "0.67"
+PREFERRED_VERSION_gpe-shield ?= "0.9"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-snes ?= "0.2"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_gpesyncd ?= "2.0"
+PREFERRED_VERSION_gpe-synctool ?= "0.2"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gpe-theme-clearlooks ?= "0.3"
+PREFERRED_VERSION_gpe-theme-e17 ?= "0.1"
+PREFERRED_VERSION_gpe-theme-foxbox ?= "0.1"
+PREFERRED_VERSION_gpe-theme-industrial ?= "0.2"
+PREFERRED_VERSION_gpe-today ?= "0.11"
+PREFERRED_VERSION_gpe-todo ?= "0.56"
+PREFERRED_VERSION_gpe-todo-hildon ?= "0.55"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.43"
+PREFERRED_VERSION_gpe-windowlist ?= "0.1"
+PREFERRED_VERSION_gpgme ?= "1.1.4"
+PREFERRED_VERSION_gphoto2 ?= "2.4.0"
+PREFERRED_VERSION_gpicview ?= "0.1.5"
+PREFERRED_VERSION_gpm ?= "1.20.1"
+PREFERRED_VERSION_gpp ?= "2.21"
+PREFERRED_VERSION_gpsbabel ?= "1.3.3"
+PREFERRED_VERSION_gpsd ?= "2.38"
+PREFERRED_VERSION_gpsdrive ?= "2.10pre4"
+PREFERRED_VERSION_gpstk ?= "1.2"
+PREFERRED_VERSION_gqview ?= "2.1.1"
+PREFERRED_VERSION_granule ?= "1.2.4"
+PREFERRED_VERSION_grass ?= "6.2.1"
+PREFERRED_VERSION_grep ?= "2.5.1"
+PREFERRED_VERSION_grep-native ?= "2.5.1"
+PREFERRED_VERSION_grip ?= "3.2.0"
+PREFERRED_VERSION_groff ?= "1.19.2"
+PREFERRED_VERSION_gs ?= "8.16"
+PREFERRED_VERSION_gsl ?= "1.4"
+PREFERRED_VERSION_gsmmux ?= "alpha-2"
+PREFERRED_VERSION_gsoap ?= "2.7.7"
+PREFERRED_VERSION_gsoap-native ?= "2.7.7"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_gspcav1 ?= "20070110"
+PREFERRED_VERSION_gst-ffmpeg ?= "0.10.6"
+PREFERRED_VERSION_gst-meta-base ?= "0.10"
+PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7"
+PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6"
+PREFERRED_VERSION_gst-plugins-base ?= "0.10.22"
+PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1"
+PREFERRED_VERSION_gst-plugins-good ?= "0.10.13"
+PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.10"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gstreamer ?= "0.10.22"
+PREFERRED_VERSION_gthumb ?= "2.6.9"
+PREFERRED_VERSION_gtk+ ?= "2.12.11"
+PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2"
+PREFERRED_VERSION_gtk-doc ?= "1.0"
+PREFERRED_VERSION_gtk-doc-native ?= "1.0"
+PREFERRED_VERSION_gtk-engines ?= "2.7.4"
+PREFERRED_VERSION_gtkhtml-2.0 ?= "2.6.3"
+PREFERRED_VERSION_gtkhtml-3.0 ?= "3.0.10"
+PREFERRED_VERSION_gtkhtml-3.1 ?= "3.1.16"
+PREFERRED_VERSION_gtkhtml-3.6 ?= "3.6.2"
+PREFERRED_VERSION_gtkhtml-3.8 ?= "3.8.2"
+PREFERRED_VERSION_gtkimageview ?= "1.3.0"
+PREFERRED_VERSION_gtk-industrial-engine ?= "0.2.46.0"
+PREFERRED_VERSION_gtkmathview ?= "0.7.6"
+PREFERRED_VERSION_gtkmm ?= "2.10.10"
+PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
+PREFERRED_VERSION_gtk-sharp ?= "2.10.2"
+PREFERRED_VERSION_gtk-smooth-engine ?= "0.5.8"
+PREFERRED_VERSION_gtksourceview1 ?= "1.7.2"
+PREFERRED_VERSION_gtkterm2 ?= "0.2.3"
+PREFERRED_VERSION_gtk-xfce-engine ?= "2.4.1"
+PREFERRED_VERSION_gtracer ?= "0.0.10"
+PREFERRED_VERSION_guichan ?= "0.7.1"
+PREFERRED_VERSION_guile ?= "1.6.4"
+PREFERRED_VERSION_guile-native ?= "1.8.2"
+PREFERRED_VERSION_gutenprint ?= "5.1.3"
+PREFERRED_VERSION_gutenprint-native ?= "5.1.3"
+PREFERRED_VERSION_gvim ?= "7.0"
+PREFERRED_VERSION_gweled ?= "0.5"
+PREFERRED_VERSION_gxine ?= "0.4.1enhanced"
+PREFERRED_VERSION_gzip ?= "1.3.5"
+PREFERRED_VERSION_hal ?= "0.5.11"
+PREFERRED_VERSION_hal-info ?= "20080508"
+PREFERRED_VERSION_haserl ?= "0.8.0"
+PREFERRED_VERSION_havp ?= "0.86"
+PREFERRED_VERSION_hdparm ?= "6.9"
+PREFERRED_VERSION_helloworld ?= "1.0.0"
+PREFERRED_VERSION_hexatrolic ?= "1.0beta3"
+PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4"
+PREFERRED_VERSION_hfsutils ?= "3.2.6"
+PREFERRED_VERSION_hibernate-script ?= "1.12"
+PREFERRED_VERSION_hicolor-icon-theme ?= "0.10"
+PREFERRED_VERSION_hiker ?= "0.9.1"
+PREFERRED_VERSION_hildon-base-lib ?= "0.11.1"
+PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2"
+PREFERRED_VERSION_hildon-fm ?= "0.9.1-2"
+PREFERRED_VERSION_hildon-home ?= "0.8.20-2"
+PREFERRED_VERSION_hildon-initscripts ?= "0.8.14-1"
+PREFERRED_VERSION_hildon-lgpl ?= "0.12.1"
+PREFERRED_VERSION_hildon-libs ?= "0.15.1"
+PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2"
+PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1"
+PREFERRED_VERSION_hildon-thumbnail ?= "0.11"
+PREFERRED_VERSION_hostap-conf ?= "1.0"
+PREFERRED_VERSION_hostap-daemon ?= "0.4.4"
+PREFERRED_VERSION_hostap-utils ?= "0.4.7"
+PREFERRED_VERSION_hotplug-dbus ?= "0.9"
+PREFERRED_VERSION_hotplug-ng ?= "002"
+PREFERRED_VERSION_hotplug-qcop ?= "cvs"
+PREFERRED_VERSION_howl ?= "1.0.0"
+PREFERRED_VERSION_hsetroot ?= "1.0.2"
+PREFERRED_VERSION_htb-init ?= "0.8.5"
+PREFERRED_VERSION_httppc ?= "0.8.5"
+PREFERRED_VERSION_htun ?= "0.9.5"
+PREFERRED_VERSION_hvsc ?= "45"
+PREFERRED_VERSION_hwdata ?= "0.191"
+PREFERRED_VERSION_hydra ?= "4.5"
+PREFERRED_VERSION_iaimaster ?= "0.5"
+PREFERRED_VERSION_iana-etc ?= "2.20"
+PREFERRED_VERSION_ica-bin ?= "8.0"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_icebloxx ?= "1.0.0"
+PREFERRED_VERSION_icecc-create-env ?= "0.1"
+PREFERRED_VERSION_icewm ?= "1.2.30"
+PREFERRED_VERSION_icmpquery ?= "1.03"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_icu ?= "3.6"
+PREFERRED_VERSION_icu-native ?= "3.6"
+PREFERRED_VERSION_id3lib ?= "3.8.3"
+PREFERRED_VERSION_ifplugd ?= "0.25"
+PREFERRED_VERSION_ifupdown ?= "0.6.8"
+PREFERRED_VERSION_iksemel ?= "1.2"
+PREFERRED_VERSION_imagemagick ?= "6.3.5-10"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_imlib ?= "1.9.15"
+PREFERRED_VERSION_imlib2 ?= "1.4.0.002"
+PREFERRED_VERSION_imposter ?= "0.3"
+PREFERRED_VERSION_inetutils ?= "1.4.2"
+PREFERRED_VERSION_initscripts ?= "1.0"
+PREFERRED_VERSION_initscripts-openprotium ?= "1.0"
+PREFERRED_VERSION_initscripts-slugos ?= "1.0"
+PREFERRED_VERSION_inkscape ?= "0.43"
+PREFERRED_VERSION_inkwp ?= "0.1.1"
+PREFERRED_VERSION_inotify-tools ?= "2.1"
+PREFERRED_VERSION_inputproto ?= "1.4.4"
+PREFERRED_VERSION_insttrain ?= "1.0.5"
+PREFERRED_VERSION_interbench ?= "0.30"
+PREFERRED_VERSION_intercom ?= "0.15"
+PREFERRED_VERSION_intltool ?= "0.35.5"
+PREFERRED_VERSION_intltool-native ?= "0.35.5"
+PREFERRED_VERSION_iozone3 ?= "263"
+PREFERRED_VERSION_ipaq-sleep ?= "0.9"
+PREFERRED_VERSION_ipatience ?= "0.1"
+PREFERRED_VERSION_iperf ?= "2.0.2"
+PREFERRED_VERSION_ipkg ?= "0.99.163"
+PREFERRED_VERSION_ipkg-collateral ?= "1.0"
+PREFERRED_VERSION_ipkg-native ?= "0.99.163"
+PREFERRED_VERSION_iproute2 ?= "2.6.22"
+PREFERRED_VERSION_ipsec-tools ?= "0.6.7"
+PREFERRED_VERSION_iptables ?= "1.3.8"
+PREFERRED_VERSION_iptstate ?= "2.2.1"
+PREFERRED_VERSION_iputils ?= "20020927"
+PREFERRED_VERSION_iqnotes ?= "2.0.99-2.1.0rc1"
+PREFERRED_VERSION_ircp ?= "0.3"
+PREFERRED_VERSION_irdadump ?= "0.9.16"
+PREFERRED_VERSION_irda-utils ?= "0.9.16"
+PREFERRED_VERSION_irk-belkin ?= "0.11"
+PREFERRED_VERSION_irk-targus ?= "0.11.0"
+PREFERRED_VERSION_irssi ?= "0.8.10"
+PREFERRED_VERSION_iso-codes ?= "1.4"
+PREFERRED_VERSION_ixp4xx-npe-native ?= "2.4"
+PREFERRED_VERSION_jack ?= "0.103.0"
+PREFERRED_VERSION_jamvm ?= "1.5.2"
+PREFERRED_VERSION_jards ?= "1.0"
+PREFERRED_VERSION_jhead ?= "2.6.0"
+PREFERRED_VERSION_jikes ?= "1.22"
+PREFERRED_VERSION_jikes-native ?= "1.21"
+PREFERRED_VERSION_joe ?= "3.1"
+PREFERRED_VERSION_js ?= "1.5"
+PREFERRED_VERSION_juce ?= "1.29"
+PREFERRED_VERSION_justreader ?= "2.0k"
+PREFERRED_VERSION_kaffe-gtk ?= "1.1.5"
+PREFERRED_VERSION_kaffeh-native ?= "1.1.5"
+PREFERRED_VERSION_kakasi ?= "2.3.4"
+PREFERRED_VERSION_kakasi-native ?= "2.3.4"
+PREFERRED_VERSION_kanatest ?= "0.3.6"
+PREFERRED_VERSION_kazehakase ?= "0.4.7"
+PREFERRED_VERSION_kbd ?= "1.12"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_kdepimpi ?= "2.2.7"
+PREFERRED_VERSION_kernbench ?= "0.41"
+PREFERRED_VERSION_kernel-module-wlags49-h1-cs ?= "718"
+PREFERRED_VERSION_kernel-module-wlags49-h2-cs ?= "718"
+PREFERRED_VERSION_kexec-tools ?= "1.101"
+PREFERRED_VERSION_keylaunch ?= "2.0.10"
+PREFERRED_VERSION_keymap-locales ?= "1.0"
+PREFERRED_VERSION_keymaps ?= "1.0"
+PREFERRED_VERSION_keyring ?= "0.6.8"
+PREFERRED_VERSION_kf ?= "0.5.4.1"
+PREFERRED_VERSION_kismet ?= "2007-10-R1"
+PREFERRED_VERSION_klimt ?= "0.6.1"
+PREFERRED_VERSION_knights ?= "1.14"
+PREFERRED_VERSION_konqueror-embedded ?= "20070212"
+PREFERRED_VERSION_kpengine ?= "0.1"
+PREFERRED_VERSION_kphonepi ?= "1.0.0"
+PREFERRED_VERSION_kstars-embedded ?= "0.8.5"
+PREFERRED_VERSION_ksymoops ?= "2.4.9"
+PREFERRED_VERSION_ktimetrackerpi ?= "0.9.7"
+PREFERRED_VERSION_kxml2 ?= "2.3.0"
+PREFERRED_VERSION_labyrinth ?= "0.7"
+PREFERRED_VERSION_lame ?= "3.96.1"
+PREFERRED_VERSION_lbreakout2 ?= "2.6beta"
+PREFERRED_VERSION_lcdproc ?= "0.5.1"
+PREFERRED_VERSION_lcms ?= "1.15"
+PREFERRED_VERSION_leafpad ?= "0.8.9"
+PREFERRED_VERSION_led ?= "0.0cvs20060814"
+PREFERRED_VERSION_lemon ?= "3.3.5"
+PREFERRED_VERSION_lemon-native ?= "3.3.5"
+PREFERRED_VERSION_less ?= "406"
+PREFERRED_VERSION_lessertunjo ?= "0.0.10"
+PREFERRED_VERSION_lftp ?= "3.5.1"
+PREFERRED_VERSION_liba52 ?= "0.7.4"
+PREFERRED_VERSION_libaal ?= "1.0.4"
+PREFERRED_VERSION_libabenabler ?= "0.1"
+PREFERRED_VERSION_libabenabler2 ?= "1.0"
+PREFERRED_VERSION_libaio ?= "0.3.106"
+PREFERRED_VERSION_libaio-oracle ?= "0.3.0"
+PREFERRED_VERSION_libalgorithm-diff-perl ?= "1.1902"
+PREFERRED_VERSION_libalgorithm-diff-perl-native ?= "1.1902"
+PREFERRED_VERSION_libao ?= "0.8.6"
+PREFERRED_VERSION_libao-alsa ?= "0.8.6"
+PREFERRED_VERSION_libao-plugin-alsa ?= "0.8.6"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
+PREFERRED_VERSION_libarchive-tar-perl ?= "1.30"
+PREFERRED_VERSION_libarchive-tar-perl-native ?= "1.30"
+PREFERRED_VERSION_libarena ?= "0.2"
+PREFERRED_VERSION_libart-lgpl ?= "2.3.19"
+PREFERRED_VERSION_libassa ?= "3.4.2"
+PREFERRED_VERSION_libassuan ?= "0.6.9"
+PREFERRED_VERSION_libatomics-ops ?= "1.2"
+PREFERRED_VERSION_libbedic ?= "1.0"
+PREFERRED_VERSION_libbonobo ?= "2.22.0"
+PREFERRED_VERSION_libbonoboui ?= "2.18.0"
+PREFERRED_VERSION_libcache-cache-perl ?= "1.05"
+PREFERRED_VERSION_libcache-cache-perl-native ?= "1.05"
+PREFERRED_VERSION_libcalenabler ?= "1.0"
+PREFERRED_VERSION_libcap ?= "1.10"
+PREFERRED_VERSION_libccaudio2 ?= "0.9.0"
+PREFERRED_VERSION_libcdaudio ?= "0.99.12p2"
+PREFERRED_VERSION_libcgicc ?= "3.2.3"
+PREFERRED_VERSION_libchenabler ?= "0.1"
+PREFERRED_VERSION_libclass-container-perl ?= "0.12"
+PREFERRED_VERSION_libclass-container-perl-native ?= "0.12"
+PREFERRED_VERSION_libclass-data-inheritable-perl ?= "0.06"
+PREFERRED_VERSION_libclass-data-inheritable-perl-native ?= "0.06"
+PREFERRED_VERSION_libcompress-zlib-perl ?= "1.42"
+PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42"
+PREFERRED_VERSION_libcontactsdb ?= "0.5"
+PREFERRED_VERSION_libcroco ?= "0.6.1"
+PREFERRED_VERSION_libcwd ?= "0.99.47"
+PREFERRED_VERSION_libdaemon ?= "0.13"
+PREFERRED_VERSION_libdata-optlist-perl ?= "0.101"
+PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101"
+PREFERRED_VERSION_libdbi ?= "0.7.2"
+PREFERRED_VERSION_libdbi-drivers ?= "0.7.1"
+PREFERRED_VERSION_libddmpeg ?= "1.5"
+PREFERRED_VERSION_libdes ?= "4.01"
+PREFERRED_VERSION_libdevel-stacktrace-perl ?= "1.13"
+PREFERRED_VERSION_libdevel-stacktrace-perl-native ?= "1.13"
+PREFERRED_VERSION_libdictionary ?= "1.0"
+PREFERRED_VERSION_libdigest-sha1-perl ?= "2.11"
+PREFERRED_VERSION_libdigest-sha1-perl-native ?= "2.11"
+PREFERRED_VERSION_libdisplaymigration ?= "0.99"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libdotdesktop ?= "0.11"
+PREFERRED_VERSION_libdrm ?= "2.3.0"
+PREFERRED_VERSION_libdvb ?= "0.5.5.1"
+PREFERRED_VERSION_libdvdnav ?= "0.1.10"
+PREFERRED_VERSION_libdvdread ?= "0.9.6"
+PREFERRED_VERSION_libedit ?= "20050118"
+PREFERRED_VERSION_libeina ?= "0.96.7"
+PREFERRED_VERSION_libelf ?= "0.8.6"
+PREFERRED_VERSION_liberror-perl ?= "0.17004"
+PREFERRED_VERSION_liberror-perl-native ?= "0.17004"
+PREFERRED_VERSION_libesmtp ?= "1.0.4"
+PREFERRED_VERSION_libevent ?= "1.1a"
+PREFERRED_VERSION_libeventdb ?= "0.90"
+PREFERRED_VERSION_libevnet ?= "0.3.1"
+PREFERRED_VERSION_libexception-class-perl ?= "1.23"
+PREFERRED_VERSION_libexception-class-perl-native ?= "1.23"
+PREFERRED_VERSION_libexif ?= "0.6.13"
+PREFERRED_VERSION_libextutils-cbuilder-perl ?= "0.18"
+PREFERRED_VERSION_libextutils-cbuilder-perl-native ?= "0.18"
+PREFERRED_VERSION_libextutils-depends-perl ?= "0.205"
+PREFERRED_VERSION_libextutils-depends-perl-native ?= "0.205"
+PREFERRED_VERSION_libextutils-parsexs-perl ?= "2.16"
+PREFERRED_VERSION_libextutils-parsexs-perl-native ?= "2.16"
+PREFERRED_VERSION_libextutils-pkgconfig-perl ?= "1.07"
+PREFERRED_VERSION_libextutils-pkgconfig-perl-native ?= "1.07"
+PREFERRED_VERSION_libflv ?= "0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
+PREFERRED_VERSION_libfribidi ?= "0.10.4"
+PREFERRED_VERSION_libfs ?= "1.0.0"
+PREFERRED_VERSION_libftdi ?= "0.9"
+PREFERRED_VERSION_libftdi-native ?= "0.9"
+PREFERRED_VERSION_libg15 ?= "1.2.1"
+PREFERRED_VERSION_libg15render ?= "1.2"
+PREFERRED_VERSION_libgalago ?= "0.3.3"
+PREFERRED_VERSION_libgc ?= "6.7"
+PREFERRED_VERSION_libgcrypt ?= "1.4.0"
+PREFERRED_VERSION_libgeda ?= "20050820"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
+PREFERRED_VERSION_libglade ?= "2.6.2"
+PREFERRED_VERSION_libglademm ?= "2.4.1"
+PREFERRED_VERSION_libgmime ?= "2.1.7"
+PREFERRED_VERSION_libgnome ?= "2.18.0"
+PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
+PREFERRED_VERSION_libgnomecups ?= "0.2.2"
+PREFERRED_VERSION_libgnomeprint ?= "2.8.2"
+PREFERRED_VERSION_libgnomeprintui ?= "2.8.2"
+PREFERRED_VERSION_libgnomeui ?= "2.18.1"
+PREFERRED_VERSION_libgpelaunch ?= "0.14"
+PREFERRED_VERSION_libgpephone ?= "0.4"
+PREFERRED_VERSION_libgpepimc ?= "0.9"
+PREFERRED_VERSION_libgpepimc-hildon ?= "0.5"
+PREFERRED_VERSION_libgpevtype ?= "0.50"
+PREFERRED_VERSION_libgpewidget ?= "0.117"
+PREFERRED_VERSION_libgpewidget-hildon ?= "0.102"
+PREFERRED_VERSION_libgpg-error ?= "1.4"
+PREFERRED_VERSION_libgphoto2 ?= "2.4.0"
+PREFERRED_VERSION_libgpsbt ?= "0.1"
+PREFERRED_VERSION_libgpsmgr ?= "0.1"
+PREFERRED_VERSION_libgsf ?= "1.14.2"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_libgtkinput ?= "0.3"
+PREFERRED_VERSION_libgtkstylus ?= "0.3"
+PREFERRED_VERSION_libhal-nm ?= "0.0.2"
+PREFERRED_VERSION_libhandoff ?= "0.1"
+PREFERRED_VERSION_libhangul ?= "0.0.4"
+PREFERRED_VERSION_libhildonfm ?= "1.9.41"
+PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
+PREFERRED_VERSION_libhildonmime ?= "1.9.5"
+PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
+PREFERRED_VERSION_libiac ?= "1.0"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_libiconv ?= "1.11"
+PREFERRED_VERSION_libid3 ?= "1.1"
+PREFERRED_VERSION_libidl ?= "0.8.10"
+PREFERRED_VERSION_libidl-native ?= "0.8.10"
+PREFERRED_VERSION_libidn ?= "0.5.19"
+PREFERRED_VERSION_libim ?= "0.2"
+PREFERRED_VERSION_libintl-perl ?= "1.16"
+PREFERRED_VERSION_libintl-perl-native ?= "1.16"
+PREFERRED_VERSION_libio-zlib-perl ?= "1.04"
+PREFERRED_VERSION_libio-zlib-perl-native ?= "1.04"
+PREFERRED_VERSION_libjingle-tapioca ?= "0.3.10"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_liblipsevent ?= "0.1"
+PREFERRED_VERSION_liblocale-gettext-perl ?= "1.05"
+PREFERRED_VERSION_liblocale-gettext-perl-native ?= "1.05"
+PREFERRED_VERSION_liblockfile ?= "1.06"
+PREFERRED_VERSION_liblog-dispatch-perl ?= "2.13"
+PREFERRED_VERSION_liblog-dispatch-perl-native ?= "2.13"
+PREFERRED_VERSION_liblog-log4perl-perl ?= "1.06"
+PREFERRED_VERSION_liblog-log4perl-perl-native ?= "1.06"
+PREFERRED_VERSION_libmad ?= "0.15.1b"
+PREFERRED_VERSION_libmail-sendmail-perl ?= "0.79"
+PREFERRED_VERSION_libmailwrapper ?= "1.2.3"
+PREFERRED_VERSION_libmatchbox ?= "1.9"
+PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
+PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
+PREFERRED_VERSION_libmng ?= "1.0.8"
+PREFERRED_VERSION_libmodplug ?= "0.8"
+PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
+PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805"
+PREFERRED_VERSION_libmrss ?= "0.17.2"
+PREFERRED_VERSION_libmsgenabler ?= "1.0"
+PREFERRED_VERSION_libmusicbrainz ?= "2.1.4"
+PREFERRED_VERSION_libnet ?= "1.1.2.1"
+PREFERRED_VERSION_libnetfilter-queue ?= "0.0.13"
+PREFERRED_VERSION_libnet-ip-perl ?= "1.25"
+PREFERRED_VERSION_libnet-ip-perl-native ?= "1.25"
+PREFERRED_VERSION_libnetserver-generic-perl ?= "1.03"
+PREFERRED_VERSION_libnfnetlink ?= "0.0.30"
+PREFERRED_VERSION_libnids ?= "1.18"
+PREFERRED_VERSION_libnotify ?= "0.4.4"
+PREFERRED_VERSION_libnss-mdns ?= "0.9"
+PREFERRED_VERSION_libnxml ?= "0.16"
+PREFERRED_VERSION_libogg ?= "1.1.3"
+PREFERRED_VERSION_liboil ?= "0.3.15"
+PREFERRED_VERSION_libol ?= "0.3.18"
+PREFERRED_VERSION_liboldx ?= "1.0.1"
+PREFERRED_VERSION_liboop ?= "1.0"
+PREFERRED_VERSION_libopenraw ?= "0.0.2"
+PREFERRED_VERSION_libopensync ?= "0.22"
+PREFERRED_VERSION_libopensync-plugin-evo2-sync ?= "0.22"
+PREFERRED_VERSION_libopensync-plugin-file ?= "0.18"
+PREFERRED_VERSION_libopensync-plugin-file-sync ?= "0.22"
+PREFERRED_VERSION_libopensync-plugin-gpe ?= "0.18"
+PREFERRED_VERSION_libopensync-plugin-irmc ?= "0.18"
+PREFERRED_VERSION_libopensync-plugin-irmc-sync ?= "0.22"
+PREFERRED_VERSION_libosso ?= "1.20"
+PREFERRED_VERSION_libosso-gsf ?= "1.11.10.4"
+PREFERRED_VERSION_libosso-help ?= "2.1.2"
+PREFERRED_VERSION_libpam ?= "0.79"
+PREFERRED_VERSION_libparams-util-perl ?= "0.20"
+PREFERRED_VERSION_libparams-util-perl-native ?= "0.20"
+PREFERRED_VERSION_libparams-validate-perl ?= "0.86"
+PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86"
+PREFERRED_VERSION_libpcap ?= "0.9.8"
+PREFERRED_VERSION_libpcl ?= "1.4"
+PREFERRED_VERSION_libpcre ?= "7.6"
+PREFERRED_VERSION_libpcre-native ?= "7.6"
+PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
+PREFERRED_VERSION_libpng ?= "1.2.20"
+PREFERRED_VERSION_libpng-native ?= "1.2.20"
+PREFERRED_VERSION_libpthread-stubs ?= "0.1"
+PREFERRED_VERSION_libqanava ?= "0.0.7"
+PREFERRED_VERSION_libqtaux2 ?= "1.2.3"
+PREFERRED_VERSION_librcf ?= "0.4"
+PREFERRED_VERSION_librecord ?= "0.1"
+PREFERRED_VERSION_librecord2 ?= "0.1"
+PREFERRED_VERSION_librewrite ?= "0.1"
+PREFERRED_VERSION_librsvg ?= "2.16.1"
+PREFERRED_VERSION_librsync ?= "0.9.7"
+PREFERRED_VERSION_librtaudio ?= "3.0.1"
+PREFERRED_VERSION_libsamplerate0 ?= "0.1.2"
+PREFERRED_VERSION_libschedule ?= "0.17"
+PREFERRED_VERSION_libsdl-directfb ?= "1.2.9"
+PREFERRED_VERSION_libsdl-gfx ?= "2.0.11"
+PREFERRED_VERSION_libsdl-image ?= "1.2.6"
+PREFERRED_VERSION_libsdl-mixer ?= "1.2.6"
+PREFERRED_VERSION_libsdl-native ?= "1.2.11"
+PREFERRED_VERSION_libsdl-net ?= "1.2.7"
+PREFERRED_VERSION_libsdl-ttf ?= "2.0.3"
+PREFERRED_VERSION_libsdl-ttf-native ?= "2.0.3"
+PREFERRED_VERSION_libsdl-x11 ?= "1.2.11"
+PREFERRED_VERSION_libsettings ?= "0.3"
+PREFERRED_VERSION_libsexy ?= "0.1.11"
+PREFERRED_VERSION_libsidplay ?= "1.36.59"
+PREFERRED_VERSION_libsigcx0 ?= "0.6.4"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libsndfile1 ?= "1.0.17"
+PREFERRED_VERSION_libsoundgen ?= "0.6"
+PREFERRED_VERSION_libsoup ?= "2.2.100"
+PREFERRED_VERSION_libspf2 ?= "1.0.4"
+PREFERRED_VERSION_libspiff ?= "0.8.2"
+PREFERRED_VERSION_libssh ?= "0.11"
+PREFERRED_VERSION_libsub-exporter-perl ?= "0.970"
+PREFERRED_VERSION_libsub-exporter-perl-native ?= "0.970"
+PREFERRED_VERSION_libsub-install-perl ?= "0.922"
+PREFERRED_VERSION_libsub-install-perl-native ?= "0.922"
+PREFERRED_VERSION_libsub-uplevel-perl ?= "0.13"
+PREFERRED_VERSION_libsub-uplevel-perl-native ?= "0.13"
+PREFERRED_VERSION_libsvg ?= "0.1.4"
+PREFERRED_VERSION_libtelepathy ?= "0.0.53"
+PREFERRED_VERSION_libtest-builder-tester-perl ?= "1.01"
+PREFERRED_VERSION_libtest-differences-perl ?= "0.47"
+PREFERRED_VERSION_libtest-exception-perl ?= "0.22"
+PREFERRED_VERSION_libtest-mockmodule-perl ?= "0.05"
+PREFERRED_VERSION_libtest-output-perl ?= "0.10"
+PREFERRED_VERSION_libtext-diff-perl ?= "0.35"
+PREFERRED_VERSION_libtext-diff-perl-native ?= "0.35"
+PREFERRED_VERSION_libticables ?= "3.9.2"
+PREFERRED_VERSION_libticalcs ?= "4.5.9"
+PREFERRED_VERSION_libtifiles ?= "0.6.5"
+PREFERRED_VERSION_libtinymail ?= "0.0.3"
+PREFERRED_VERSION_libtododb ?= "0.11"
+PREFERRED_VERSION_libtomcrypt ?= "0.97b"
+PREFERRED_VERSION_libtomoe-gtk ?= "0.1.0"
+PREFERRED_VERSION_libtool ?= "2.2.4"
+PREFERRED_VERSION_libtool-cross ?= "2.2.4"
+PREFERRED_VERSION_libtool-native ?= "2.2.4"
+PREFERRED_VERSION_libtool-sdk ?= "2.2.4"
+PREFERRED_VERSION_libungif ?= "4.1.3"
+PREFERRED_VERSION_libupnp ?= "1.3.1"
+PREFERRED_VERSION_liburiparser ?= "0.5.1"
+PREFERRED_VERSION_liburi-perl ?= "1.35"
+PREFERRED_VERSION_liburi-perl-native ?= "1.35"
+PREFERRED_VERSION_libusb ?= "0.1.12"
+PREFERRED_VERSION_libusb-native ?= "0.1.12"
+PREFERRED_VERSION_libversion-perl ?= "0.6701"
+PREFERRED_VERSION_libversion-perl-native ?= "0.6701"
+PREFERRED_VERSION_libvisual ?= "0.1.3"
+PREFERRED_VERSION_libvisual-plugins ?= "0.1.3"
+PREFERRED_VERSION_libvncserver ?= "0.9.1"
+PREFERRED_VERSION_libvocenabler ?= "0.1"
+PREFERRED_VERSION_libvorbis ?= "1.0.1"
+PREFERRED_VERSION_libw100 ?= "0.0.2"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
+PREFERRED_VERSION_libwnck ?= "2.13.5"
+PREFERRED_VERSION_libwpd ?= "0.8.6"
+PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11-native = "1.0.3"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxau-native ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcb ?= "1.0"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.3"
+PREFERRED_VERSION_libxfce4mcs ?= "4.4.1"
+PREFERRED_VERSION_libxfce4util ?= "4.4.1"
+PREFERRED_VERSION_libxfcegui4 ?= "4.4.1"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxfont-native ?= "1.3.0"
+PREFERRED_VERSION_libxft ?= "2.1.12"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxml2 ?= "2.7.2"
+PREFERRED_VERSION_libxml2-native ?= "2.7.2"
+PREFERRED_VERSION_libxml-parser-perl ?= "2.34"
+PREFERRED_VERSION_libxml-parser-perl-native ?= "2.34"
+PREFERRED_VERSION_libxmu ?= "1.0.3"
+PREFERRED_VERSION_libxp ?= "1.0.0"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
+PREFERRED_VERSION_libxprintutil ?= "1.0.1"
+PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxsettings ?= "0.11"
+PREFERRED_VERSION_libxsettings-client ?= "0.17"
+PREFERRED_VERSION_libxslt ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.21"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtrap ?= "1.0.0"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxv ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_libyaml-perl ?= "0.62"
+PREFERRED_VERSION_libyaml-perl-native ?= "0.62"
+PREFERRED_VERSION_lighttpd ?= "1.4.18"
+PREFERRED_VERSION_lineak ?= "0.8.3"
+PREFERRED_VERSION_linphone ?= "1.6.0"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linux-hotplug ?= "20040920"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+PREFERRED_VERSION_lisa ?= "0.2.2"
+PREFERRED_VERSION_live555 ?= "20051005"
+PREFERRED_VERSION_llvm ?= "2.0"
+PREFERRED_VERSION_llvm-native ?= "2.1"
+PREFERRED_VERSION_lmbench ?= "2.0.4"
+PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"
+PREFERRED_VERSION_lndir ?= "1.0.1"
+PREFERRED_VERSION_loader ?= "0.04"
+PREFERRED_VERSION_login-manager ?= "1.0"
+PREFERRED_VERSION_logrotate ?= "3.7.1"
+PREFERRED_VERSION_logrotate-script ?= "cvs"
+PREFERRED_VERSION_loudmouth ?= "1.2.2"
+PREFERRED_VERSION_lrzsz ?= "0.12.20"
+PREFERRED_VERSION_lsh ?= "1.5.5"
+PREFERRED_VERSION_lsof ?= "4.78"
+PREFERRED_VERSION_ltp ?= "20070228"
+PREFERRED_VERSION_ltrace ?= "0.4"
+PREFERRED_VERSION_lttng-control ?= "0.12"
+PREFERRED_VERSION_lttng-viewer ?= "0.8.41-20060512"
+PREFERRED_VERSION_lua ?= "5.0.2"
+PREFERRED_VERSION_lua-gtk2 ?= "0.3"
+PREFERRED_VERSION_lua-native ?= "5.0.2"
+PREFERRED_VERSION_luit ?= "1.0.2"
+PREFERRED_VERSION_lvm2 ?= "2.01.15"
+PREFERRED_VERSION_lxt ?= "1.0"
+PREFERRED_VERSION_lyx ?= "1.4.4"
+PREFERRED_VERSION_lzma ?= "4.17"
+PREFERRED_VERSION_lzma-native ?= "4.17"
+PREFERRED_VERSION_lzo ?= "1.08"
+PREFERRED_VERSION_lzo-native ?= "1.08"
+PREFERRED_VERSION_m4 ?= "1.4.8"
+PREFERRED_VERSION_m4-native ?= "1.4.8"
+PREFERRED_VERSION_macchanger ?= "1.5.0"
+PREFERRED_VERSION_madfu ?= "1.2"
+PREFERRED_VERSION_madplay ?= "0.15.2b"
+PREFERRED_VERSION_mahjongg ?= "1.0.0"
+PREFERRED_VERSION_mailutils ?= "0.3.1"
+PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs"
+PREFERRED_VERSION_make ?= "3.81"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_makedepend-native ?= "1.0.1"
+PREFERRED_VERSION_makedev ?= "2.3.1"
+PREFERRED_VERSION_makedevs ?= "1.0.0"
+PREFERRED_VERSION_makedevs-native ?= "1.0.0"
+PREFERRED_VERSION_make-native ?= "3.81"
+PREFERRED_VERSION_makeself-native ?= "cvs"
+PREFERRED_VERSION_maki ?= "1.0.4ern"
+PREFERRED_VERSION_man ?= "1.5p"
+PREFERRED_VERSION_man-pages ?= "2.41"
+PREFERRED_VERSION_manufacturers ?= "20031209"
+PREFERRED_VERSION_mapnik ?= "0.4.0"
+PREFERRED_VERSION_maradns ?= "1.0.39"
+PREFERRED_VERSION_masqmail ?= "0.2.21"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-applet-cards ?= "1.0.2"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
+PREFERRED_VERSION_matchbox-applet-volume ?= "0.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.3"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
+PREFERRED_VERSION_matchbox-themes-extra ?= "0.3"
+PREFERRED_VERSION_matchbox-themes-gtk ?= "1.0"
+PREFERRED_VERSION_matchbox-wm ?= "1.2"
+PREFERRED_VERSION_mathomatic ?= "unstable"
+PREFERRED_VERSION_matrixssl ?= "1.1.1"
+PREFERRED_VERSION_mb-applet-tasks ?= "1.0.0"
+PREFERRED_VERSION_mb-desktop-xine ?= "0.4"
+PREFERRED_VERSION_mbmerlin ?= "0.8.1-2"
+PREFERRED_VERSION_mc ?= "4.6.1"
+PREFERRED_VERSION_mce-dev ?= "1.5.6"
+PREFERRED_VERSION_mdadm ?= "2.5.5"
+PREFERRED_VERSION_mdev ?= "1.2.1"
+PREFERRED_VERSION_mdk2 ?= "v33"
+PREFERRED_VERSION_memedit ?= "0.7"
+PREFERRED_VERSION_memtester ?= "4.0.6"
+PREFERRED_VERSION_mesa ?= "6.5.2"
+PREFERRED_VERSION_mesa-dri ?= "6.5.2"
+PREFERRED_VERSION_meta-e-x11 ?= "1.0"
+PREFERRED_VERSION_meta-e-x11-core ?= "1.0"
+PREFERRED_VERSION_meta-gpe ?= "1.0"
+PREFERRED_VERSION_meta-gpe-extras ?= "1.0"
+PREFERRED_VERSION_meta-gpephone ?= "1.0"
+PREFERRED_VERSION_metakit ?= "2.4.9.3"
+PREFERRED_VERSION_metalog ?= "0.7"
+PREFERRED_VERSION_meta-maemo ?= "1.0"
+PREFERRED_VERSION_meta-sdk ?= "1.0"
+PREFERRED_VERSION_meta-sdk-gpe ?= "1.0"
+PREFERRED_VERSION_meta-sdk-sbox ?= "1.0"
+PREFERRED_VERSION_meta-sdk-sbox-gpe ?= "1.0"
+PREFERRED_VERSION_meta-sdl ?= "1.0"
+PREFERRED_VERSION_meta-sectest-gpe ?= "1.0"
+PREFERRED_VERSION_meta-toolchain ?= "1.0"
+PREFERRED_VERSION_mgetty ?= "1.1.30"
+PREFERRED_VERSION_miau ?= "0.5.3"
+PREFERRED_VERSION_microcom ?= "1.02"
+PREFERRED_VERSION_micro-emacs ?= "20060909"
+PREFERRED_VERSION_microwindows ?= "0.90"
+PREFERRED_VERSION_midori ?= "0.0.17"
+PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc2"
+PREFERRED_VERSION_mikmod ?= "3.2.2-beta1"
+PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814"
+PREFERRED_VERSION_militaryalphabet ?= "0.2.1"
+PREFERRED_VERSION_mime-support ?= "3.28"
+PREFERRED_VERSION_miniclipboard ?= "0.3"
+PREFERRED_VERSION_minicom ?= "2.1"
+PREFERRED_VERSION_minifo-modules ?= "0.6.1-pre1"
+PREFERRED_VERSION_miniinit ?= "1.0"
+PREFERRED_VERSION_minimix ?= "0.9"
+PREFERRED_VERSION_minipredict ?= "1.0"
+PREFERRED_VERSION_mipv6 ?= "1.1-v2.4.26"
+PREFERRED_VERSION_misdn ?= "cvs"
+PREFERRED_VERSION_mkbot ?= "0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mobilemesh ?= "1.2"
+PREFERRED_VERSION_moc ?= "2.4.0"
+PREFERRED_VERSION_modphp ?= "5.1.6"
+PREFERRED_VERSION_modplugplay ?= "1.0"
+PREFERRED_VERSION_module-init-tools ?= "3.2.2"
+PREFERRED_VERSION_module-init-tools-cross ?= "3.2.2"
+PREFERRED_VERSION_modutils ?= "2.4.27"
+PREFERRED_VERSION_modutils-collateral ?= "1.0"
+PREFERRED_VERSION_modutils-cross ?= "2.4.27"
+PREFERRED_VERSION_modutils-initscripts ?= "1.0"
+PREFERRED_VERSION_moin ?= "1.5.8"
+PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
+PREFERRED_VERSION_mono-native ?= "1.2.5.1"
+PREFERRED_VERSION_monotone-4 ?= "0.19"
+PREFERRED_VERSION_monotone-5 ?= "0.25.2"
+PREFERRED_VERSION_monotone-6 ?= "0.34"
+PREFERRED_VERSION_motion ?= "3.2.6"
+PREFERRED_VERSION_mousepad ?= "0.2.12"
+PREFERRED_VERSION_mp3blaster ?= "3.2.3"
+PREFERRED_VERSION_mpc ?= "0.12.1"
+PREFERRED_VERSION_mpeg2dec ?= "0.4.0b"
+PREFERRED_VERSION_mpfr ?= "2.3.1"
+PREFERRED_VERSION_mpfr-native ?= "2.3.1"
+PREFERRED_VERSION_mpg123 ?= "0.66"
+PREFERRED_VERSION_mpg321 ?= "0.2.10"
+PREFERRED_VERSION_mplayer-common ?= "0.0.1"
+PREFERRED_VERSION_mrxvt ?= "0.5.2"
+PREFERRED_VERSION_msmtp ?= "1.4.10"
+PREFERRED_VERSION_msn-cap ?= "1.0"
+PREFERRED_VERSION_msynctool ?= "0.22"
+PREFERRED_VERSION_mt-daapd ?= "0.2.3"
+PREFERRED_VERSION_mtools ?= "3.9.9"
+PREFERRED_VERSION_mtools-native ?= "3.9.9"
+PREFERRED_VERSION_mtpaint ?= "3.02"
+PREFERRED_VERSION_mtr ?= "0.65"
+PREFERRED_VERSION_multisync ?= "0.90.18"
+PREFERRED_VERSION_murasaki ?= "0.8.8"
+PREFERRED_VERSION_mutt ?= "1.5.15"
+PREFERRED_VERSION_mysql ?= "4.1.18"
+PREFERRED_VERSION_mysql-native ?= "4.1.18"
+PREFERRED_VERSION_mythfront-config ?= "1.10"
+PREFERRED_VERSION_mythfront-session ?= "1.5"
+PREFERRED_VERSION_nabi ?= "0.17"
+PREFERRED_VERSION_nail ?= "11.21"
+PREFERRED_VERSION_nano ?= "2.0.7"
+PREFERRED_VERSION_nasm-native ?= "0.98.38"
+PREFERRED_VERSION_nautilus ?= "2.12.2"
+PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
+PREFERRED_VERSION_navit ?= "0.1.0"
+PREFERRED_VERSION_nbd ?= "2.8.7"
+PREFERRED_VERSION_ncftp ?= "3.2.0"
+PREFERRED_VERSION_ncmpc ?= "0.11.1"
+PREFERRED_VERSION_ncurses ?= "5.4"
+PREFERRED_VERSION_ncurses-native ?= "5.4"
+PREFERRED_VERSION_ndisc6 ?= "0.6.7"
+PREFERRED_VERSION_neon ?= "0.25.5"
+PREFERRED_VERSION_net6 ?= "1.3.1"
+PREFERRED_VERSION_netatalk ?= "2.0.3"
+PREFERRED_VERSION_netbase ?= "4.21"
+PREFERRED_VERSION_netcat ?= "0.7.1"
+PREFERRED_VERSION_netpbm ?= "10.28"
+PREFERRED_VERSION_netperf ?= "2.4.2"
+PREFERRED_VERSION_net-snmp ?= "5.4.1"
+PREFERRED_VERSION_net-tools ?= "1.60"
+PREFERRED_VERSION_network-manager-applet ?= "0.6.5"
+PREFERRED_VERSION_network-suspend-scripts ?= "1.1"
+PREFERRED_VERSION_nfs-utils ?= "1.1.2"
+PREFERRED_VERSION_ngrep ?= "1.42"
+PREFERRED_VERSION_nis-all ?= "1.0"
+PREFERRED_VERSION_nkf ?= "2.07"
+PREFERRED_VERSION_nkf-native ?= "2.07"
+PREFERRED_VERSION_nmap ?= "4.20"
+PREFERRED_VERSION_nmixer ?= "2.0"
+PREFERRED_VERSION_nmm ?= "0.0.2"
+PREFERRED_VERSION_nogravity ?= "2.0"
+PREFERRED_VERSION_notecase ?= "1.2.6"
+PREFERRED_VERSION_notez ?= "1.1.0"
+PREFERRED_VERSION_notification-daemon ?= "0.3.7"
+PREFERRED_VERSION_nsd ?= "2.0.0"
+PREFERRED_VERSION_ntfs-3g ?= "1.0"
+PREFERRED_VERSION_ntop ?= "3.0"
+PREFERRED_VERSION_ntp ?= "4.2.2p3"
+PREFERRED_VERSION_ntpclient ?= "2003_194"
+PREFERRED_VERSION_ntp-ssl ?= "4.1.2"
+PREFERRED_VERSION_nunome ?= "1.0.2"
+PREFERRED_VERSION_nylon-feed ?= "1.0"
+PREFERRED_VERSION_obby ?= "0.4.1"
+PREFERRED_VERSION_obexftp ?= "0.20"
+PREFERRED_VERSION_obexpush ?= "1.0.0"
+PREFERRED_VERSION_obexpush-native ?= "1.0.0"
+PREFERRED_VERSION_octave ?= "2.1.73"
+PREFERRED_VERSION_offlineimap ?= "4.0.14"
+PREFERRED_VERSION_olsrd ?= "0.5.3"
+PREFERRED_VERSION_omext ?= "0.2"
+PREFERRED_VERSION_omniorb ?= "4.0.7"
+PREFERRED_VERSION_omniorb-native ?= "4.0.7"
+PREFERRED_VERSION_openal ?= "0.0.8"
+PREFERRED_VERSION_openh323 ?= "1.13.5.4"
+PREFERRED_VERSION_openjade ?= "1.3.2"
+PREFERRED_VERSION_openjade-native ?= "1.3.2"
+PREFERRED_VERSION_openldap ?= "2.3.11"
+PREFERRED_VERSION_openntpd ?= "3.9p1"
+PREFERRED_VERSION_openobex ?= "1.3"
+PREFERRED_VERSION_openpbx.org ?= "1.2_rc3"
+PREFERRED_VERSION_openpbx.org-perl ?= "1.0"
+PREFERRED_VERSION_openprotium-init ?= "0.10"
+PREFERRED_VERSION_openprotium-packages ?= "1.0"
+PREFERRED_VERSION_opensp ?= "1.5"
+PREFERRED_VERSION_opensp-native ?= "1.5"
+PREFERRED_VERSION_openssh ?= "4.6p1"
+PREFERRED_VERSION_openssl ?= "0.9.8j"
+PREFERRED_VERSION_openssl-native ?= "0.9.8j"
+PREFERRED_VERSION_openswan ?= "2.4.7"
+PREFERRED_VERSION_openttd ?= "0.6.3"
+PREFERRED_VERSION_openvpn ?= "2.0.9"
+PREFERRED_VERSION_oplinux-packages ?= "1.0"
+PREFERRED_VERSION_oprofile ?= "0.9.4"
+PREFERRED_VERSION_orage ?= "4.4.1"
+PREFERRED_VERSION_orbit2 ?= "2.14.12"
+PREFERRED_VERSION_orbit2-native ?= "2.14.12"
+PREFERRED_VERSION_orinoco-conf ?= "1.0"
+PREFERRED_VERSION_orinoco-modules ?= "0.15rc2"
+PREFERRED_VERSION_orpheus ?= "1.5"
+PREFERRED_VERSION_ortp ?= "0.7.1"
+PREFERRED_VERSION_osso-af-settings ?= "0.8.5"
+PREFERRED_VERSION_osso-af-startup ?= "0.28-1"
+PREFERRED_VERSION_osso-af-utils ?= "0.4"
+PREFERRED_VERSION_osso-app-killer ?= "0.4-3"
+PREFERRED_VERSION_osso-application-installer ?= "1.0.03-1"
+PREFERRED_VERSION_osso-bttools ?= "0.25.1"
+PREFERRED_VERSION_osso-core-config ?= "200515.1"
+PREFERRED_VERSION_osso-dsp-headers ?= "0.1"
+PREFERRED_VERSION_osso-esd ?= "0.5"
+PREFERRED_VERSION_osso-gwconnect ?= "1.0.8"
+PREFERRED_VERSION_osso-gwobex ?= "0.26.1"
+PREFERRED_VERSION_osso-ic-oss ?= "1.0.4"
+PREFERRED_VERSION_osso-screenshot-tool ?= "1.20-1"
+PREFERRED_VERSION_osso-sounds ?= "0.3-1"
+PREFERRED_VERSION_osso-thumbnail ?= "0.7"
+PREFERRED_VERSION_otpkeygen ?= "1.3.0"
+PREFERRED_VERSION_outo ?= "0.1.1"
+PREFERRED_VERSION_p3scan ?= "2.9.05d"
+PREFERRED_VERSION_p4 ?= "05.2"
+PREFERRED_VERSION_package-index ?= "1.0"
+PREFERRED_VERSION_pad-native ?= "1.0"
+PREFERRED_VERSION_pairs ?= "1.1.1"
+PREFERRED_VERSION_pango ?= "1.18.3"
+PREFERRED_VERSION_panoramixext ?= "1.1"
+PREFERRED_VERSION_parted ?= "1.8.7"
+PREFERRED_VERSION_patch ?= "2.5.9"
+PREFERRED_VERSION_patcher ?= "20040913"
+PREFERRED_VERSION_patcher-native ?= "20040913"
+PREFERRED_VERSION_patchutils ?= "0.2.31"
+PREFERRED_VERSION_pax-utils ?= "0.1.13"
+PREFERRED_VERSION_pax-utils-native ?= "0.1.13"
+PREFERRED_VERSION_pbltool-native ?= "0.2"
+PREFERRED_VERSION_pciutils ?= "2.2.4"
+PREFERRED_VERSION_pcmanfm ?= "0.5"
+PREFERRED_VERSION_pcmcia-cs ?= "3.2.8"
+PREFERRED_VERSION_pcmciautils ?= "014"
+PREFERRED_VERSION_pdamaze ?= "1.0.0"
+PREFERRED_VERSION_pdm ?= "1.0"
+PREFERRED_VERSION_perl ?= "5.8.8"
+PREFERRED_VERSION_perl-native ?= "5.8.8"
+PREFERRED_VERSION_petitepainture ?= "1.5"
+PREFERRED_VERSION_phalanx ?= "22"
+PREFERRED_VERSION_phoneserver ?= "1.0"
+PREFERRED_VERSION_php ?= "5.2.0"
+PREFERRED_VERSION_php-native ?= "5.2.0"
+PREFERRED_VERSION_picocom ?= "1.4"
+PREFERRED_VERSION_pidgin ?= "2.5.8"
+PREFERRED_VERSION_pine ?= "4.64"
+PREFERRED_VERSION_pipeman ?= "1.0.0"
+PREFERRED_VERSION_pipepanic ?= "0.1.1"
+PREFERRED_VERSION_pivotinit ?= "1.0.0"
+PREFERRED_VERSION_pixman ?= "0.11.4"
+PREFERRED_VERSION_pixops-test ?= "1.0"
+PREFERRED_VERSION_pkgconfig ?= "0.23"
+PREFERRED_VERSION_pkgconfig-native ?= "0.23"
+PREFERRED_VERSION_plinciv ?= "0.16"
+PREFERRED_VERSION_plone ?= "2.1.2"
+PREFERRED_VERSION_plot ?= "0.28"
+PREFERRED_VERSION_pme ?= "1.0.3"
+PREFERRED_VERSION_pmount ?= "0.9.4"
+PREFERRED_VERSION_pmtools ?= "20050926"
+PREFERRED_VERSION_poboxserver ?= "1.2.5"
+PREFERRED_VERSION_pocketcellar ?= "1.1"
+PREFERRED_VERSION_pocketsphinx ?= "0.2.1"
+PREFERRED_VERSION_poppler ?= "0.8.4"
+PREFERRED_VERSION_poppler-data ?= "0.1"
+PREFERRED_VERSION_popt ?= "1.7"
+PREFERRED_VERSION_popt-native ?= "1.7"
+PREFERRED_VERSION_poptop ?= "1.3.4"
+PREFERRED_VERSION_poqetpresenter ?= "0.0.6"
+PREFERRED_VERSION_portabase ?= "1.9"
+PREFERRED_VERSION_portmap ?= "6.0"
+PREFERRED_VERSION_postfix ?= "2.0.20"
+PREFERRED_VERSION_postfix-native ?= "2.0.20"
+PREFERRED_VERSION_postgresql ?= "8.1.8"
+PREFERRED_VERSION_povray ?= "3.6.1"
+PREFERRED_VERSION_powermanga ?= "0.79"
+PREFERRED_VERSION_powernowd ?= "0.96"
+PREFERRED_VERSION_powertop ?= "1.8"
+PREFERRED_VERSION_ppp ?= "2.4.3"
+PREFERRED_VERSION_ppp-dsl ?= "0.1-monolithic"
+PREFERRED_VERSION_pptp-linux ?= "1.7.1"
+PREFERRED_VERSION_prboom ?= "2.2.6"
+PREFERRED_VERSION_prboom-devconfig ?= "1.0"
+PREFERRED_VERSION_prelink ?= "20060712"
+PREFERRED_VERSION_printproto ?= "1.0.3"
+PREFERRED_VERSION_prism2-firmware-update ?= "1.7.4"
+PREFERRED_VERSION_prism54-firmware ?= "1.0.4.3"
+PREFERRED_VERSION_prism54-module ?= "1.2"
+PREFERRED_VERSION_prism-firmware ?= "1.0"
+PREFERRED_VERSION_prismstumbler ?= "0.7.3"
+PREFERRED_VERSION_privoxy ?= "3.0.3"
+PREFERRED_VERSION_procps ?= "3.2.7"
+PREFERRED_VERSION_proj-4 ?= "4.9"
+PREFERRED_VERSION_proj-4-native ?= "4.9"
+PREFERRED_VERSION_psmisc ?= "22.2"
+PREFERRED_VERSION_psplash-zap ?= "1.0"
+PREFERRED_VERSION_pth ?= "2.0.2"
+PREFERRED_VERSION_pulseaudio ?= "0.9.10"
+PREFERRED_VERSION_puppy ?= "1.11"
+PREFERRED_VERSION_puzz-le ?= "2.0.0"
+PREFERRED_VERSION_puzzles ?= "r7436"
+PREFERRED_VERSION_pvrusb2-mci ?= "20060903"
+PREFERRED_VERSION_pwdutils ?= "2.6"
+PREFERRED_VERSION_pwlib ?= "1.5.2"
+PREFERRED_VERSION_pwmpi ?= "2.2.7"
+PREFERRED_VERSION_pxaregs ?= "1.14"
+PREFERRED_VERSION_python24 ?= "2.4.4"
+PREFERRED_VERSION_python24-native ?= "2.4.0"
+PREFERRED_VERSION_python24-pyqt2 ?= "3.13"
+PREFERRED_VERSION_python24-pyqwt2 ?= "3.10"
+PREFERRED_VERSION_python24-sip ?= "4.1.1"
+PREFERRED_VERSION_python ?= "2.6.1"
+PREFERRED_VERSION_python-ao ?= "0.82"
+PREFERRED_VERSION_python-constraint ?= "1.1"
+PREFERRED_VERSION_python-dbus ?= "0.83.0"
+PREFERRED_VERSION_python-fam ?= "1.1.1"
+PREFERRED_VERSION_python-fnorb ?= "1.3"
+PREFERRED_VERSION_python-fpconst ?= "0.6.0"
+PREFERRED_VERSION_python-gammu ?= "0.24"
+PREFERRED_VERSION_python-gmpy ?= "1.0.1"
+PREFERRED_VERSION_python-gnosis ?= "1.2.2"
+PREFERRED_VERSION_python-gst ?= "0.10.10"
+PREFERRED_VERSION_python-hmm ?= "0.4"
+PREFERRED_VERSION_python-imaging ?= "1.1.6"
+PREFERRED_VERSION_python-imdbpy ?= "3.1"
+PREFERRED_VERSION_python-inotify ?= "0.1.0"
+PREFERRED_VERSION_python-irclib ?= "0.4.6"
+PREFERRED_VERSION_python-itools ?= "0.16.5"
+PREFERRED_VERSION_python-libgmail ?= "0.1.6"
+PREFERRED_VERSION_python-logilab-common ?= "0.9.3"
+PREFERRED_VERSION_python-lxml ?= "1.3.3"
+PREFERRED_VERSION_python-mad ?= "0.6"
+PREFERRED_VERSION_python-mysqldb ?= "1.2.1"
+PREFERRED_VERSION_python-native ?= "2.6.1"
+PREFERRED_VERSION_python-numarray ?= "1.1.1"
+PREFERRED_VERSION_python-numeric ?= "23.7"
+PREFERRED_VERSION_python-ogg ?= "1.3"
+PREFERRED_VERSION_python-pexpect ?= "2.1"
+PREFERRED_VERSION_python-pybluez ?= "0.13"
+PREFERRED_VERSION_python-pycairo ?= "1.4.0"
+PREFERRED_VERSION_python-pychecker ?= "0.8.17"
+PREFERRED_VERSION_python-pycodes ?= "1.2"
+PREFERRED_VERSION_python-pycrypto ?= "2.0.1"
+PREFERRED_VERSION_python-pycurl ?= "7.18.2"
+PREFERRED_VERSION_python-pyephem ?= "3.7.2a"
+PREFERRED_VERSION_python-pyfits ?= "1.1"
+PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
+PREFERRED_VERSION_python-pygame ?= "1.8.1"
+PREFERRED_VERSION_python-pygnome ?= "2.16.2"
+PREFERRED_VERSION_python-pygobject ?= "2.16.0"
+PREFERRED_VERSION_python-pygobject-native ?= "2.16.0"
+PREFERRED_VERSION_python-pygoogle ?= "0.6"
+PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
+PREFERRED_VERSION_python-pygtk ?= "2.10.4"
+PREFERRED_VERSION_python-pyid3lib ?= "0.5.1"
+PREFERRED_VERSION_python-pyiw ?= "0.3.3"
+PREFERRED_VERSION_python-pylinda ?= "0.6"
+PREFERRED_VERSION_python-pylint ?= "0.13.2"
+PREFERRED_VERSION_python-pymetar ?= "0.11"
+PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
+PREFERRED_VERSION_python-pyrad ?= "0.8"
+PREFERRED_VERSION_python-pyraf ?= "1.4"
+PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8.4"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.5"
+PREFERRED_VERSION_python-pyro ?= "3.7"
+PREFERRED_VERSION_python-pyserial ?= "2.4"
+PREFERRED_VERSION_python-pytester ?= "0.6.0"
+PREFERRED_VERSION_python-pythondaap ?= "0.4"
+PREFERRED_VERSION_python-pyvisa ?= "1.1"
+PREFERRED_VERSION_python-pyweather ?= "0.7.0"
+PREFERRED_VERSION_python-pywpa ?= "0.3.4"
+PREFERRED_VERSION_python-pyxml ?= "0.8.4"
+PREFERRED_VERSION_python-pyxmlrpc ?= "0.8.8.3"
+PREFERRED_VERSION_python-pyzeroconf ?= "0.12"
+PREFERRED_VERSION_python-scapy ?= "1.1.1"
+PREFERRED_VERSION_python-scons ?= "0.97"
+PREFERRED_VERSION_python-scons-native ?= "0.97"
+PREFERRED_VERSION_python-setuptools ?= "0.6c8"
+PREFERRED_VERSION_python-setuptools-native ?= "0.6c9"
+PREFERRED_VERSION_python-sgmlop ?= "1.1"
+PREFERRED_VERSION_python-simplejson ?= "1.7.1"
+PREFERRED_VERSION_python-snmplib ?= "0.1.1"
+PREFERRED_VERSION_python-soappy ?= "0.11.6"
+PREFERRED_VERSION_python-spydi ?= "0.9.7"
+PREFERRED_VERSION_python-spyro ?= "0.9.22"
+PREFERRED_VERSION_python-sqlobject ?= "0.9.1"
+PREFERRED_VERSION_python-sword ?= "1.5.9"
+PREFERRED_VERSION_python-urwid ?= "0.9.8.1"
+PREFERRED_VERSION_python-vmaps ?= "1.1"
+PREFERRED_VERSION_python-vorbis ?= "1.3"
+PREFERRED_VERSION_python-webpy ?= "0.21"
+PREFERRED_VERSION_qclockchange ?= "0.1a"
+PREFERRED_VERSION_qcoptest ?= "0.1.1"
+PREFERRED_VERSION_qc-usb-messenger ?= "1.1"
+PREFERRED_VERSION_qfish2 ?= "1.1.0"
+PREFERRED_VERSION_qgis ?= "0.8.1"
+PREFERRED_VERSION_qiv ?= "1.9"
+PREFERRED_VERSION_qjackctl ?= "0.3.1a"
+PREFERRED_VERSION_qmake2-native ?= "2.10a"
+PREFERRED_VERSION_qmake-native ?= "1.07a"
+PREFERRED_VERSION_qmatrix ?= "1.1.0"
+PREFERRED_VERSION_qof ?= "0.7.2"
+PREFERRED_VERSION_qolyester ?= "20050728"
+PREFERRED_VERSION_qpdf2 ?= "2.2.1"
+PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
+PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
+PREFERRED_VERSION_qpe-gaim ?= "20041030"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
+PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
+PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
+PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
+PREFERRED_VERSION_qpf-arabic ?= "1.0"
+PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"
+PREFERRED_VERSION_qpf-bitstream-vera-sans-mono ?= "1.10"
+PREFERRED_VERSION_qpf-font-common ?= "1.0"
+PREFERRED_VERSION_qpf-freemono ?= "1.0"
+PREFERRED_VERSION_qpf-freeserif ?= "1.0"
+PREFERRED_VERSION_qpf-helvetica ?= "1.0"
+PREFERRED_VERSION_qpf-hunkysans ?= "0.3.0"
+PREFERRED_VERSION_qpf-hunkyserif ?= "0.3.0"
+PREFERRED_VERSION_qpf-qte ?= "2.3.10"
+PREFERRED_VERSION_qpf-unifont ?= "1.0"
+PREFERRED_VERSION_qpf-unismall ?= "1.0.0"
+PREFERRED_VERSION_qpf-utopia ?= "1.0"
+PREFERRED_VERSION_qplot ?= "2.0.1-cvs-20020420"
+PREFERRED_VERSION_qpobox ?= "0.5.4"
+PREFERRED_VERSION_qpphoto ?= "1.0.2"
+PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6"
+PREFERRED_VERSION_qsvn ?= "0.3.0"
+PREFERRED_VERSION_qt4-x11-free ?= "4.4.1"
+PREFERRED_VERSION_qtplot ?= "0.2"
+PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
+PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
+PREFERRED_VERSION_quagga ?= "0.99.8"
+PREFERRED_VERSION_quake1 ?= "0.0.1"
+PREFERRED_VERSION_quetoo ?= "0.6.1"
+PREFERRED_VERSION_quilt ?= "0.45"
+PREFERRED_VERSION_quilt-native ?= "0.45"
+PREFERRED_VERSION_qwt ?= "4.2.0rc1"
+PREFERRED_VERSION_qxmp ?= "1.0"
+PREFERRED_VERSION_radlib ?= "2.6.2"
+PREFERRED_VERSION_radlib-mysql ?= "2.6.2"
+PREFERRED_VERSION_radvd ?= "1.0"
+PREFERRED_VERSION_rage ?= "0.2.0.003"
+PREFERRED_VERSION_randrext ?= "1.0"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_rdesktop ?= "1.5.0"
+PREFERRED_VERSION_rdiff-backup ?= "1.1.5"
+PREFERRED_VERSION_readline ?= "4.3"
+PREFERRED_VERSION_readline-native ?= "4.3"
+PREFERRED_VERSION_reaim ?= "7.0.1.13"
+PREFERRED_VERSION_recode ?= "3.6"
+PREFERRED_VERSION_recode-native ?= "3.6"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
+PREFERRED_VERSION_redfang ?= "2.5"
+PREFERRED_VERSION_refdbg ?= "1.2"
+PREFERRED_VERSION_regex-markup ?= "0.10.0"
+PREFERRED_VERSION_reiser4progs ?= "1.0.4"
+PREFERRED_VERSION_reiserfsprogs ?= "3.6.19"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_resistorui ?= "0.9"
+PREFERRED_VERSION_resolvconf ?= "1.43"
+PREFERRED_VERSION_resourceext ?= "1.0"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
+PREFERRED_VERSION_rfakeap ?= "0.2"
+PREFERRED_VERSION_rglueap ?= "0.1"
+PREFERRED_VERSION_rhythmbox ?= "0.8.7"
+PREFERRED_VERSION_rlpr ?= "2.05"
+PREFERRED_VERSION_r-native ?= "2.0.0"
+PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0"
+PREFERRED_VERSION_rott ?= "1.0"
+PREFERRED_VERSION_rox-filer ?= "2.5"
+PREFERRED_VERSION_rpm ?= "4.4"
+PREFERRED_VERSION_rp-pppoe ?= "3.8"
+PREFERRED_VERSION_rrdtool ?= "1.0.49"
+PREFERRED_VERSION_rsync ?= "2.6.9"
+PREFERRED_VERSION_rt2570 ?= "1.1.0-b2"
+PREFERRED_VERSION_rt2570-k2wrlz ?= "1.6.1"
+PREFERRED_VERSION_rt73-k2wrlz ?= "2.0.1"
+PREFERRED_VERSION_rtaudio-tests ?= "3.0.1"
+PREFERRED_VERSION_ruby ?= "1.8.5"
+PREFERRED_VERSION_ruby-native ?= "1.8.5"
+PREFERRED_VERSION_rxvt ?= "2.8.0"
+PREFERRED_VERSION_rxvt-unicode ?= "7.9"
+PREFERRED_VERSION_sablevm ?= "1.12"
+PREFERRED_VERSION_sablevm-classpath ?= "1.12"
+PREFERRED_VERSION_salsa-lib ?= "0.0.1"
+PREFERRED_VERSION_samba ?= "3.0.23c"
+PREFERRED_VERSION_samba-essential ?= "3.0.20"
+PREFERRED_VERSION_sane-backends ?= "1.0.17"
+PREFERRED_VERSION_sane-frontends ?= "1.0.13"
+PREFERRED_VERSION_sato-icon-theme ?= "0.1"
+PREFERRED_VERSION_sbagen ?= "1.4.1"
+PREFERRED_VERSION_sbrsh ?= "7.1"
+PREFERRED_VERSION_scap ?= "0.1"
+PREFERRED_VERSION_sccd ?= "1.0"
+PREFERRED_VERSION_scew ?= "0.3.1"
+PREFERRED_VERSION_schedstat-utils ?= "1.0"
+PREFERRED_VERSION_schroedinger ?= "1.0.5"
+PREFERRED_VERSION_screen ?= "4.0.2"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_scsi-idle ?= "2.4.23"
+PREFERRED_VERSION_sctzap ?= "0.0cvs20060814"
+PREFERRED_VERSION_scummvm ?= "0.10.0"
+PREFERRED_VERSION_scummvm-qpe ?= "0.6.1b"
+PREFERRED_VERSION_scw ?= "0.4.3"
+PREFERRED_VERSION_sdcc ?= "2.5.0"
+PREFERRED_VERSION_sdcc-native ?= "2.5.0"
+PREFERRED_VERSION_sdk-default-icons ?= "0.2-1"
+PREFERRED_VERSION_sdk-default-theme ?= "0.1-1"
+PREFERRED_VERSION_sdk-default-theme-config ?= "1.0-1"
+PREFERRED_VERSION_sdl-perl ?= "1.20.3"
+PREFERRED_VERSION_sed ?= "4.1.2"
+PREFERRED_VERSION_sed-native ?= "4.1.2"
+PREFERRED_VERSION_ser ?= "0.9.0"
+PREFERRED_VERSION_serload-native ?= "1.0"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setmixer ?= "27DEC94"
+PREFERRED_VERSION_setserial ?= "2.17"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_sgml-common ?= "0.6.3"
+PREFERRED_VERSION_sgml-common-native ?= "0.6.3"
+PREFERRED_VERSION_shared-mime-info ?= "0.51"
+PREFERRED_VERSION_sharp-compat-libs ?= "0.5"
+PREFERRED_VERSION_sharprom-toolchain-native ?= "1.0"
+PREFERRED_VERSION_shasum-native ?= "1.0"
+PREFERRED_VERSION_shfs-modules ?= "0.35"
+PREFERRED_VERSION_shfs-utils ?= "0.35"
+PREFERRED_VERSION_shisensho ?= "1.0.0"
+PREFERRED_VERSION_shopper ?= "1.2.1"
+PREFERRED_VERSION_shorewall ?= "2.0.9-monolithic"
+PREFERRED_VERSION_sidplay-base ?= "1.0.9"
+PREFERRED_VERSION_sidplayer ?= "1.5.0"
+PREFERRED_VERSION_silo ?= "1.4.8"
+PREFERRED_VERSION_simh ?= "3.7-1"
+PREFERRED_VERSION_simpad-utilities ?= "1.0"
+PREFERRED_VERSION_sip3-native ?= "4.0.1"
+PREFERRED_VERSION_sipsak ?= "0.9.6"
+PREFERRED_VERSION_skippy-xd ?= "0.5.0"
+PREFERRED_VERSION_sl ?= "3.03"
+PREFERRED_VERSION_slang ?= "1.4.9"
+PREFERRED_VERSION_slcalc ?= "1.2.1"
+PREFERRED_VERSION_sliderulez ?= "0.92"
+PREFERRED_VERSION_slotsig ?= "0.6"
+PREFERRED_VERSION_slrn ?= "0.9.8.0"
+PREFERRED_VERSION_slsnif ?= "0.4.4"
+PREFERRED_VERSION_slugimage-native ?= "1.0"
+PREFERRED_VERSION_slugos-init ?= "0.10"
+PREFERRED_VERSION_slugos-native ?= "1.0"
+PREFERRED_VERSION_slugos-native-packages ?= "1.0"
+PREFERRED_VERSION_slugtool ?= "1.0"
+PREFERRED_VERSION_slugtool-native ?= "1.0"
+PREFERRED_VERSION_slutils ?= "0.1.0"
+PREFERRED_VERSION_smartmontools ?= "5.37"
+PREFERRED_VERSION_sms ?= "1.1"
+PREFERRED_VERSION_sn9c102 ?= "1.32"
+PREFERRED_VERSION_snes232 ?= "cvs"
+PREFERRED_VERSION_snes9x ?= "1.43-WIP1"
+PREFERRED_VERSION_snes9x-sdl ?= "1.39"
+PREFERRED_VERSION_snes9x-sdl-qpe ?= "1.39"
+PREFERRED_VERSION_socat ?= "1.3.2.1"
+PREFERRED_VERSION_sofia-sip ?= "1.11.7"
+PREFERRED_VERSION_softfan ?= "0.10"
+PREFERRED_VERSION_sokoban ?= "1.3.8ern"
+PREFERRED_VERSION_soundserver ?= "1.0"
+PREFERRED_VERSION_soundtracker ?= "0.6.8"
+PREFERRED_VERSION_soundtracker-gtk2 ?= "0.6.7"
+PREFERRED_VERSION_sox ?= "13.0.0"
+PREFERRED_VERSION_sox-native ?= "13.0.0"
+PREFERRED_VERSION_spandsp ?= "0.0.3"
+PREFERRED_VERSION_spca5xx ?= "20060501"
+PREFERRED_VERSION_spectrum-fw ?= "1.0"
+PREFERRED_VERSION_speex ?= "1.1+1.2rc1"
+PREFERRED_VERSION_sphinxbase ?= "0.1"
+PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2"
+PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2"
+PREFERRED_VERSION_squashfs-tools ?= "3.1r2"
+PREFERRED_VERSION_squashfs-tools-native ?= "3.1r2"
+PREFERRED_VERSION_squeak-nox ?= "3.4-2"
+PREFERRED_VERSION_squid ?= "2.6.STABLE14"
+PREFERRED_VERSION_sshfs-fuse ?= "1.8"
+PREFERRED_VERSION_ssmtp ?= "2.61"
+PREFERRED_VERSION_stagemanager-native ?= "0.0.1"
+PREFERRED_VERSION_startup-monitor ?= "0.18-2"
+PREFERRED_VERSION_startup-notification ?= "0.8"
+PREFERRED_VERSION_stat ?= "3.3"
+PREFERRED_VERSION_stat-native ?= "3.3"
+PREFERRED_VERSION_strace ?= "4.5.15"
+PREFERRED_VERSION_streamripper ?= "1.61.10"
+PREFERRED_VERSION_stress ?= "0.18.8"
+PREFERRED_VERSION_stunnel ?= "4.09"
+PREFERRED_VERSION_subapplet ?= "1.0.8"
+PREFERRED_VERSION_subversion ?= "1.4.3"
+PREFERRED_VERSION_sudo ?= "1.6.8p12"
+PREFERRED_VERSION_supertux ?= "0.1.2"
+PREFERRED_VERSION_supybot ?= "0.77.0"
+PREFERRED_VERSION_suspend-desktop ?= "1.0"
+PREFERRED_VERSION_swfdec ?= "0.5.1"
+PREFERRED_VERSION_swig ?= "1.3.31"
+PREFERRED_VERSION_swig-native ?= "1.3.31"
+PREFERRED_VERSION_sword ?= "1.5.9"
+PREFERRED_VERSION_sylpheed ?= "2.2.9"
+PREFERRED_VERSION_synaesthesia ?= "2.4"
+PREFERRED_VERSION_syncml-client ?= "0.1"
+PREFERRED_VERSION_synergy ?= "1.3.1"
+PREFERRED_VERSION_sysfsutils ?= "2.0.0"
+PREFERRED_VERSION_sysklogd ?= "1.4.1"
+PREFERRED_VERSION_syslinux-native ?= "3.63"
+PREFERRED_VERSION_syslog-ng ?= "1.6.11"
+PREFERRED_VERSION_sysvinit ?= "2.86"
+PREFERRED_VERSION_t1lib ?= "5.0.2"
+PREFERRED_VERSION_taglib ?= "1.4"
+PREFERRED_VERSION_taglibc ?= "1.4"
+PREFERRED_VERSION_tango-icon-theme ?= "0.7.2"
+PREFERRED_VERSION_tango-icon-theme-extras ?= "0.1.0"
+PREFERRED_VERSION_tapioca ?= "0.3.9"
+PREFERRED_VERSION_tapiocaui ?= "0.3.9.1"
+PREFERRED_VERSION_tapioca-xmpp ?= "0.3.9"
+PREFERRED_VERSION_tar ?= "1.18"
+PREFERRED_VERSION_tasklistapplet ?= "1.0.5"
+PREFERRED_VERSION_tasks ?= "0.10"
+PREFERRED_VERSION_tcpdump ?= "3.9.7"
+PREFERRED_VERSION_tcpick ?= "0.1.22"
+PREFERRED_VERSION_tcptraceroute ?= "1.5beta6"
+PREFERRED_VERSION_tcptrack ?= "1.1.2"
+PREFERRED_VERSION_tcp-wrappers ?= "7.6"
+PREFERRED_VERSION_tda1004x-firmware ?= "1.0"
+PREFERRED_VERSION_telepathy-gabble ?= "0.5.10"
+PREFERRED_VERSION_telepathy-glib ?= "0.5.10"
+PREFERRED_VERSION_telepathy-mission-control ?= "4.22"
+PREFERRED_VERSION_teleport ?= "0.34"
+PREFERRED_VERSION_temtor ?= "0.0.1"
+PREFERRED_VERSION_termcap ?= "11.0.1"
+PREFERRED_VERSION_terminus ?= "1.0"
+PREFERRED_VERSION_tesseract ?= "1.0"
+PREFERRED_VERSION_tetex ?= "3.0"
+PREFERRED_VERSION_tetex-native ?= "3.0"
+PREFERRED_VERSION_tetex-texmf ?= "3.0"
+PREFERRED_VERSION_texinfo ?= "4.8a"
+PREFERRED_VERSION_texlive ?= "2007"
+PREFERRED_VERSION_texmaker ?= "1.3"
+PREFERRED_VERSION_thcrut ?= "1.2.5"
+PREFERRED_VERSION_thttpd ?= "2.25b"
+PREFERRED_VERSION_thumbpad ?= "0.8"
+PREFERRED_VERSION_thunar ?= "0.8.0"
+PREFERRED_VERSION_thunderbird ?= "1.0.7"
+PREFERRED_VERSION_tickypip ?= "0.1.2"
+PREFERRED_VERSION_tickypip-levels ?= "1.1"
+PREFERRED_VERSION_tightvnc ?= "1.3dev7"
+PREFERRED_VERSION_tiinit ?= "3.2.26"
+PREFERRED_VERSION_time ?= "1.7"
+PREFERRED_VERSION_timesleuth ?= "1.05ern"
+PREFERRED_VERSION_timezones ?= "1.2.0"
+PREFERRED_VERSION_tin ?= "1.9.1"
+PREFERRED_VERSION_tinc ?= "1.0.2"
+PREFERRED_VERSION_tinylogin ?= "1.4"
+PREFERRED_VERSION_tinyscheme ?= "1.35"
+PREFERRED_VERSION_tmake ?= "1.11"
+PREFERRED_VERSION_tmdns ?= "20030116"
+PREFERRED_VERSION_tn5250 ?= "0.16.5"
+PREFERRED_VERSION_tomoe ?= "0.2.1"
+PREFERRED_VERSION_tor ?= "0.1.1.26"
+PREFERRED_VERSION_totem ?= "1.0.4"
+PREFERRED_VERSION_tracker ?= "0.5.4"
+PREFERRED_VERSION_transconnect ?= "1.3-beta"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_tree ?= "1.5.1"
+PREFERRED_VERSION_treecc ?= "0.3.6"
+PREFERRED_VERSION_treecc-native ?= "0.3.6"
+PREFERRED_VERSION_tremor ?= "20041119"
+PREFERRED_VERSION_tron ?= "1.0.0"
+PREFERRED_VERSION_tscalib ?= "0.0.1-3"
+PREFERRED_VERSION_tsclient ?= "0.140"
+PREFERRED_VERSION_tslib ?= "1.0"
+PREFERRED_VERSION_ttf-bitstream-vera ?= "1.10"
+PREFERRED_VERSION_ttf-dejavu ?= "2.23"
+PREFERRED_VERSION_ttf-gentium ?= "1.02"
+PREFERRED_VERSION_ttf-hunkyfonts ?= "0.3.0"
+PREFERRED_VERSION_ttf-liberation ?= "0.2"
+PREFERRED_VERSION_ttf-sazanami ?= "20040629"
+PREFERRED_VERSION_ttyconv ?= "0.2.3"
+PREFERRED_VERSION_ttyrec ?= "1.0.8"
+PREFERRED_VERSION_tuxnes ?= "0.75"
+PREFERRED_VERSION_twin ?= "0.4.6"
+PREFERRED_VERSION_twisted ?= "2.5.0"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_twutils ?= "0.2"
+PREFERRED_VERSION_txdrug ?= "0.1"
+PREFERRED_VERSION_tximage ?= "0.2"
+PREFERRED_VERSION_tzcode-native ?= "2007k"
+PREFERRED_VERSION_tzdata ?= "2007k"
+PREFERRED_VERSION_u2nl ?= "1.3"
+PREFERRED_VERSION_uae4all ?= "0.7.1"
+PREFERRED_VERSION_ubahnnav ?= "0.4.1"
+PREFERRED_VERSION_u-boot ?= "1.2.0"
+PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
+PREFERRED_VERSION_udev ?= "118"
+PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
+PREFERRED_VERSION_udhcp ?= "0.9.8"
+PREFERRED_VERSION_ufraw ?= "0.12"
+PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.3"
+PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
+PREFERRED_VERSION_uim ?= "1.3.1"
+PREFERRED_VERSION_uim-native ?= "1.3.1"
+PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
+PREFERRED_VERSION_ulxmlrpcpp ?= "1.5.2"
+PREFERRED_VERSION_uml-utilities ?= "20040406"
+PREFERRED_VERSION_unfreeze ?= "1.0"
+PREFERRED_VERSION_unionfs-modules ?= "1.0.13"
+PREFERRED_VERSION_unionfs-utils ?= "1.0.13"
+PREFERRED_VERSION_unionroot ?= "0.1.1"
+PREFERRED_VERSION_units ?= "1.80"
+PREFERRED_VERSION_unixbench ?= "4.1.0"
+PREFERRED_VERSION_unrar ?= "3.4.3"
+PREFERRED_VERSION_unrar-native ?= "3.4.3"
+PREFERRED_VERSION_unzip ?= "552"
+PREFERRED_VERSION_unzip-native ?= "552"
+PREFERRED_VERSION_update-alternatives-cworth ?= "0.99.154"
+PREFERRED_VERSION_update-alternatives-cworth-native ?= "0.99.154"
+PREFERRED_VERSION_update-alternatives-dpkg ?= "1.13.22"
+PREFERRED_VERSION_update-alternatives-dpkg-native ?= "1.13.22"
+PREFERRED_VERSION_update-modules ?= "1.0"
+PREFERRED_VERSION_upstart ?= "0.3.8"
+PREFERRED_VERSION_uqm ?= "0.5.0"
+PREFERRED_VERSION_usb-gadget-mode ?= "0.0.2"
+PREFERRED_VERSION_usbutils ?= "0.70"
+PREFERRED_VERSION_usbview ?= "1.0"
+PREFERRED_VERSION_ushare ?= "0.9.7"
+PREFERRED_VERSION_usound ?= "0.2.0"
+PREFERRED_VERSION_usrp ?= "0.12"
+PREFERRED_VERSION_util-linux ?= "2.12r"
+PREFERRED_VERSION_util-linux-native ?= "2.12r"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_uucp ?= "1.07"
+PREFERRED_VERSION_v4l2apps ?= "20020317"
+PREFERRED_VERSION_vala ?= "0.5.7"
+PREFERRED_VERSION_vala-native ?= "0.5.7"
+PREFERRED_VERSION_vde ?= "2.0.2"
+PREFERRED_VERSION_vectoroids ?= "1.1.0"
+PREFERRED_VERSION_videoplayer ?= "0.1"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_vim ?= "7.0"
+PREFERRED_VERSION_vim-tiny ?= "7.0"
+PREFERRED_VERSION_vino ?= "2.16.0"
+PREFERRED_VERSION_visiscript ?= "0.4.3"
+PREFERRED_VERSION_visual-boot ?= "0.0.1"
+PREFERRED_VERSION_vlan ?= "1.9"
+PREFERRED_VERSION_vlc-gpe ?= "0.8.4"
+PREFERRED_VERSION_vmedit ?= "0.02"
+PREFERRED_VERSION_vnc ?= "3.3.7"
+PREFERRED_VERSION_vochistory ?= "0.1"
+PREFERRED_VERSION_voicecall ?= "0.1"
+PREFERRED_VERSION_void11 ?= "0.2.0"
+PREFERRED_VERSION_vorbis-tools ?= "1.0.1"
+PREFERRED_VERSION_vpnc ?= "0.3.3"
+PREFERRED_VERSION_vsftpd ?= "2.0.5"
+PREFERRED_VERSION_vte ?= "0.16.14"
+PREFERRED_VERSION_vtun ?= "2.6"
+PREFERRED_VERSION_w3cam ?= "0.7.2"
+PREFERRED_VERSION_wakelan ?= "1.1"
+PREFERRED_VERSION_watchdog ?= "5.3.1"
+PREFERRED_VERSION_wbxml2 ?= "0.9.0"
+PREFERRED_VERSION_webcam-server ?= "0.50"
+PREFERRED_VERSION_wget ?= "1.9.1"
+PREFERRED_VERSION_whois ?= "4.5.25"
+PREFERRED_VERSION_wifistix-modules ?= "5.0.16.p0"
+PREFERRED_VERSION_wiggle ?= "0.6"
+PREFERRED_VERSION_wiggle-native ?= "0.6"
+PREFERRED_VERSION_win4 ?= "1.0.1"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_wireshark ?= "0.99.4"
+PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
+PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
+PREFERRED_VERSION_wmctrl ?= "1.07"
+PREFERRED_VERSION_wpa-gui ?= "0.4.8"
+PREFERRED_VERSION_wpa-supplicant ?= "0.6.9"
+PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
+PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
+PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
+PREFERRED_VERSION_wrt-init ?= "1.0"
+PREFERRED_VERSION_wrt-utils ?= "1.0"
+PREFERRED_VERSION_wv ?= "1.2.0"
+PREFERRED_VERSION_wview-sim ?= "3.1.3"
+PREFERRED_VERSION_wview-sim-mysql ?= "3.1.3"
+PREFERRED_VERSION_wview-vpro ?= "3.1.3"
+PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3"
+PREFERRED_VERSION_wview-wxt510 ?= "3.1.3"
+PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3"
+PREFERRED_VERSION_wxwidgets ?= "2.8.7"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
+PREFERRED_VERSION_x11vnc ?= "0.9.3"
+PREFERRED_VERSION_xaos ?= "3.2.3"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xawtv ?= "3.93"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbase-clients ?= "1.0"
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcb-demo ?= "0.1"
+PREFERRED_VERSION_xcb-proto ?= "1.0"
+PREFERRED_VERSION_xcb-util ?= "0.2"
+PREFERRED_VERSION_xchat ?= "2.8.4"
+PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xerces-c ?= "2.7.0"
+PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xextproto ?= "7.0.2"
+PREFERRED_VERSION_xextproto-native ?= "7.0.2"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
+PREFERRED_VERSION_xf86dga ?= "1.0.2"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xf86driproto ?= "2.0.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.1.5"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
+PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.5.1"
+PREFERRED_VERSION_xf86-video-sis ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xfcalendar ?= "4.2.3"
+PREFERRED_VERSION_xfce4-appfinder ?= "4.4.1"
+PREFERRED_VERSION_xfce4-dev-tools ?= "4.4.0"
+PREFERRED_VERSION_xfce4-icon-theme ?= "4.4.1"
+PREFERRED_VERSION_xfce4-mixer ?= "4.4.1"
+PREFERRED_VERSION_xfce4-panel ?= "4.4.1"
+PREFERRED_VERSION_xfce4-session ?= "4.4.1"
+PREFERRED_VERSION_xfce-mcs-manager ?= "4.4.1"
+PREFERRED_VERSION_xfce-mcs-plugins ?= "4.4.1"
+PREFERRED_VERSION_xfce-terminal ?= "0.2.6"
+PREFERRED_VERSION_xfdesktop ?= "4.4.1"
+PREFERRED_VERSION_xffm ?= "4.3.99.2"
+PREFERRED_VERSION_xfonts-xorg ?= "6.8"
+PREFERRED_VERSION_xfprint ?= "4.4.1"
+PREFERRED_VERSION_xfs ?= "1.0.4"
+PREFERRED_VERSION_xfsprogs ?= "2.8.16"
+PREFERRED_VERSION_xfwm4 ?= "4.4.1"
+PREFERRED_VERSION_xfwm4-themes ?= "4.4.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xineramaproto ?= "1.1.2"
+PREFERRED_VERSION_xinetd ?= "2.3.13"
+PREFERRED_VERSION_xinit ?= "1.0.5"
+PREFERRED_VERSION_xkbd ?= "0.8.15"
+PREFERRED_VERSION_xmame ?= "0.100"
+PREFERRED_VERSION_xmame-tiny ?= "0.100"
+PREFERRED_VERSION_xmms ?= "1.2.10"
+PREFERRED_VERSION_xmms-embedded ?= "20040327"
+PREFERRED_VERSION_xmms-mad ?= "0.10"
+PREFERRED_VERSION_xmms-tremor ?= "1.0"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmonobut ?= "0.4.1"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+PREFERRED_VERSION_xorg-headers-native ?= "1.0"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+PREFERRED_VERSION_xoscope ?= "1.12"
+PREFERRED_VERSION_xournal ?= "0.4.0.1"
+PREFERRED_VERSION_xpext ?= "1.0-5"
+PREFERRED_VERSION_xprint ?= "0.9.001"
+PREFERRED_VERSION_xprop ?= "1.0.2"
+PREFERRED_VERSION_xproto ?= "7.0.10"
+PREFERRED_VERSION_xproto-native ?= "7.0.10"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
+PREFERRED_VERSION_xqt ?= "0.0.9"
+PREFERRED_VERSION_xqt2 ?= "20060509"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xscreensaver ?= "4.22"
+PREFERRED_VERSION_xscrnsaverh ?= "1.0"
+PREFERRED_VERSION_xserver-common ?= "1.18"
+PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
+PREFERRED_VERSION_xserver-kdrive-common ?= "0.1"
+PREFERRED_VERSION_xserver-nodm-init ?= "1.0"
+PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsp ?= "1.0.0-8"
+PREFERRED_VERSION_xst ?= "0.15"
+PREFERRED_VERSION_xstroke ?= "0.6"
+PREFERRED_VERSION_xterm ?= "207"
+PREFERRED_VERSION_xtrans ?= "1.0.4"
+PREFERRED_VERSION_xtrans-native ?= "1.0.3"
+PREFERRED_VERSION_xtscal ?= "0.6.3"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_yeaphone ?= "0.1"
+PREFERRED_VERSION_ypbind-mt ?= "1.19"
+PREFERRED_VERSION_ypserv ?= "2.17"
+PREFERRED_VERSION_yp-tools ?= "2.9"
+PREFERRED_VERSION_zauralign ?= "1.0.2"
+PREFERRED_VERSION_zaurus-tarball-native ?= "1.0"
+PREFERRED_VERSION_zbedic ?= "1.0"
+PREFERRED_VERSION_zbench ?= "2.0"
+PREFERRED_VERSION_zcip ?= "4"
+PREFERRED_VERSION_zd1211-firmware ?= "1.3"
+PREFERRED_VERSION_zd1211 ?= "r85"
+PREFERRED_VERSION_zddice ?= "1.0.0"
+PREFERRED_VERSION_zeroconf ?= "0.9"
+PREFERRED_VERSION_zgscore ?= "1.0.2"
+PREFERRED_VERSION_zile ?= "2.2.15"
+PREFERRED_VERSION_zip ?= "2.32"
+PREFERRED_VERSION_zip-native ?= "2.32"
+PREFERRED_VERSION_zipsc ?= "0.4.3"
+PREFERRED_VERSION_ziq ?= "1.1ern"
+PREFERRED_VERSION_zlapspeed ?= "1.0.0"
+PREFERRED_VERSION_zlib ?= "1.2.3"
+PREFERRED_VERSION_zlib-native ?= "1.2.3"
+PREFERRED_VERSION_zmerlin ?= "0.9.1"
+PREFERRED_VERSION_zope ?= "3.3.1"
+PREFERRED_VERSION_zrally ?= "0.90"
+PREFERRED_VERSION_zrev7 ?= "1.0.1"
+PREFERRED_VERSION_zroadmap ?= "1.1.0"
+PREFERRED_VERSION_zsafe ?= "2.1.3"
+PREFERRED_VERSION_zsh ?= "4.1.1"
+PREFERRED_VERSION_zshopi ?= "0.2"
+PREFERRED_VERSION_zsubhunt ?= "1.0.0ern"
+PREFERRED_VERSION_ztappy ?= "0.9.3ern"
+PREFERRED_VERSION_zten ?= "1.6.2"
+PREFERRED_VERSION_zuc ?= "1.1.2ern"
+PREFERRED_VERSION_zudoku ?= "1.1"
+PREFERRED_VERSION_zziplib ?= "0.10.82"
diff --git a/conf/distro/include/preferred-om-2009-versions.inc b/conf/distro/include/preferred-om-2009-versions.inc
new file mode 100644
index 0000000000..c65750d011
--- /dev/null
+++ b/conf/distro/include/preferred-om-2009-versions.inc
@@ -0,0 +1,27 @@
+PREFERRED_VERSION_automake-native = "1.10"
+PREFERRED_VERSION_busybox = "1.11.3"
+PREFERRED_VERSION_cairo = "1.8.0"
+PREFERRED_VERSION_fontconfig = "2.6.0"
+PREFERRED_VERSION_glib-2.0 = "2.18.3"
+PREFERRED_VERSION_glib-2.0-native = "2.18.0"
+PREFERRED_VERSION_glibmm = "2.18.0"
+PREFERRED_VERSION_glproto = "1.4.9"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gtk+ = "2.14.2"
+PREFERRED_VERSION_gtkmm = "2.14.1"
+PREFERRED_VERSION_libgemwidget = "1.0"
+PREFERRED_VERSION_libgpephone = "0.4"
+PREFERRED_VERSION_libosip2 = "2.2.2"
+PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libtool = "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross = "2.2.4"
+PREFERRED_VERSION_libtool-sdk = "2.2.4"
+PREFERRED_VERSION_pango = "1.22.0"
+PREFERRED_VERSION_pixman = "0.12.0"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.10"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+PREFERRED_VERSION_udev = "124"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc
deleted file mode 100644
index 263406c90b..0000000000
--- a/conf/distro/include/preferred-openmoko-versions.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Specify which versions of OpenMoko packages to build
-#
-
-#
-# Base
-#
-
-SRCDATE_uboot = "now"
-SRCDATE_uboot-gta01 = "now"
-SRCDATE_kernel = "now"
-SRCDATE_linux-gta01 = "now"
-SRCDATE_linux-gta01-nobbt = "now"
-SRCDATE_libgsmd = "now"
-SRCDATE_openmoko-session = "now"
-SRCDATE_openmoko-common = "now"
-SRCDATE_openmoko-theme-standard = "now"
-SRCDATE_openmoko-libs = "now"
-
-#
-# Examples
-#
-SRCDATE_openmoko-stylus-demo = "now"
-SRCDATE_openmoko-stylus-demo-simple = "now"
-SRCDATE_openmoko-finger-demo = "now"
-SRCDATE_openmoko-panel-demo = "now"
-SRCDATE_openmoko-panel-demo-simple = "now"
-
-#
-# PIM
-#
-SRCDATE_openmoko-contacts = "now"
-SRCDATE_openmoko-dates = "now"
-
-#
-# Applications
-#
-SRCDATE_openmoko-appmanager = "now"
-SRCDATE_openmoko-chordmaster = "now"
-SRCDATE_openmoko-dialer = "now"
-SRCDATE_openmoko-footer = "now"
-SRCDATE_openmoko-phone = "now"
-SRCDATE_openmoko-mainmenu = "now"
-SRCDATE_openmoko-taskmanager = "now"
-
-#
-# Multimedia
-#
-SRCDATE_openmoko-simplemediaplayer = "now"
-
-#
-# Panel Plugins
-#
-SRCDATE_openmoko-panel-clock = "now"
-SRCDATE_openmoko-panel-battery = "now"
-SRCDATE_openmoko-panel-mainmenu = "now"
-SRCDATE_openmoko-panel-gsm = "now"
-SRCDATE_openmoko-panel-gps = "now"
-SRCDATE_openmoko-panel-bt = "now"
-SRCDATE_openmoko-panel-usb = "now"
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index d27f56fb04..79fc56c08c 100644
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -42,7 +42,7 @@ SRCDATE_opie-buzzword ?= "${OPIE_VERSION}"
SRCDATE_opie-calculator ?= "${OPIE_VERSION}"
SRCDATE_opie-calibrate ?= "${OPIE_VERSION}"
SRCDATE_opie-camera ?= "${OPIE_VERSION}"
-SRCDATE_opie-cardmon ?= "${OPIE_VERSION}"
+SRCDATE_opie-cardapplet ?= "${OPIE_VERSION}"
SRCDATE_opie-checkbook ?= "${OPIE_VERSION}"
SRCDATE_opie-citytime ?= "${OPIE_VERSION}"
SRCDATE_opie-clipboardapplet ?= "${OPIE_VERSION}"
@@ -206,4 +206,4 @@ SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}"
SRCDATE_opie-zlines ?= "${OPIE_VERSION}"
SRCDATE_opie-zsafe ?= "${OPIE_VERSION}"
SRCDATE_opie-zsame ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index 1f39916f4f..56bb4fbeaa 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -176,7 +176,7 @@ PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}+cvs20070922"
PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4.inc
index 324f4dd80c..cc5dbd53b9 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4.inc
@@ -1,12 +1,9 @@
#
# Default versions
QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.4"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070727"
-OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
-OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
-
#
#
# Opie libraries
@@ -15,21 +12,12 @@ PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHRE
PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
PREFERRED_VERSION_qte = "${QTE_VERSION}"
-
PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
-
-SRCDATE_libopie2 ?= "${OPIE_SRCDATE}"
-SRCDATE_libopieobex0 = "${OPIE_SRCDATE}"
-SRCDATE_libopietooth1 = "${OPIE_SRCDATE}"
-SRCDATE_libqpe-opie = "${OPIE_SRCDATE}"
-SRCDATE_libqtaux2 = "${OPIE_SRCDATE}"
-SRCDATE_libmailwrapper = "${OPIE_SRCDATE}"
-
#
# Opie applications
#
@@ -54,7 +42,7 @@ PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-cardapplet = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
@@ -141,7 +129,6 @@ PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
@@ -220,195 +207,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-
-PREFERRED_VERSION_konqueror-embedded = "20070212"
-
-
-SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-addressbook = "${OPIE_SRCDATE}"
-SRCDATE_opie-advancedfm = "${OPIE_SRCDATE}"
-SRCDATE_opie-alarm = "${OPIE_SRCDATE}"
-SRCDATE_opie-appearance = "${OPIE_SRCDATE}"
-SRCDATE_opie-aqpkg = "${OPIE_SRCDATE}"
-SRCDATE_opie-autorotateapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-backgammon = "${OPIE_SRCDATE}"
-SRCDATE_opie-backup = "${OPIE_SRCDATE}"
-SRCDATE_opie-bartender = "${OPIE_SRCDATE}"
-SRCDATE_opie-batteryapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-bluepin ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bluetoothapplet ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bluetoothmanager ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bounce = "${OPIE_SRCDATE}"
-SRCDATE_opie-brightnessapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-button-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-buzzword = "${OPIE_SRCDATE}"
-SRCDATE_opie-calculator = "${OPIE_SRCDATE}"
-SRCDATE_opie-calibrate = "${OPIE_SRCDATE}"
-SRCDATE_opie-camera = "${OPIE_SRCDATE}"
-SRCDATE_opie-cardmon = "${OPIE_SRCDATE}"
-SRCDATE_opie-checkbook = "${OPIE_SRCDATE}"
-SRCDATE_opie-citytime = "${OPIE_SRCDATE}"
-SRCDATE_opie-clipboardapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-clockapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-clock = "${OPIE_SRCDATE}"
-SRCDATE_opie-confeditor = "${OPIE_SRCDATE}"
-SRCDATE_opie-console = "${OPIE_SRCDATE}"
-SRCDATE_opie-dagger = "${OPIE_SRCDATE}"
-SRCDATE_opie-dasher = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-birthdayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-flat = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-liquid = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-polished = "${OPIE_SRCDATE}"
-SRCDATE_opie-doctab = "${OPIE_SRCDATE}"
-SRCDATE_opie-drawpad = "${OPIE_SRCDATE}"
-SRCDATE_opie-dvorak = "${OPIE_SRCDATE}"
-SRCDATE_opie-embeddedkonsole = "${OPIE_SRCDATE}"
-SRCDATE_opie-euroconv = "${OPIE_SRCDATE}"
-SRCDATE_opie-examples-python = "${OPIE_SRCDATE}"
-SRCDATE_opie-examples = "${OPIE_SRCDATE}"
-SRCDATE_opie-eye = "${OPIE_SRCDATE}"
-SRCDATE_opie-fifteen = "${OPIE_SRCDATE}"
-SRCDATE_opie-formatter = "${OPIE_SRCDATE}"
-SRCDATE_opie-freetype = "${OPIE_SRCDATE}"
-SRCDATE_opie-ftplib = "${OPIE_SRCDATE}"
-SRCDATE_opie-ftp = "${OPIE_SRCDATE}"
-SRCDATE_opie-go = "${OPIE_SRCDATE}"
-SRCDATE_opie-gutenbrowser = "${OPIE_SRCDATE}"
-SRCDATE_opie-handwriting = "${OPIE_SRCDATE}"
-SRCDATE_opie-helpbrowser = "${OPIE_SRCDATE}"
-SRCDATE_opie-help-en = "${OPIE_SRCDATE}"
-SRCDATE_opie-homeapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-i18n = "${OPIE_SRCDATE}"
-SRCDATE_opie-lrelease-native = "${OPIE_SRCDATE}"
-SRCDATE_opie-lupdate-native = "${OPIE_SRCDATE}"
-SRCDATE_opie-icon-reload = "${OPIE_SRCDATE}"
-SRCDATE_opie-irc = "${OPIE_SRCDATE}"
-SRCDATE_opie-irdaapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-jumpx = "${OPIE_SRCDATE}"
-SRCDATE_opie-kbill = "${OPIE_SRCDATE}"
-SRCDATE_opie-kcheckers = "${OPIE_SRCDATE}"
-SRCDATE_opie-keyboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-keypebble = "${OPIE_SRCDATE}"
-SRCDATE_opie-keytabs = "${OPIE_SRCDATE}"
-SRCDATE_opie-keyview = "${OPIE_SRCDATE}"
-SRCDATE_opie-kjumpx = "${OPIE_SRCDATE}"
-SRCDATE_opie-kpacman = "${OPIE_SRCDATE}"
-SRCDATE_opie-language = "${OPIE_SRCDATE}"
-SRCDATE_opie-launcher-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-libqrsync = "${OPIE_SRCDATE}"
-SRCDATE_opie-light-and-power = "${OPIE_SRCDATE}"
-SRCDATE_opie-lockapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-login = "${OPIE_SRCDATE}"
-SRCDATE_opie-logoutapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mailapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mail = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-core = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1 = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2 = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediummount = "${OPIE_SRCDATE}"
-SRCDATE_opie-memoryapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mindbreaker = "${OPIE_SRCDATE}"
-SRCDATE_opie-minesweep = "${OPIE_SRCDATE}"
-SRCDATE_opie-mobilemsg = "${OPIE_SRCDATE}"
-SRCDATE_opie-multikeyapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-multikey = "${OPIE_SRCDATE}"
-SRCDATE_opie-networkapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-networksettings = "${OPIE_SRCDATE}"
-SRCDATE_opie-notesapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-odict = "${OPIE_SRCDATE}"
-SRCDATE_opie-osearch = "${OPIE_SRCDATE}"
-SRCDATE_opie-oxygen = "${OPIE_SRCDATE}"
-SRCDATE_opie-oyatzee = "${OPIE_SRCDATE}"
-SRCDATE_opie-packagemanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-parashoot = "${OPIE_SRCDATE}"
-SRCDATE_opie-pcmciaapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-performance = "${OPIE_SRCDATE}"
-SRCDATE_opie-pickboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-pics = "${OPIE_SRCDATE}"
-SRCDATE_opie-pimconverter = "${OPIE_SRCDATE}"
-SRCDATE_opie-powerchord = "${OPIE_SRCDATE}"
-SRCDATE_opie-pyquicklaunchapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-qasteroids = "${OPIE_SRCDATE}"
-SRCDATE_opie-qcop = "${OPIE_SRCDATE}"
-SRCDATE_opie-quicklauncher = "${OPIE_SRCDATE}"
-SRCDATE_opie-qss = "${OPIE_SRCDATE}"
-SRCDATE_opie-rdesktop = "${OPIE_SRCDATE}"
-SRCDATE_opie-reader = "${OPIE_SRCDATE}"
-SRCDATE_opie-recorder = "${OPIE_SRCDATE}"
-SRCDATE_opie-remote = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet2 = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-rotateapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-screenshotapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-search = "${OPIE_SRCDATE}"
-SRCDATE_opie-security = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-blueping = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-dummy = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-notice = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-pin = "${OPIE_SRCDATE}"
-SRCDATE_opie-sfcave = "${OPIE_SRCDATE}"
-SRCDATE_opie-sheet = "${OPIE_SRCDATE}"
-SRCDATE_opie-sh = "${OPIE_SRCDATE}"
-SRCDATE_opie-showimg = "${OPIE_SRCDATE}"
-SRCDATE_opie-snake = "${OPIE_SRCDATE}"
-SRCDATE_opie-solitaire = "${OPIE_SRCDATE}"
-SRCDATE_opie-sshkeys = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-flat = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-fresh = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-liquid = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-metal = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-phase = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-web = "${OPIE_SRCDATE}"
-SRCDATE_opie-sounds = "${OPIE_SRCDATE}"
-SRCDATE_opie-suspendapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-symlinker = "${OPIE_SRCDATE}"
-SRCDATE_opie-sysinfo = "${OPIE_SRCDATE}"
-SRCDATE_opie-systemtime = "${OPIE_SRCDATE}"
-SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
-SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
-SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}"
-SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
-SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
-SRCDATE_opie-theme = "${OPIE_SRCDATE}"
-SRCDATE_opie-tictac = "${OPIE_SRCDATE}"
-SRCDATE_opie-tinykate = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-addressbookplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-datebookplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-fortuneplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-mailplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-stocktickerplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-todolistplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-weatherplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-todo = "${OPIE_SRCDATE}"
-SRCDATE_opie-tonleiter = "${OPIE_SRCDATE}"
-SRCDATE_opie-unikeyboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-usermanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-vmemo = "${OPIE_SRCDATE}"
-SRCDATE_opie-vmemo-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-volumeapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-vtapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-wellenreiter = "${OPIE_SRCDATE}"
-SRCDATE_opie-wirelessapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-wordgame = "${OPIE_SRCDATE}"
-SRCDATE_opie-write = "${OPIE_SRCDATE}"
-SRCDATE_opie-zkbapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-zlines = "${OPIE_SRCDATE}"
-SRCDATE_opie-zsafe = "${OPIE_SRCDATE}"
-SRCDATE_opie-zsame = "${OPIE_SRCDATE}"
-SRCDATE_opie-sh-snes = "${OPIE_SRCDATE}"
-SRCDATE_opie-stumbler = "${OPIE_SRCDATE}"
-
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
new file mode 100644
index 0000000000..39b1f0764e
--- /dev/null
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -0,0 +1,50 @@
+# Upgraded
+# use newer version then preferred by default
+PREFERRED_VERSION_boost = "1.40.0"
+PREFERRED_VERSION_dbus = "1.3.0"
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
+PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
+PREFERRED_VERSION_strace = "4.5.15"
+
+# We need this for jamvm
+PREFERRED_VERSION_classpath = "0.98"
+PREFERRED_VERSION_classpath-native = "0.98"
+
+# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
+# and 2.6.31 for fsodeviced
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
+
+# override EFL_SRCREV from sane-srcrevs.inc
+# EFL_SRCREV ?= "44424"
+
+# specifically set an openssh version
+# NOTE: whenever changing the version here make sure
+# to check we won't loose our specific config !!!
+PREFERRED_VERSION_openssh = "5.2p1"
+
+# upgrades used in Angstrom
+PREFERRED_VERSION_gtk+ = "2.18.3"
+PREFERRED_VERSION_hal = "0.5.13"
+PREFERRED_VERSION_libtool = "2.2.6a"
+PREFERRED_VERSION_libtool-native = "2.2.6a"
+PREFERRED_VERSION_libtool-cross = "2.2.6a"
+PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_udev = "141"
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+UDEV_GE_141 = "1"
+
+ANGSTROM_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+
+# Downgraded
+# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
+PREFERRED_VERSION_python-pygtk = "2.10.4"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
new file mode 100644
index 0000000000..204047fd63
--- /dev/null
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -0,0 +1,70 @@
+#===============================================================================#
+#===============================================================================#
+# NOTE NOTE NOTE
+#
+# This *forces* the preferred kernel version; making it unable to be overridden
+# in the local.conf file. This is a Very Bad Thing. This is temporary, and
+# is intended to facilitate some SlugOS-specific testing without disturbing
+# other distros that use the ixp4xx machine type (which is currently where the
+# preferred kernel version is set).
+#
+# This *must* be removed after initial testing is completed. MJW 08-Dec-2008
+#
+PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}"
+#
+#===============================================================================#
+#===============================================================================#
+# NOTE NOTE NOTE
+#
+# Override the sane-srcrev file with regard to the opkg versions - this should
+# be removed as soon as opkg starts to work correctly again as newer opkg
+# versions fix a number of bugs and add some desireable features.
+#
+SRCREV_pn-opkg = "160"
+SRCREV_pn-opkg-native = "160"
+SRCREV_pn-opkg-sdk = "160"
+#
+#===============================================================================#
+#===============================================================================#
+
+### Standard package preferred versions go here, sorted
+### alphabetically. Note that the main slugos.inc file
+### may include preferred versions for toolchain components.
+
+PREFERRED_VERSION_automake-native ?= "1.10.2"
+PREFERRED_VERSION_binutils ?= "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7"
+PREFERRED_VERSION_busybox ?= "1.13.2"
+PREFERRED_VERSION_dbus ?= "1.2.3"
+PREFERRED_VERSION_gcc ?= "4.2.4"
+PREFERRED_VERSION_gcc-cross ?= "4.2.4"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.2.4"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "4.2.4"
+PREFERRED_VERSION_glib-2.0 ?= "2.22.1"
+PREFERRED_VERSION_glib-2.0-native ?= "2.22.1"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_ipkg ?= "0.99.163"
+PREFERRED_VERSION_ipkg-native ?= "0.99.163"
+PREFERRED_VERSION_libtool ?= "2.2.6a"
+PREFERRED_VERSION_libtool-native ?= "2.2.6a"
+PREFERRED_VERSION_libtool-cross ?= "2.2.6a"
+PREFERRED_VERSION_libtool-sdk ?= "2.2.6a"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
+PREFERRED_VERSION_m4 ?= "1.4.8"
+PREFERRED_VERSION_m4-native ?= "1.4.8"
+PREFERRED_VERSION_netatalk ?= "2.0.3"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
+PREFERRED_VERSION_pkgconfig ?= "0.23"
+PREFERRED_VERSION_pkgconfig-native ?= "0.23"
+PREFERRED_VERSION_udev ?= "118"
+
+##################### Stuff with special notes, and broken stuff:
+
+# boost 1.36 won't build
+PREFERRED_VERSION_boost ?= "1.33.1"
+
+# pulseaudio 0.9.19 is broken (ASM errors during do_compile):
+PREFERRED_VERSION_pulseaudio ?= "0.9.15"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
index 6db9d92f71..5a391aa45a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1"
PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
+
+# Unreleased Packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
index 782549589d..c387161577 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2"
PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0"
PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
index 59a481a104..dc34a99340 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
@@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
PREFERRED_VERSION_xserver-xorg ?= "1.2.0"
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
new file mode 100644
index 0000000000..648472e9b6
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -0,0 +1,287 @@
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.3"
+
+# app
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_beforelight ?= "1.0.2"
+PREFERRED_VERSION_bitmap ?= "1.0.2"
+PREFERRED_VERSION_editres ?= "1.0.2"
+PREFERRED_VERSION_fontosfnt ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "1.0.1"
+PREFERRED_VERSION_fstobdf ?= "1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.1"
+PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_luit ?= "1.0.2"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rstart ?= "1.0.2"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "1.0.1"
+PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcmsdb ?= "1.0.1"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xedit ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.1"
+PREFERRED_VERSION_xeyes ?= "1.0.1"
+PREFERRED_VERSION_xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.1"
+PREFERRED_VERSION_xfs ?= "1.0.4"
+PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xgc ?= "1.0.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinit ?= "1.0.5"
+PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbevd ?= "1.0.2"
+PREFERRED_VERSION_xkbprint ?= "1.0.1"
+PREFERRED_VERSION_xkbutils ?= "1.0.1"
+PREFERRED_VERSION_xkill ?= "1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.1"
+PREFERRED_VERSION_xlsclients ?= "1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "1.0.1"
+PREFERRED_VERSION_xmag ?= "1.0.2"
+PREFERRED_VERSION_xman ?= "1.0.3"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.1"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "1.0.3"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xrefresh ?= "1.0.2"
+PREFERRED_VERSION_xrx ?= "1.0.1"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.0"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_xwd ?= "1.0.1"
+PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwud ?= "1.0.1"
+
+#data
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
+
+# doc
+PREFERRED_VERSION_xorg-docs ?= "1.4"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+
+# driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.0"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.1"
+PREFERRED_VERSION_xf86-input-void ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.1.1"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
+PREFERRED_VERSION_xf86-video-sis ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+
+# font
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-util-native ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.0.1"
+
+# lib
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.2"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxmu ?= "1.0.3"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxt ?= "1.0.4"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_xtrans ?= "1.0.4"
+
+# proto
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_glproto ?= "1.4.8"
+PREFERRED_VERSION_inputproto ?= "1.4.2.1"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xproto-native ?= "7.0.10"
+PREFERRED_VERSION_xproto ?= "7.0.10"
+
+# util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+
+# xserver
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
new file mode 100644
index 0000000000..4acca00174
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -0,0 +1,7 @@
+# This file is for updates after X11R7.4 was released
+
+PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1"
+PREFERRED_VERSION_libxi ?= "1.2.0"
+PREFERRED_VERSION_inputproto ?= "1.5.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
new file mode 100644
index 0000000000..11640d5cdc
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -0,0 +1,262 @@
+# see http://www.x.org/wiki/Releases/7.4
+# WORK IN PROGRESS, 7.4 will be released on 2008-03-01
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.4"
+
+# app
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_bitmap ?= "1.0.3"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_luit ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
+PREFERRED_VERSION_mkfontdir ?= "1.0.4"
+PREFERRED_VERSION_mkfontscale ?= "1.0.5"
+PREFERRED_VERSION_sessreg ?= "1.0.4"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "1.0.2"
+PREFERRED_VERSION_x11perf ?= "1.5"
+PREFERRED_VERSION_xauth ?= "1.0.3"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xcmsdb ?= "1.0.1"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.3"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinput ?= "1.3.0"
+PREFERRED_VERSION_xkbcomp ?= "1.0.5"
+PREFERRED_VERSION_xkbcomp-native ?= "1.0.5"
+PREFERRED_VERSION_xkbevd ?= "1.0.2"
+PREFERRED_VERSION_xkbutils ?= "1.0.1"
+PREFERRED_VERSION_xkill ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.1"
+PREFERRED_VERSION_xlsclients ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xpr ?= "1.0.2"
+PREFERRED_VERSION_xprop ?= "1.0.4"
+PREFERRED_VERSION_xrandr ?= "1.2.3"
+PREFERRED_VERSION_xrdb ?= "1.0.5"
+PREFERRED_VERSION_xrefresh ?= "1.0.2"
+PREFERRED_VERSION_xset ?= "1.0.4"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_xwd ?= "1.0.2"
+PREFERRED_VERSION_xwininfo ?= "1.0.4"
+PREFERRED_VERSION_xwud ?= "1.0.1"
+
+# data
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
+
+# doc
+PREFERRED_VERSION_xorg-docs ?= "1.4"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+
+# driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
+PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.10.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.12"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
+
+# font
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-util-native ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
+
+# lib
+PREFERRED_VERSION_diet-x11 ?= "1.1.5"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfs ?= "1.0.1"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libpciaccess ?= "0.10.3"
+PREFERRED_VERSION_libsm ?= "1.1.0"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
+PREFERRED_VERSION_libx11 ?= "1.1.5"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
+PREFERRED_VERSION_libxau ?= "1.0.4"
+PREFERRED_VERSION_libxau-native ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.4"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.3"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxft ?= "2.1.13"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxinerama ?= "1.0.3"
+PREFERRED_VERSION_libxkbfile ?= "1.0.5"
+PREFERRED_VERSION_libxkbfile-native ?= "1.0.5"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_libxmu ?= "1.0.4"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxrandr ?= "1.2.3"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxv ?= "1.0.4"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
+PREFERRED_VERSION_xtrans ?= "1.2.1"
+
+# This should be here but is needed until bitbake can do
+# versioned depends
+PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_xtrans-native ?= "1.2.1"
+
+# proto
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
+PREFERRED_VERSION_dri2proto ?= "1.1"
+PREFERRED_VERSION_evieext ?= "1.0.2"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
+PREFERRED_VERSION_glproto ?= "1.4.9"
+PREFERRED_VERSION_inputproto ?= "1.4.4"
+PREFERRED_VERSION_inputproto-native ?= "1.4.2"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_kbproto-native ?= "1.0.3"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
+PREFERRED_VERSION_xextproto ?= "7.0.3"
+PREFERRED_VERSION_xextproto-native ?= "7.0.3"
+PREFERRED_VERSION_xineramaproto ?= "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xf86driproto ?= "2.0.4"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xinemaroproto ?= "1.1.2"
+PREFERRED_VERSION_xproto-native ?= "7.0.13"
+PREFERRED_VERSION_xproto ?= "7.0.13"
+
+# util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_makedepend-native ?= "1.0.1"
+PREFERRED_VERSION_util-macros-native ?= "1.1.6"
+PREFERRED_VERSION_util-macros ?= "1.1.6"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+
+# xserver
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.5.1"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
new file mode 100644
index 0000000000..a8e0e49ce0
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
@@ -0,0 +1,126 @@
+#Fri Oct 30 10:44:28 CET 2009
+#app
+PREFERRED_VERSION_appres ?= "1.0.2"
+PREFERRED_VERSION_beforelight ?= "1.0.3"
+PREFERRED_VERSION_bitmap ?= "1.0.4"
+PREFERRED_VERSION_constype ?= "1.0.2"
+PREFERRED_VERSION_editres ?= "1.0.4"
+PREFERRED_VERSION_fonttosfnt ?= "1.0.4"
+PREFERRED_VERSION_fslsfonts ?= "1.0.2"
+PREFERRED_VERSION_fstobdf ?= "1.0.3"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.2"
+PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_mkcfm ?= "1.0.1"
+PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rendercheck ?= "1.3"
+PREFERRED_VERSION_rgb ?= "1.0.3"
+PREFERRED_VERSION_rstart ?= "1.0.3"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_showfont ?= "1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.4"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "1.1.0"
+PREFERRED_VERSION_xclock ?= "1.0.4"
+PREFERRED_VERSION_xcompmgr ?= "1.1.4"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.9"
+PREFERRED_VERSION_xedit ?= "1.1.2"
+PREFERRED_VERSION_xeyes ?= "1.1.0"
+PREFERRED_VERSION_xf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.1.0"
+PREFERRED_VERSION_xfsinfo ?= "1.0.2"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgc ?= "1.0.1"
+PREFERRED_VERSION_xinit ?= "1.1.1"
+PREFERRED_VERSION_xkbprint ?= "1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xmag ?= "1.0.3"
+PREFERRED_VERSION_xman ?= "1.1.0"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xrx ?= "1.0.3"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.1"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+#data
+PREFERRED_VERSION_xkbdata ?= "1.0.1"
+#doc
+#driver
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.2"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+#font
+PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1"
+#lib
+PREFERRED_VERSION_libxtrap ?= "1.0.0"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxfontcache ?= "1.0.5"
+PREFERRED_VERSION_libxp ?= "1.0.0"
+PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
+PREFERRED_VERSION_libxprintutil ?= "1.0.1"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
+PREFERRED_VERSION_liblbxutil ?= "1.1.0"
+PREFERRED_VERSION_liboldx ?= "1.0.1"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_pixman ?= "0.16.2"
+#proto
+PREFERRED_VERSION_evieext ?= "1.1.0"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
+PREFERRED_VERSION_printproto ?= "1.0.4"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
+PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
+#util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_lndir ?= "1.0.1"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
+#xserver
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
new file mode 100644
index 0000000000..368f766a5b
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -0,0 +1,291 @@
+# see http://www.x.org/wiki/Releases/7.5
+# 7.5 was released on 2009-10-26
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.5"
+
+# app
+PREFERRED_VERSION_bdftopcf ?= "1.0.2"
+PREFERRED_VERSION_bdftopcf-native ?= "1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.3"
+PREFERRED_VERSION_luit ?= "1.0.4"
+PREFERRED_VERSION_mkfontdir ?= "1.0.5"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.5"
+PREFERRED_VERSION_mkfontscale ?= "1.0.7"
+PREFERRED_VERSION_mkfontscale-native ?= "1.0.7"
+PREFERRED_VERSION_sessreg ?= "1.0.5"
+PREFERRED_VERSION_setxkbmap ?= "1.1.0"
+PREFERRED_VERSION_smproxy ?= "1.0.3"
+PREFERRED_VERSION_x11perf ?= "1.5.1"
+PREFERRED_VERSION_xauth ?= "1.0.4"
+PREFERRED_VERSION_xbacklight ?= "1.1.1"
+PREFERRED_VERSION_xcmsdb ?= "1.0.2"
+PREFERRED_VERSION_xcursorgen ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
+PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
+PREFERRED_VERSION_xdriinfo ?= "1.0.3"
+PREFERRED_VERSION_xev ?= "1.0.4"
+PREFERRED_VERSION_xgamma ?= "1.0.3"
+PREFERRED_VERSION_xhost ?= "1.0.3"
+PREFERRED_VERSION_xinput ?= "1.5.0"
+PREFERRED_VERSION_xkbcomp ?= "1.1.1"
+PREFERRED_VERSION_xkbcomp-native ?= "1.1.1"
+PREFERRED_VERSION_xkbevd ?= "1.1.0"
+PREFERRED_VERSION_xkbutils ?= "1.0.2"
+PREFERRED_VERSION_xkill ?= "1.0.2"
+PREFERRED_VERSION_xlsatoms ?= "1.0.2"
+PREFERRED_VERSION_xlsclients ?= "1.0.2"
+PREFERRED_VERSION_xmodmap ?= "1.0.4"
+PREFERRED_VERSION_xpr ?= "1.0.3"
+PREFERRED_VERSION_xprop ?= "1.1.0"
+PREFERRED_VERSION_xrandr ?= "1.3.2"
+PREFERRED_VERSION_xrdb ?= "1.0.6"
+PREFERRED_VERSION_xrefresh ?= "1.0.3"
+PREFERRED_VERSION_xset ?= "1.1.0"
+PREFERRED_VERSION_xsetroot ?= "1.0.3"
+PREFERRED_VERSION_xvinfo ?= "1.1.0"
+PREFERRED_VERSION_xwd ?= "1.0.3"
+PREFERRED_VERSION_xwininfo ?= "1.0.5"
+PREFERRED_VERSION_xwud ?= "1.0.2"
+
+# data
+PREFERRED_VERSION_xbitmaps ?= "1.1.0"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.2"
+
+# doc
+PREFERRED_VERSION_xorg-docs ?= "1.5"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
+
+# driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.3.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5"
+PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.2"
+PREFERRED_VERSION_xf86-video-ast ?= "0.89.9"
+PREFERRED_VERSION_xf86-video-ati ?= "6.12.4"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.6"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.11"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.15"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4"
+PREFERRED_VERSION_xf86-video-savage ?= "2.3.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.2"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-trident ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4"
+
+# font
+PREFERRED_VERSION_encodings ?= "1.0.3"
+PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2"
+PREFERRED_VERSION_font-alias ?= "1.0.2"
+PREFERRED_VERSION_font-arabic-misc ?= "1.0.1"
+PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-ttf ?= "1.0.1"
+PREFERRED_VERSION_font-bh-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-cursor-misc ?= "1.0.1"
+PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1"
+PREFERRED_VERSION_font-dec-misc ?= "1.0.1"
+PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-isas-misc ?= "1.0.1"
+PREFERRED_VERSION_font-jis-misc ?= "1.0.1"
+PREFERRED_VERSION_font-micro-misc ?= "1.0.1"
+PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-meltho ?= "1.0.1"
+PREFERRED_VERSION_font-misc-misc ?= "1.1.0"
+PREFERRED_VERSION_font-mutt-misc ?= "1.0.1"
+PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2"
+PREFERRED_VERSION_font-sony-misc ?= "1.0.1"
+PREFERRED_VERSION_font-sun-misc ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.1.1"
+PREFERRED_VERSION_font-util-native ?= "1.1.1"
+PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2"
+
+# lib
+PREFERRED_VERSION_libapplewm ?= "1.4.0"
+PREFERRED_VERSION_libfs ?= "1.0.2"
+PREFERRED_VERSION_libice ?= "1.0.6"
+PREFERRED_VERSION_libice-native ?= "1.0.6"
+PREFERRED_VERSION_libsm ?= "1.1.1"
+PREFERRED_VERSION_libsm-native ?= "1.1.1"
+PREFERRED_VERSION_libwindowswm ?= "1.0.1"
+PREFERRED_VERSION_libx11 ?= "1.3.2"
+PREFERRED_VERSION_libx11-native ?= "1.3.2"
+PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
+PREFERRED_VERSION_libxau ?= "1.0.5"
+PREFERRED_VERSION_libxau-native ?= "1.0.5"
+PREFERRED_VERSION_libxaw ?= "1.0.7"
+PREFERRED_VERSION_libxcomposite ?= "0.4.1"
+PREFERRED_VERSION_libxcursor ?= "1.1.10"
+PREFERRED_VERSION_libxcursor-native ?= "1.1.10"
+PREFERRED_VERSION_libxdamage ?= "1.1.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.3"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
+PREFERRED_VERSION_libxext ?= "1.1.1"
+PREFERRED_VERSION_libxext-native ?= "1.1.1"
+PREFERRED_VERSION_libxfixes ?= "4.0.4"
+PREFERRED_VERSION_libxfixes-native ?= "4.0.4"
+PREFERRED_VERSION_libxfont ?= "1.4.1"
+PREFERRED_VERSION_libxfont-native ?= "1.4.1"
+PREFERRED_VERSION_libxft ?= "2.1.14"
+PREFERRED_VERSION_libxi ?= "1.3"
+PREFERRED_VERSION_libxinerama ?= "1.1"
+PREFERRED_VERSION_libxmu ?= "1.0.5"
+PREFERRED_VERSION_libxpm ?= "3.5.8"
+PREFERRED_VERSION_libxrandr ?= "1.3.0"
+PREFERRED_VERSION_libxrender ?= "0.9.5"
+PREFERRED_VERSION_libxrender-native ?= "0.9.5"
+PREFERRED_VERSION_libxres ?= "1.0.4"
+PREFERRED_VERSION_libxt ?= "1.0.7"
+PREFERRED_VERSION_libxt-native ?= "1.0.7"
+PREFERRED_VERSION_libxtst ?= "1.1.0"
+PREFERRED_VERSION_libxv ?= "1.0.5"
+PREFERRED_VERSION_libxvmc ?= "1.0.5"
+PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
+PREFERRED_VERSION_libdmx ?= "1.1.0"
+PREFERRED_VERSION_libfontenc ?= "1.0.5"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
+PREFERRED_VERSION_libpciaccess ?= "0.10.9"
+PREFERRED_VERSION_libxkbfile ?= "1.0.6"
+PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_mesa-dri ?= "7.2"
+PREFERRED_VERSION_mesa-xlib ?= "7.2"
+PREFERRED_VERSION_xtrans ?= "1.2.5"
+PREFERRED_VERSION_xtrans-native ?= "1.2.5"
+
+# proto
+PREFERRED_VERSION_applewmproto ?= "1.4.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
+PREFERRED_VERSION_compositeproto ?= "0.4.1"
+PREFERRED_VERSION_damageproto ?= "1.2.0"
+PREFERRED_VERSION_dmxproto ?= "2.3"
+PREFERRED_VERSION_dri2proto ?= "2.1"
+PREFERRED_VERSION_fixesproto ?= "4.1.1"
+PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
+PREFERRED_VERSION_fontsproto ?= "2.1.0"
+PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
+PREFERRED_VERSION_glproto ?= "1.4.10"
+PREFERRED_VERSION_inputproto ?= "2.0"
+PREFERRED_VERSION_inputproto-native ?= "2.0"
+PREFERRED_VERSION_kbproto ?= "1.0.4"
+PREFERRED_VERSION_kbproto-native ?= "1.0.4"
+PREFERRED_VERSION_randrproto ?= "1.3.1"
+PREFERRED_VERSION_recordproto ?= "1.14"
+PREFERRED_VERSION_renderproto ?= "0.11"
+PREFERRED_VERSION_renderproto-native ?= "0.11"
+PREFERRED_VERSION_resourceproto ?= "1.1.0"
+PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
+PREFERRED_VERSION_videoproto ?= "2.3.0"
+PREFERRED_VERSION_windowswmproto ?= "1.0.4"
+PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
+PREFERRED_VERSION_xextproto ?= "7.1.1"
+PREFERRED_VERSION_xextproto-native ?= "7.1.1"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.1"
+PREFERRED_VERSION_xf86driproto ?= "2.1.0"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
+PREFERRED_VERSION_xineramaproto ?= "1.2"
+PREFERRED_VERSION_xproto ?= "7.0.16"
+PREFERRED_VERSION_xproto-native ?= "7.0.16"
+
+# util
+PREFERRED_VERSION_makedepend ?= "1.0.2"
+PREFERRED_VERSION_makedepend-native ?= "1.0.2"
+PREFERRED_VERSION_util-macros ?= "1.3.0"
+PREFERRED_VERSION_util-macros-native ?= "1.3.0"
+
+# xserver
+PREFERRED_VERSION_xserver-xorg ?= "1.7.1"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
new file mode 100644
index 0000000000..bea2b4105c
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -0,0 +1,357 @@
+#Thu Dec 31 14:54:51 CET 2009
+#app
+PREFERRED_VERSION_appres ?= "1.0.2"
+PREFERRED_VERSION_bdftopcf ?= "1.0.2"
+PREFERRED_VERSION_bdftopcf-native ?= "1.0.2"
+PREFERRED_VERSION_beforelight ?= "1.0.3"
+PREFERRED_VERSION_bitmap ?= "1.0.4"
+PREFERRED_VERSION_constype ?= "1.0.2"
+PREFERRED_VERSION_editres ?= "1.0.4"
+PREFERRED_VERSION_fonttosfnt ?= "1.0.4"
+PREFERRED_VERSION_fslsfonts ?= "1.0.2"
+PREFERRED_VERSION_fstobdf ?= "1.0.3"
+PREFERRED_VERSION_iceauth ?= "1.0.3"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.2"
+PREFERRED_VERSION_listres ?= "1.0.2"
+PREFERRED_VERSION_luit ?= "1.0.4"
+PREFERRED_VERSION_mkcfm ?= "1.0.1"
+PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
+PREFERRED_VERSION_mkfontdir ?= "1.0.5"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.5"
+PREFERRED_VERSION_mkfontscale ?= "1.0.7"
+PREFERRED_VERSION_mkfontscale-native ?= "1.0.7"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rendercheck ?= "1.3"
+PREFERRED_VERSION_rgb ?= "1.0.3"
+PREFERRED_VERSION_rstart ?= "1.0.3"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.5"
+PREFERRED_VERSION_setxkbmap ?= "1.1.0"
+PREFERRED_VERSION_showfont ?= "1.0.2"
+PREFERRED_VERSION_smproxy ?= "1.0.3"
+PREFERRED_VERSION_twm ?= "1.0.4"
+PREFERRED_VERSION_viewres ?= "1.0.2"
+PREFERRED_VERSION_x11perf ?= "1.5.1"
+PREFERRED_VERSION_xauth ?= "1.0.4"
+PREFERRED_VERSION_xbacklight ?= "1.1.1"
+PREFERRED_VERSION_xbiff ?= "1.0.2"
+PREFERRED_VERSION_xcalc ?= "1.0.3"
+PREFERRED_VERSION_xclipboard ?= "1.1.0"
+PREFERRED_VERSION_xclock ?= "1.0.4"
+PREFERRED_VERSION_xcmsdb ?= "1.0.2"
+PREFERRED_VERSION_xcompmgr ?= "1.1.5"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.9"
+PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
+PREFERRED_VERSION_xdriinfo ?= "1.0.3"
+PREFERRED_VERSION_xedit ?= "1.1.2"
+PREFERRED_VERSION_xev ?= "1.0.4"
+PREFERRED_VERSION_xeyes ?= "1.1.0"
+PREFERRED_VERSION_xf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.1.0"
+PREFERRED_VERSION_xfsinfo ?= "1.0.2"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.3"
+PREFERRED_VERSION_xgc ?= "1.0.2"
+PREFERRED_VERSION_xhost ?= "1.0.3"
+PREFERRED_VERSION_xinit ?= "1.2.0"
+PREFERRED_VERSION_xinput ?= "1.5.0"
+PREFERRED_VERSION_xkbcomp ?= "1.1.1"
+PREFERRED_VERSION_xkbcomp-native ?= "1.1.1"
+PREFERRED_VERSION_xkbevd ?= "1.1.0"
+PREFERRED_VERSION_xkbprint ?= "1.0.2"
+PREFERRED_VERSION_xkbutils ?= "1.0.2"
+PREFERRED_VERSION_xkill ?= "1.0.2"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.2"
+PREFERRED_VERSION_xlsatoms ?= "1.0.2"
+PREFERRED_VERSION_xlsclients ?= "1.0.2"
+PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xmag ?= "1.0.3"
+PREFERRED_VERSION_xman ?= "1.1.0"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.4"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.3"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "1.1.0"
+PREFERRED_VERSION_xrandr ?= "1.3.2"
+PREFERRED_VERSION_xrdb ?= "1.0.6"
+PREFERRED_VERSION_xrefresh ?= "1.0.3"
+PREFERRED_VERSION_xrx ?= "1.0.3"
+PREFERRED_VERSION_xset ?= "1.1.0"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.1"
+PREFERRED_VERSION_xsetroot ?= "1.0.3"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.1.0"
+PREFERRED_VERSION_xwd ?= "1.0.3"
+PREFERRED_VERSION_xwininfo ?= "1.0.5"
+PREFERRED_VERSION_xwud ?= "1.0.2"
+#data
+PREFERRED_VERSION_xbitmaps ?= "1.1.0"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.2"
+PREFERRED_VERSION_xkbdata ?= "1.0.1"
+#doc
+PREFERRED_VERSION_xorg-docs ?= "1.5"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
+#driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.2"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5"
+PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.2"
+PREFERRED_VERSION_xf86-video-ast ?= "0.89.9"
+PREFERRED_VERSION_xf86-video-ati ?= "6.12.4"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.3"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.6"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+#PREFERRED_VERSION_xf86-video-intel ?= "2.9.99.902"
+PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
+PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.3"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.16"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4"
+PREFERRED_VERSION_xf86-video-savage ?= "2.3.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.2"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-trident ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+#PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4"
+#font
+PREFERRED_VERSION_encodings ?= "1.0.3"
+PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2"
+PREFERRED_VERSION_font-alias ?= "1.0.2"
+PREFERRED_VERSION_font-arabic-misc ?= "1.0.1"
+PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-ttf ?= "1.0.1"
+PREFERRED_VERSION_font-bh-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-cursor-misc ?= "1.0.1"
+PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1"
+PREFERRED_VERSION_font-dec-misc ?= "1.0.1"
+PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-isas-misc ?= "1.0.1"
+PREFERRED_VERSION_font-jis-misc ?= "1.0.1"
+PREFERRED_VERSION_font-micro-misc ?= "1.0.1"
+PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-meltho ?= "1.0.1"
+PREFERRED_VERSION_font-misc-misc ?= "1.1.0"
+PREFERRED_VERSION_font-mutt-misc ?= "1.0.1"
+PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2"
+PREFERRED_VERSION_font-sony-misc ?= "1.0.1"
+PREFERRED_VERSION_font-sun-misc ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.1.1"
+PREFERRED_VERSION_font-util-native ?= "1.1.1"
+PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2"
+#lib
+PREFERRED_VERSION_libapplewm ?= "1.4.0"
+PREFERRED_VERSION_libfs ?= "1.0.2"
+PREFERRED_VERSION_libice ?= "1.0.6"
+PREFERRED_VERSION_libice-native ?= "1.0.6"
+PREFERRED_VERSION_libsm ?= "1.1.1"
+PREFERRED_VERSION_libsm-native ?= "1.1.1"
+PREFERRED_VERSION_libwindowswm ?= "1.0.1"
+PREFERRED_VERSION_libx11 ?= "1.3.2"
+PREFERRED_VERSION_libx11-native ?= "1.3.2"
+PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
+PREFERRED_VERSION_libxtrap ?= "1.0.0"
+PREFERRED_VERSION_libxau ?= "1.0.5"
+PREFERRED_VERSION_libxau-native ?= "1.0.5"
+PREFERRED_VERSION_libxaw ?= "1.0.7"
+PREFERRED_VERSION_libxcomposite ?= "0.4.1"
+PREFERRED_VERSION_libxcursor ?= "1.1.10"
+PREFERRED_VERSION_libxcursor-native ?= "1.1.10"
+PREFERRED_VERSION_libxdamage ?= "1.1.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.3"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.1.1"
+PREFERRED_VERSION_libxext-native ?= "1.1.1"
+PREFERRED_VERSION_libxfixes ?= "4.0.4"
+PREFERRED_VERSION_libxfixes-native ?= "4.0.4"
+PREFERRED_VERSION_libxfont ?= "1.4.1"
+PREFERRED_VERSION_libxfont-native ?= "1.4.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.5"
+PREFERRED_VERSION_libxft ?= "2.1.14"
+PREFERRED_VERSION_libxi ?= "1.3"
+PREFERRED_VERSION_libxinerama ?= "1.1"
+PREFERRED_VERSION_libxmu ?= "1.0.5"
+PREFERRED_VERSION_libxp ?= "1.0.0"
+PREFERRED_VERSION_libxpm ?= "3.5.8"
+PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
+PREFERRED_VERSION_libxprintutil ?= "1.0.1"
+PREFERRED_VERSION_libxrandr ?= "1.3.0"
+PREFERRED_VERSION_libxrender ?= "0.9.5"
+PREFERRED_VERSION_libxrender-native ?= "0.9.5"
+PREFERRED_VERSION_libxres ?= "1.0.4"
+PREFERRED_VERSION_libxt ?= "1.0.7"
+PREFERRED_VERSION_libxt-native ?= "1.0.7"
+PREFERRED_VERSION_libxtst ?= "1.1.0"
+PREFERRED_VERSION_libxv ?= "1.0.5"
+PREFERRED_VERSION_libxvmc ?= "1.0.5"
+PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
+PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
+PREFERRED_VERSION_libdmx ?= "1.1.0"
+PREFERRED_VERSION_libfontenc ?= "1.0.5"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
+PREFERRED_VERSION_liblbxutil ?= "1.1.0"
+PREFERRED_VERSION_liboldx ?= "1.0.1"
+PREFERRED_VERSION_libpciaccess ?= "0.11.0"
+PREFERRED_VERSION_libxkbfile ?= "1.0.6"
+PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+#PREFERRED_VERSION_pixman ?= "0.17.2"
+PREFERRED_VERSION_pixman ?= "0.16.2"
+PREFERRED_VERSION_xtrans ?= "1.2.5"
+PREFERRED_VERSION_xtrans-native ?= "1.2.5"
+#proto
+PREFERRED_VERSION_applewmproto ?= "1.4.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
+PREFERRED_VERSION_compositeproto ?= "0.4.1"
+PREFERRED_VERSION_damageproto ?= "1.2.0"
+PREFERRED_VERSION_dmxproto ?= "2.3"
+PREFERRED_VERSION_dri2proto ?= "2.1"
+PREFERRED_VERSION_evieext ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.1.1"
+PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
+PREFERRED_VERSION_fontsproto ?= "2.1.0"
+PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
+PREFERRED_VERSION_glproto ?= "1.4.10"
+PREFERRED_VERSION_inputproto ?= "2.0"
+PREFERRED_VERSION_inputproto-native ?= "2.0"
+PREFERRED_VERSION_kbproto ?= "1.0.4"
+PREFERRED_VERSION_kbproto-native ?= "1.0.4"
+PREFERRED_VERSION_printproto ?= "1.0.4"
+PREFERRED_VERSION_randrproto ?= "1.3.1"
+PREFERRED_VERSION_recordproto ?= "1.14"
+PREFERRED_VERSION_renderproto ?= "0.11"
+PREFERRED_VERSION_renderproto-native ?= "0.11"
+PREFERRED_VERSION_resourceproto ?= "1.1.0"
+PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_videoproto ?= "2.3.0"
+PREFERRED_VERSION_windowswmproto ?= "1.0.4"
+PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
+PREFERRED_VERSION_xextproto ?= "7.1.1"
+PREFERRED_VERSION_xextproto-native ?= "7.1.1"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.1"
+PREFERRED_VERSION_xf86driproto ?= "2.1.0"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
+PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
+PREFERRED_VERSION_xineramaproto ?= "1.2"
+PREFERRED_VERSION_xproto ?= "7.0.16"
+PREFERRED_VERSION_xproto-native ?= "7.0.16"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
+#util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_lndir ?= "1.0.1"
+PREFERRED_VERSION_makedepend ?= "1.0.2"
+PREFERRED_VERSION_makedepend-native ?= "1.0.2"
+PREFERRED_VERSION_util-macros ?= "1.4.1"
+PREFERRED_VERSION_util-macros-native ?= "1.4.1"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
+#xserver
+#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2"
+PREFERRED_VERSION_xserver-xorg ?= "1.7.3"
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
index fa66d61a0a..ea99842fd6 100644
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -1,111 +1,115 @@
-PREFERRED_VERSION_applewmproto = "1.0.3"
-PREFERRED_VERSION_bigreqsproto = "1.0.2"
-PREFERRED_VERSION_bigreqsproto-native = "1.0.2"
-PREFERRED_VERSION_compositeproto = "0.4"
-PREFERRED_VERSION_damageproto = "1.1.0"
-PREFERRED_VERSION_diet-x11 = "1.1.2"
-PREFERRED_VERSION_dmxproto = "2.2.2"
-PREFERRED_VERSION_evieext = "1.0.2"
-PREFERRED_VERSION_fixesproto = "4.0"
-PREFERRED_VERSION_fontcacheproto = "0.1.2"
-PREFERRED_VERSION_fontcacheproto-native = "0.1.2"
-PREFERRED_VERSION_fontsproto = "2.0.2"
-PREFERRED_VERSION_fontsproto-native = "2.0.2"
-PREFERRED_VERSION_gccmakedep = "1.0.2"
-PREFERRED_VERSION_glproto = "1.4.8"
-PREFERRED_VERSION_imake = "1.0.2"
-PREFERRED_VERSION_inputproto = "1.4.2"
-PREFERRED_VERSION_inputproto-native = "1.4.1"
-PREFERRED_VERSION_kbproto = "1.0.3"
-PREFERRED_VERSION_kbproto-native = "1.0.2"
-PREFERRED_VERSION_libapplewm = "1.0.0"
-PREFERRED_VERSION_libdmx = "1.0.2"
-PREFERRED_VERSION_libfontenc = "1.0.4"
-PREFERRED_VERSION_libfontenc-native = "1.0.4"
-PREFERRED_VERSION_libfs = "1.0.0"
-PREFERRED_VERSION_libice = "1.0.3"
-PREFERRED_VERSION_liblbxutil = "1.0.1"
-PREFERRED_VERSION_liboldx = "1.0.1"
-PREFERRED_VERSION_libsm = "1.0.3"
-PREFERRED_VERSION_libwindowswm = "1.0.0"
-PREFERRED_VERSION_libx11 = "1.1.2"
-PREFERRED_VERSION_libx11-native = "1.0.1"
-PREFERRED_VERSION_libxau = "1.0.3"
-PREFERRED_VERSION_libxau-native = "1.0.3"
-PREFERRED_VERSION_libxaw = "1.0.3"
-PREFERRED_VERSION_libxcomposite = "0.4.0"
-PREFERRED_VERSION_libxcursor = "1.1.8"
-PREFERRED_VERSION_libxdamage = "1.1.1"
-PREFERRED_VERSION_libxdmcp = "1.0.2"
-PREFERRED_VERSION_libxdmcp-native = "1.0.2"
-PREFERRED_VERSION_libxevie = "1.0.2"
-PREFERRED_VERSION_libxext = "1.0.3"
-PREFERRED_VERSION_libxfixes = "4.0.3"
-PREFERRED_VERSION_libxfont = "1.3.0"
-PREFERRED_VERSION_libxfont-native = "1.3.0"
-PREFERRED_VERSION_libxfontcache = "1.0.4"
-PREFERRED_VERSION_libxft = "2.1.12"
-PREFERRED_VERSION_libxi = "1.1.2"
-PREFERRED_VERSION_libxinerama = "1.0.2"
-PREFERRED_VERSION_libxkbfile = "1.0.4"
-PREFERRED_VERSION_libxkbui = "1.0.2"
-PREFERRED_VERSION_libxmu = "1.0.3"
-PREFERRED_VERSION_libxp = "1.0.0"
-PREFERRED_VERSION_libxpm = "3.5.6"
-PREFERRED_VERSION_libxprintapputil = "1.0.1"
-PREFERRED_VERSION_libxprintutil = "1.0.1"
-PREFERRED_VERSION_libxrandr = "1.2.1"
-PREFERRED_VERSION_libxrender = "0.9.2"
-PREFERRED_VERSION_libxres = "1.0.3"
-PREFERRED_VERSION_libxscrnsaver = "1.1.2"
-PREFERRED_VERSION_libxt = "1.0.5"
-PREFERRED_VERSION_libxtrap = "1.0.0"
-PREFERRED_VERSION_libxtst = "1.0.2"
-PREFERRED_VERSION_libxv = "1.0.3"
-PREFERRED_VERSION_libxvmc = "1.0.4"
-PREFERRED_VERSION_libxxf86dga = "1.0.1"
-PREFERRED_VERSION_libxxf86misc = "1.0.1"
-PREFERRED_VERSION_libxxf86vm = "1.0.1"
-PREFERRED_VERSION_lndir = "1.0.1"
-PREFERRED_VERSION_makedepend = "1.0.1"
-PREFERRED_VERSION_makedepend-native = "1.0.1"
-PREFERRED_VERSION_printproto = "1.0.3"
-PREFERRED_VERSION_randrproto = "1.2.1"
-PREFERRED_VERSION_recordproto = "1.13.2"
-PREFERRED_VERSION_renderproto = "0.9.2"
-PREFERRED_VERSION_resourceproto = "1.0.2"
-PREFERRED_VERSION_scrnsaverproto = "1.1.0"
-PREFERRED_VERSION_trapproto = "3.4.3"
-PREFERRED_VERSION_util-macros = "1.1.5"
-PREFERRED_VERSION_util-macros-native = "1.1.5"
-PREFERRED_VERSION_videoproto = "2.2.2"
-PREFERRED_VERSION_windowswmproto = "1.0.3"
-PREFERRED_VERSION_xauth = "1.0.2"
-PREFERRED_VERSION_xcmiscproto = "1.1.2"
-PREFERRED_VERSION_xcmiscproto-native = "1.1.2"
-PREFERRED_VERSION_xdpyinfo = "1.0.2"
-PREFERRED_VERSION_xextproto = "7.0.2"
-PREFERRED_VERSION_xextproto-native = "7.0.2"
-PREFERRED_VERSION_xf86bigfontproto = "1.1.2"
-PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2"
-PREFERRED_VERSION_xf86dgaproto = "2.0.2"
-PREFERRED_VERSION_xf86driproto = "2.0.3"
-PREFERRED_VERSION_xf86miscproto = "0.9.2"
-PREFERRED_VERSION_xf86rushproto = "1.1.2"
-PREFERRED_VERSION_xf86vidmodeproto = "2.2.2"
-PREFERRED_VERSION_xhost = "1.0.2"
-PREFERRED_VERSION_xineramaproto = "1.1.2"
-PREFERRED_VERSION_xmodmap = "1.0.2"
-PREFERRED_VERSION_xorg-cf-files = "1.0.2"
-PREFERRED_VERSION_xproto = "7.0.10"
-PREFERRED_VERSION_xproto-native = "7.0.10"
-PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
-PREFERRED_VERSION_xrandr = "1.2.2"
-PREFERRED_VERSION_xrdb = "1.0.3"
-PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
-PREFERRED_VERSION_xserver-xorg = "1.3.0.0"
-PREFERRED_VERSION_xset = "1.0.2"
-PREFERRED_VERSION_xtrans = "1.0.3"
-PREFERRED_VERSION_xtrans-native = "1.0.3"
-PREFERRED_VERSION_xinit = "1.0.4"
-PREFERRED_VERSION_xev = "1.0.2"
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_diet-x11 ?= "1.1.2"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
+PREFERRED_VERSION_evieext ?= "1.0.2"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
+PREFERRED_VERSION_fontsproto-native ?= "2.0.2"
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_glproto ?= "1.4.8"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_inputproto ?= "1.4.2"
+PREFERRED_VERSION_inputproto-native ?= "1.4.2"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_kbproto-native ?= "1.0.3"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
+PREFERRED_VERSION_libfs ?= "1.0.0"
+PREFERRED_VERSION_libice ?= "1.0.3"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_liboldx ?= "1.0.1"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
+PREFERRED_VERSION_libx11 ?= "1.1.2"
+PREFERRED_VERSION_libx11-native ?= "1.0.1"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxau-native ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.3"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.8"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.3"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.0"
+PREFERRED_VERSION_libxfont-native ?= "1.3.0"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxft ?= "2.1.12"
+PREFERRED_VERSION_libxi ?= "1.1.2"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxmu ?= "1.0.3"
+PREFERRED_VERSION_libxp ?= "1.0.0"
+PREFERRED_VERSION_libxpm ?= "3.5.6"
+PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
+PREFERRED_VERSION_libxprintutil ?= "1.0.1"
+PREFERRED_VERSION_libxrandr ?= "1.2.1"
+PREFERRED_VERSION_libxrender ?= "0.9.2"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtrap ?= "1.0.0"
+PREFERRED_VERSION_libxtst ?= "1.0.2"
+PREFERRED_VERSION_libxv ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.1"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_lndir ?= "1.0.1"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_makedepend-native ?= "1.0.1"
+PREFERRED_VERSION_printproto ?= "1.0.3"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
+PREFERRED_VERSION_renderproto ?= "0.9.2"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xextproto ?= "7.0.2"
+PREFERRED_VERSION_xextproto-native ?= "7.0.2"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.2"
+PREFERRED_VERSION_xf86driproto ?= "2.0.3"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xineramaproto ?= "1.1.2"
+PREFERRED_VERSION_xmodmap ?= "1.0.2"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+PREFERRED_VERSION_xproto ?= "7.0.10"
+PREFERRED_VERSION_xproto-native ?= "7.0.10"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.3"
+PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
+PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0"
+PREFERRED_VERSION_xset ?= "1.0.2"
+PREFERRED_VERSION_xtrans ?= "1.0.3"
+PREFERRED_VERSION_xtrans-native ?= "1.0.3"
+PREFERRED_VERSION_xinit ?= "1.0.4"
+PREFERRED_VERSION_xev ?= "1.0.2"
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc
new file mode 100644
index 0000000000..d953d6ebe0
--- /dev/null
+++ b/conf/distro/include/sane-feed-deb.inc
@@ -0,0 +1,6 @@
+
+
+INHERIT += "package_deb"
+
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc
new file mode 100644
index 0000000000..14206bda2d
--- /dev/null
+++ b/conf/distro/include/sane-feed-ipk.inc
@@ -0,0 +1,4 @@
+INHERIT += "package_ipk"
+
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/sane-feed.inc b/conf/distro/include/sane-feed.inc
new file mode 100644
index 0000000000..5bc19a1806
--- /dev/null
+++ b/conf/distro/include/sane-feed.inc
@@ -0,0 +1,170 @@
+# Originally brought to you by the Angstrom Distribution
+
+#############################################################################
+# FEED BUILDING SETTINGS
+#############################################################################
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
+
+# Add FEED_ARCH to overrides
+OVERRIDES .= ":${FEED_ARCH}"
+
+FEED_ARCH ?= "${TARGET_ARCH}"
+
+# Blackfin machines
+FEED_ARCH_bfin = "blackfin"
+
+# armv4t machines
+
+FEED_ARCH_acern30 = "armv4t"
+FEED_ARCH_amsdelta = "armv4t"
+FEED_ARCH_ep93xx = "armv4t"
+FEED_ARCH_eteng500 = "armv4t"
+FEED_ARCH_om-gta01 = "armv4t"
+FEED_ARCH_om-gta02 = "armv4t"
+FEED_ARCH_h1940 = "armv4t"
+FEED_ARCH_h6300 = "armv4t"
+FEED_ARCH_kb9202 = "armv4t"
+FEED_ARCH_ks8695 = "armv4t"
+FEED_ARCH_rx1950 = "armv4t"
+FEED_ARCH_rx3000 = "armv4t"
+FEED_ARCH_sarge-at91 = "armv4t"
+FEED_ARCH_smdk2440 = "armv4t"
+FEED_ARCH_smdk2443 = "armv4t"
+
+# armv5t machines
+
+FEED_ARCH_a1200 = "armv5te"
+FEED_ARCH_a780 = "armv5te"
+FEED_ARCH_akita = "armv5te"
+FEED_ARCH_asus620 = "armv5te"
+FEED_ARCH_asus730 = "armv5te"
+FEED_ARCH_at91sam9263ek = "armv5te"
+FEED_ARCH_aximx50 = "armv5te"
+FEED_ARCH_aximx50v = "armv5te"
+FEED_ARCH_c7x0 = "armv5te"
+FEED_ARCH_compulab-pxa270 = "armv5te"
+FEED_ARCH_davinci-dvevm = "armv5te"
+FEED_ARCH_devkitidp-pxa255 = "armv5te"
+FEED_ARCH_e680 = "armv5te"
+FEED_ARCH_er0100 = "armv5te"
+FEED_ARCH_gumstix = "armv5te"
+FEED_ARCH_gumstix-verdex = "armv5te"
+FEED_ARCH_gumstix-connex = "armv5te"
+FEED_ARCH_h1910 = "armv5te"
+FEED_ARCH_h2200 = "armv5te"
+FEED_ARCH_h3900 = "armv5te"
+FEED_ARCH_h4000 = "armv5te"
+FEED_ARCH_h5000 = "armv5te"
+FEED_ARCH_htcalpine = "armv5te"
+FEED_ARCH_htcapache = "armv5te"
+FEED_ARCH_htcblueangel = "armv5te"
+FEED_ARCH_htchimalaya = "armv5te"
+FEED_ARCH_htcsable = "armv5te"
+FEED_ARCH_htctornado = "armv5te"
+FEED_ARCH_htcuniversal = "armv5te"
+FEED_ARCH_hx2000 = "armv5te"
+FEED_ARCH_hx4700 = "armv5te"
+FEED_ARCH_ixp4xxle = "armv5te"
+FEED_ARCH_logicpd-pxa270 = "armv5te"
+FEED_ARCH_looxc550 = "armv5te"
+FEED_ARCH_lsarm = "armv5te"
+FEED_ARCH_magician = "armv5te"
+FEED_ARCH_mainstone = "armv5te"
+FEED_ARCH_mnci = "armv5te"
+FEED_ARCH_mtx-3 = "armv5te"
+FEED_ARCH_mx21ads = "armv5te"
+FEED_ARCH_n2100 = "armv5te"
+FEED_ARCH_navman-icn330 = "armv5te"
+FEED_ARCH_netbook-pro = "armv5te"
+FEED_ARCH_nokia770 = "armv5te"
+FEED_ARCH_rokre2 = "armv5te"
+FEED_ARCH_nslu2le = "armv5te"
+FEED_ARCH_omap1510inn = "armv5te"
+FEED_ARCH_omap1610h2 = "armv5te"
+FEED_ARCH_omap1710h3 = "armv5te"
+FEED_ARCH_omap5912osk = "armv5te"
+FEED_ARCH_palmld = "armv5te"
+FEED_ARCH_palmt650 = "armv5te"
+FEED_ARCH_palmt680 = "armv5te"
+FEED_ARCH_palmtc = "armv5te"
+FEED_ARCH_palmtt = "armv5te"
+FEED_ARCH_palmtt3 = "armv5te"
+FEED_ARCH_palmtt5 = "armv5te"
+FEED_ARCH_palmtx = "armv5te"
+FEED_ARCH_palmz31 = "armv5te"
+FEED_ARCH_palmz71 = "armv5te"
+FEED_ARCH_palmz72 = "armv5te"
+FEED_ARCH_poodle = "armv5te"
+FEED_ARCH_qemuarm = "armv5te"
+FEED_ARCH_spitz = "armv5te"
+FEED_ARCH_tosa = "armv5te"
+FEED_ARCH_triton = "armv5te"
+
+FEED_ARCH_ixp4xxbe = "armv5teb"
+FEED_ARCH_nslu2be = "armv5teb"
+
+# armv6 machines
+
+FEED_ARCH_mx31ads = "armv6"
+FEED_ARCH_mx31moboard = "armv6"
+FEED_ARCH_nokia800 = "armv6"
+FEED_ARCH_omap2420h4 = "armv6"
+FEED_ARCH_omap2430sdp = "armv6"
+
+# i486 machines
+FEED_ARCH_geodegx = "i486"
+FEED_ARCH_geodelx = "i486"
+FEED_ARCH_netvista = "i486"
+FEED_ARCH_wrap = "i486"
+FEED_ARCH_x86 = "i486"
+
+# i586 machines
+FEED_ARCH_epia = "i586"
+FEED_ARCH_i586-generic = "i586"
+FEED_ARCH_qemux86 = "i586"
+
+# i686 machines
+
+FEED_ARCH_alix = "i686"
+FEED_ARCH_colinux = "i686"
+FEED_ARCH_guinness = "i686"
+FEED_ARCH_i686-generic = "i686"
+FEED_ARCH_progear = "i686"
+
+# powerpc machines
+
+FEED_ARCH_dht-walnut = "ppc405"
+FEED_ARCH_magicbox = "ppc405"
+FEED_ARCH_xilinx-ml403 = "ppc405"
+FEED_ARCH_xilinx-ml410 = "ppc405"
+FEED_ARCH_sequoia = "ppc440e"
+FEED_ARCH_efika = "ppc603e"
+FEED_ARCH_lite5200 = "ppc603e"
+FEED_ARCH_lsppchd = "ppc603e"
+FEED_ARCH_lsppchg = "ppc603e"
+FEED_ARCH_storcenter = "ppc603e"
+FEED_ARCH_turbostation = "ppc603e"
+FEED_ARCH_mpc8313e-rdb = "ppce300c3"
+FEED_ARCH_mpc8323e-rdb = "ppce300c2"
+
+# strongarm machines, no EABI
+
+FEED_ARCH_collie = "arm-oabi"
+FEED_ARCH_h3600 = "arm-oabi"
+FEED_ARCH_h3800 = "arm-oabi"
+FEED_ARCH_htcwallaby = "arm-oabi"
+FEED_ARCH_jornada56x = "arm-oabi"
+FEED_ARCH_jornada7xx = "arm-oabi"
+FEED_ARCH_shark = "arm-oabi"
+FEED_ARCH_simpad = "arm-oabi"
+
+# Tweak packaging for strongarm machines since they can't use EABI
+
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 8310d47a22..4ea318fdbb 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -1,108 +1,20 @@
-# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version
+# Lock down some SRCDATEs
+# See http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version
# Kernel modules
SRCDATE_at76c503a-modules ?= "20060814"
SRCDATE_prism54-module ?= "20060814"
-# X11 libs, extentions and protos
-SRCDATE_compositeext ?= "20060814"
-SRCDATE_drm ?= "20060814"
-SRCDATE_drm-kernel ?= "20060814"
-SRCDATE_fixesext ?= "20060814"
-SRCDATE_libxext-native ?= "20060814"
-SRCDATE_libxss ?= "20060814"
-SRCDATE_recordext ?= "20060814"
-SRCDATE_renderext ?= "20060814"
-SRCDATE_calibrateproto ?= "20070802"
-SRCDATE_libxcalibrate ?= "20070802"
-SRCDATE_xxf86dgaext ?= "20060814"
-SRCDATE_xxf86vmext ?= "20060814"
-
-# Matchbox / O-hand
-SRCDATE_contacts ?= "20060707"
-SRCDATE_dates ?= "20060707"
-SRCDATE_fstests ?= "20061122"
-SRCDATE_eds-dbus ?= "20070215"
-SRCDATE_libmatchbox ?= "20060612"
-SRCDATE_libfakekey ?= "20051101"
-SRCDATE_matchbox-common ?= "20060612"
-SRCDATE_matchbox-config-gtk ?= "20060612"
-SRCDATE_matchbox-desktop ?= "20060612"
-SRCDATE_matchbox-keyboard ?= "20060725"
-SRCDATE_matchbox-panel ?= "20060612"
-SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCDATE_matchbox-stroke ?= "20060612"
-SRCDATE_matchbox-themes-extra ?= "20060612"
-SRCDATE_matchbox-wm ?= "20060612"
-SRCDATE_libmatchbox ?= "20060612"
-SRCDATE_libfakekey ?= "20051101"
-SRCDATE_psplash ?= "20070330"
-SRCDATE_web ?= "20060613"
-SRCDATE_zaurusd ?= "20060628"
-
-# GPE
-SRCDATE_dasher-gpe ?= "20060814"
-SRCDATE_rosetta ?= "20060804"
-SRCDATE_gpesyncd ?= "20070701"
-
-# GNOME
-SRCDATE_gconf-dbus ?= "20070512"
-SRCDATE_gnome-vfs ?= "20060119"
-SRCDATE_gtkhtml2 ?= "20060323"
-
-# Enlightenment Foundation Libraries
-# Caution: This is not alphabetically, but (roughly) dependency-sorted.
-# Please leave it like that.
-SRCDATE_edb-native = "20070721"
-SRCDATE_edb ?= "20070721"
-SRCDATE_eet-native = "20070721"
-SRCDATE_eet ?= "20070721"
-SRCDATE_evas-native ?= "20070721"
-SRCDATE_evas ?= "20070721"
-SRCDATE_ecore-native ?= "20070721"
-SRCDATE_ecore ?= "20070721"
-SRCDATE_edbus ?= "20070721"
-SRCDATE_embryo-native ?= "20070721"
-SRCDATE_embryo ?= "20070721"
-SRCDATE_edje-native ?= "20070721"
-SRCDATE_edje ?= "20070721"
-SRCDATE_emotion ?= "20070721"
-SRCDATE_etk-native ?= "20070721"
-SRCDATE_etk ?= "20070721"
-SRCDATE_ewl ?= "20070721"
-SRCDATE_epeg ?= "20070721"
-SRCDATE_epsilon ?= "20070721"
-SRCDATE_epdf ?= "20070721"
-SRCDATE_esmart ?= "20070721"
-SRCDATE_efreet ?= "20070721"
-SRCDATE_exml ?= "20070721"
-SRCDATE_enhance ?= "20070721"
-SRCDATE_engrave ?= "20070721"
-SRCDATE_evolve-native ?= "20070721"
-SRCDATE_evolve ?= "20070721"
-SRCDATE_eflpp ?= "20070721"
-
-# Enlightenment Applications
-SRCDATE_edje-viewer ?= "20070601"
-SRCDATE_edje-editor ?= "20070721"
-SRCDATE_emphasis ?= "20070601"
-SRCDATE_ephoto ?= "20070601"
-SRCDATE_examine ?= "20070601"
-SRCDATE_exhibit ?= "20070721"
-SRCDATE_expedite ?= "20070601"
-SRCDATE_elitaire ?= "20070504"
-SRCDATE_entice ?= "20070601"
-SRCDATE_e-utils ?= "20070601"
-SRCDATE_enna ?= "20070721"
-
# Misc packages, sorted by alphabet
+SRCDATE_aufs ?= "20081203"
SRCDATE_avetanabt ?= "20060814"
SRCDATE_bl ?= "20060814"
-SRCDATE_dvbstream ?= "20060814"
-SRCDATE_dvbtraffic ?= "20060814"
-SRCDATE_dvbtune ?= "20060814"
+SRCDATE_dvbstream ?= "20090621"
+SRCDATE_dvbtraffic ?= "20090621"
+SRCDATE_dvbtune ?= "20090621"
SRCDATE_fdclock ?= "20060814"
SRCDATE_fltk ?= "20060814"
+SRCDATE_gnuplot ?= "20080328"
SRCDATE_ipatience ?= "20061112"
SRCDATE_ipkg-link ?= "20050930"
SRCDATE_ipkg-link-1 ?= "20050930"
@@ -120,21 +32,27 @@ SRCDATE_mpd ?= "20070210"
SRCDATE_mystun-server ?= "20060814"
SRCDATE_olsrd ?= "20060814"
SRCDATE_opencvs ?= "20060814"
-SRCDATE_oprofile ?= "20061011"
+SRCDATE_oprofile ?= "20080210"
SRCDATE_portaudio ?= "20060814"
SRCDATE_putty ?= "20060814"
SRCDATE_python-cairo ?= "20060814"
-SRCDATE_qemu-native ?= "20060723"
+SRCDATE_qemu-native ?= "20070613"
+SRCDATE_rdesktop ?= "20080917"
SRCDATE_roadster ?= "20060814"
+SRCDATE_rosetta ?= "20090514"
SRCDATE_sctzap ?= "20060814"
+SRCDATE_squashfs ?= "20091110"
SRCDATE_tslib ?= "20051101"
SRCDATE_waimea ?= "20060814"
SRCDATE_xcompmgr ?= "20060814"
SRCDATE_xirssi ?= "20060814"
SRCDATE_xsvg ?= "20060814"
-SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zroadmap ?= "20060814"
+SRCDATE_yamonenv ?= "20051022"
+SRCDATE_zaurusd ?= "20090501"
# Freedesktop.org
SRCDATE_poppler0.6 = "20070708"
+# aleph1/yaffs
+SRCDATE_yaffs2-utils = "20080331"
+SRCDATE_yaffs2-utils-native = "20080331"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
new file mode 100644
index 0000000000..733b15e78b
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -0,0 +1,48 @@
+# To be included from sane-srcrevs.inc
+
+# FSO Projects -- Cornucopia
+FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28"
+SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
+SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
+SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
+SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
+
+# FSO Projects -- Misc
+SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
+SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5"
+SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
+SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
+SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
+SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
+SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
+SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
+SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e"
+SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
+SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb"
+SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3"
+SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d"
+SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
+SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9"
+SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
+FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
+SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb"
+SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f"
+SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
+SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f"
+SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
new file mode 100644
index 0000000000..207c320a66
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -0,0 +1,417 @@
+# Generated with
+# bitbake -s | grep svnr | awk '{print "SRCREV_pn-" $1 "=" $2}' | \
+# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 " ?=\" " $3}' | \
+# awk -F "-r" '{print $1"\""}'
+
+# This will miss recipes that have skippackage set (e.g. uclibc)
+
+# this is alphabetical!
+
+# yes, really!
+
+# you know what that means? like... a, b, c, d, e, f, g...
+
+SRCREV_pn-accelges ?= "206"
+SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02"
+SRCREV_pn-aircrack-ng ?= "802"
+SRCREV_pn-alsa-scenarii-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
+SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
+SRCREV_pn-app-restarter ?= "4552"
+SRCREV_pn-assassin ?= "268"
+SRCREV_pn-assassin-thumbnail ?= "4690"
+SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
+SRCREV_pn-babiloo-efl ?= "296"
+SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654"
+SRCREV_pn-bootchart-lite ?= "4"
+SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc"
+SRCREV_pn-bubble-keyboard ?= "194"
+SRCREV_pn-calc ?= "cff7c833d4fce0d39de0812bfc9ed9e0eb8fac09"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+SRCREV_pn-cdparanoia ?= "16684"
+SRCREV_pn-clutter ?= "3240"
+SRCREV_pn-clutter-box2d ?= "3197"
+SRCREV_pn-clutter-cairo ?= "3210"
+SRCREV_pn-clutter-gst ?= "3188"
+SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
+SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
+SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
+SRCREV_pn-comic-reader ?= "54"
+SRCREV_pn-contact ?= "1410"
+SRCREV_pn-dasher-gpe ?= "1251"
+SRCREV_pn-dbus-c++ ?= "13131"
+SRCREV_pn-dbus-c++-native ?= "13131"
+SRCREV_pn-dfu-util ?= "4160"
+SRCREV_pn-dfu-util-native ?= "4160"
+SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
+SRCREV_pn-diversity-daemon ?= "571"
+SRCREV_pn-diversity-radar ?= "453"
+SRCREV_pn-e-tasks ?= "22"
+SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
+SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-sysactions-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
+SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-theme-illume-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-theme-illume-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-ebrainy ?= "21"
+SRCREV_pn-eds-dbus ?= "736"
+SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elf2flt ?= "1786"
+SRCREV_pn-elmdentica ?= "171"
+SRCREV_pn-enlazar ?= "37"
+SRCREV_pn-enotes ?= "19"
+SRCREV_pn-epdfview ?= "346"
+SRCREV_pn-epiphany ?= "7837"
+SRCREV_pn-essential-dialer ?= "194"
+SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-etk-theme-ninja ?= "5"
+SRCREV_pn-etk-theme-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-ezx-boot-usb-native ?= "2371"
+SRCREV_pn-ezx-gen-blob ?= "2426"
+SRCREV_pn-ezxd ?= "2074"
+SRCREV_pn-fbgrab-viewer-native ?= "1943"
+SRCREV_pn-ffalarms ?= "67"
+SRCREV_pn-flashrom ?= "3682"
+SRCREV_pn-fltk2 ?= "6916"
+SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
+SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
+SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
+SRCREV_pn-fsoraw ?= "20"
+SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gabriel ?= "38"
+SRCREV_pn-gabriel-native ?= "38"
+SRCREV_pn-gconf-dbus ?= "641"
+SRCREV_pn-glamo-dri-tests ?= "080b8db3d9dbfae38ebb00439887b5535ab1d380"
+SRCREV_pn-gnet ?= "495"
+SRCREV_pn-gpe-conf ?= "9900"
+SRCREV_pn-gpe-contacts ?= "9312"
+SRCREV_pn-gpe-gallery ?= "9376"
+SRCREV_pn-gpe-mini-browser2 ?= "9900"
+SRCREV_pn-gpe-sketchbook ?= "9547"
+SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-gridpad ?= "194"
+SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-gtkhtml2 ?= "1158"
+SRCREV_pn-guitartune ?= "11"
+SRCREV_pn-gypsy ?= "134"
+SRCREV_pn-hildon-1 ?= "14429"
+SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
+SRCREV_pn-illume-theme-asu ?= "4881"
+SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
+SRCREV_pn-intone ?= "75"
+SRCREV_pn-intone-video ?= "12"
+SRCREV_pn-intuition ?= "194"
+SRCREV_pn-kismet ?= "2285"
+SRCREV_pn-kismet-newcore ?= "2285"
+SRCREV_pn-libcalenabler2 ?= "1410"
+SRCREV_pn-libdrm ?= "89cc98c0d5c1b43a883f13210c472339dde1a4cf"
+SRCREV_pn-libdrm_om-gta02 ?= "67a3eb2188a38a5000af0ad4ac3a0eba43cab574"
+SRCREV_pn-libefso ?= "194"
+SRCREV_pn-libfakekey ?= "1455"
+SRCREV_pn-libframeworkd-phonegui ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-libframeworkd-phonegui-efl ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-libframeworkd-phonegui-efl2 ?= "917226025c67b75def91e98ea923c2e550474a5b"
+SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-libgee ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146"
+SRCREV_pn-libgee-native ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146"
+SRCREV_pn-libgsmd ?= "4505"
+SRCREV_pn-libiac ?= "1590"
+SRCREV_pn-libjana ?= "749"
+SRCREV_pn-libmodulo ?= "7d2f657d248bd86377e66c329aa6826459d406da"
+SRCREV_pn-libmokogsmd2 ?= "4334"
+SRCREV_pn-libmokojournal2 ?= "3473"
+SRCREV_pn-libmokopanelui2 ?= "4568"
+SRCREV_pn-libmokoui2 ?= "4695"
+SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a"
+SRCREV_pn-libowl ?= "277"
+SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c"
+SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a"
+SRCREV_pn-libphone-utils ?= "665f27d6c3af092ae56f652c9fe6b5631b4d10db"
+SRCREV_pn-librfid ?= "2094"
+SRCREV_pn-libsnmp-perl ?= "17367"
+SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
+SRCREV_pn-libw100 ?= "47"
+SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
+SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-linux-bfin ?= "3758"
+SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
+SRCREV_pn-linux-hackndev-2.6 ?= "1308"
+SRCREV_pn-linux-ixp4xx ?= "1089"
+SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
+SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
+SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
+SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
+SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
+SRCREV_pn-llvm-gcc4 ?= "374"
+SRCREV_pn-llvm-gcc4-cross ?= "374"
+SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
+SRCREV_pn-maemo-mapper ?= "118"
+SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
+SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
+SRCREV_pn-matchbox-config-gtk ?= "1614"
+SRCREV_pn-matchbox-desktop-2 ?= "2096"
+SRCREV_pn-matchbox-keyboard ?= "1910"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
+SRCREV_pn-matchbox-panel-2 ?= "2098"
+SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907"
+SRCREV_pn-matchbox-stroke ?= "1820"
+SRCREV_pn-matchbox-terminal ?= "1612"
+SRCREV_pn-matchbox-wm-2 ?= "2087"
+SRCREV_pn-mesa-dri ?= "c02cd82b463661def7842f910dc561313559df80"
+SRCREV_pn-mesa-dri_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e"
+SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
+SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2f03f7"
+SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
+SRCREV_pn-moko-gtk-engine ?= "4734"
+SRCREV_pn-mokoko ?= "127"
+SRCREV_pn-mokonnect ?= "113"
+SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-mplayer-maemo ?= "342"
+SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
+SRCREV_pn-multitap-pad ?= "373"
+SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
+SRCREV_pn-navit ?= "2902"
+SRCREV_pn-navit-icons ?= "2871"
+SRCREV_pn-neod ?= "4617"
+SRCREV_pn-neomis ?= "6"
+SRCREV_pn-net-snmp ?= "17367"
+SRCREV_pn-netsurf ?= "3859"
+SRCREV_pn-numberx ?= "4"
+SRCREV_pn-numptyphysics ?= "109"
+SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
+SRCREV_pn-ologicd ?= "4a32af91a9479ebd4d1d39057354ac9904d74cbb"
+SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec"
+SRCREV_pn-om-neon ?= "68"
+SRCREV_pn-om-settings ?= "74"
+SRCREV_pn-omgps ?= "109"
+SRCREV_pn-omoney ?= "29"
+SRCREV_pn-ompower ?= "4727"
+SRCREV_pn-omview ?= "34"
+SRCREV_pn-openbsc ?= "5e68183a201ab92f29cd2467df5209f7b351a66d"
+SRCREV_pn-openbsc-onwaves ?= "0d9ed87d5c7d5b6e21dc3bbb282e215068742566"
+SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526"
+SRCREV_pn-openmoko-agpsui ?= "7"
+SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
+SRCREV_pn-openmoko-appearance ?= "3262"
+SRCREV_pn-openmoko-appmanager2 ?= "4530"
+SRCREV_pn-openmoko-browser2 ?= "4172"
+SRCREV_pn-openmoko-calculator2 ?= "3655"
+SRCREV_pn-openmoko-common2 ?= "3259"
+SRCREV_pn-openmoko-contacts2 ?= "419"
+SRCREV_pn-openmoko-dates2 ?= "703"
+SRCREV_pn-openmoko-dialer2 ?= "4364"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
+SRCREV_pn-openmoko-firststart2 ?= "3158"
+SRCREV_pn-openmoko-footer ?= "2354"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4232"
+SRCREV_pn-openmoko-mediaplayer2 ?= "4750"
+SRCREV_pn-openmoko-messages2 ?= "4340"
+SRCREV_pn-openmoko-panel-battery ?= "3360"
+SRCREV_pn-openmoko-panel-bt ?= "4331"
+SRCREV_pn-openmoko-panel-clock ?= "2567"
+SRCREV_pn-openmoko-panel-demo ?= "1622"
+SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
+SRCREV_pn-openmoko-panel-gps ?= "4330"
+SRCREV_pn-openmoko-panel-gsm ?= "4335"
+SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
+SRCREV_pn-openmoko-panel-memory ?= "3903"
+SRCREV_pn-openmoko-panel-usb ?= "3360"
+SRCREV_pn-openmoko-panel-wifi ?= "4344"
+SRCREV_pn-openmoko-sample2 ?= "3537"
+SRCREV_pn-openmoko-set-root-password ?= "4590"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
+SRCREV_pn-openmoko-tasks2 ?= "404"
+SRCREV_pn-openmoko-terminal2 ?= "4782"
+SRCREV_pn-openmoko-theme-standard2 ?= "4338"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
+SRCREV_pn-openmoko-today2 ?= "4168"
+SRCREV_pn-openmoko-today2-folders ?= "3704"
+SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
+SRCREV_pn-openmoko-worldclock2 ?= "3365"
+SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
+SRCREV_pn-openocd ?= "517"
+SRCREV_pn-openocd-native ?= "517"
+SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420"
+SRCREV_pn-opkg ?= "446"
+SRCREV_pn-opkg-native ?= "446"
+SRCREV_pn-opkg-sdk ?= "446"
+SRCREV_pn-opkg-utils ?= "4578"
+SRCREV_pn-opkg-utils-native ?= "4595"
+SRCREV_pn-oprofileui ?= "173"
+SRCREV_pn-osb-browser ?= "125"
+SRCREV_pn-osb-jscore ?= "117"
+SRCREV_pn-osb-nrcit ?= "125"
+SRCREV_pn-osb-nrcore ?= "126"
+SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
+SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
+SRCREV_pn-phonefsod ?= "76d8cc085946e77e3fc27ef12a9d18411324747b"
+SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
+SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091"
+SRCREV_pn-portaudio-v19 ?= "1387"
+SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
+SRCREV_pn-pyefl-sudoku ?= "49"
+SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
+SRCREV_pn-pyphonelog ?= "45783c7fd5ec274421bf87a5cdb372c122370fda"
+SRCREV_pn-pythm ?= "19"
+SRCREV_pn-python-coherence ?= "1161"
+SRCREV_pn-python-connexion ?= "1439"
+SRCREV_pn-python-formencode ?= "3148"
+SRCREV_pn-python-gsmd ?= "148"
+SRCREV_pn-python-phoneutils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b"
+SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
+SRCREV_pn-python-pyyaml ?= "344"
+QEMUSRCREV ?= "4242"
+SRCREV_pn-qemu ?= "${QEMUSRCREV}"
+SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
+SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
+SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
+SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
+SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
+SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
+SRCREV_pn-remoko ?= "121"
+SRCREV_pn-remoko-server ?= "121"
+SRCREV_pn-s3c24xx-gpio ?= "4949"
+SRCREV_pn-s3c64xx-gpio ?= "4949"
+SRCREV_pn-serial-forward ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
+SRCREV_pn-settings-daemon ?= "2006"
+SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
+SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
+SRCREV_pn-shr-launcher ?= "102"
+SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7"
+SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca"
+SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb"
+SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
+SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b"
+SRCREV_pn-sjf2410-linux-native ?= "4268"
+SRCREV_pn-socketcan-modules ?= "917"
+SRCREV_pn-socketcan-utils-test ?= "917"
+SRCREV_pn-sphyrna-python ?= "45"
+SRCREV_pn-starling ?= "9574"
+SRCREV_pn-table ?= "2191"
+SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177"
+SRCREV_pn-tmut ?= "60"
+SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96"
+SRCREV_pn-tslib ?= "77"
+SRCREV_pn-u-boot-bug ?= "8674"
+SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
+SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
+SRCREV_pn-usbpath ?= "3172"
+SRCREV_pn-usbpath-native ?= "3172"
+SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
+SRCREV_pn-wesnoth ?= "39828"
+SRCREV_pn-wlan-ng-modules ?= "1859"
+SRCREV_pn-wlan-ng-utils ?= "1859"
+SRCREV_pn-wmiconfig ?= "5394"
+SRCREV_pn-xf86-video-glamo ?= "9918e082104340da42eb92b6bdefce4d9266a6a4"
+SRCREV_pn-xoo ?= "1971"
+SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
+
+# Enlightenment Foundation Libraries
+# Caution: This is not alphabetically, but (roughly) dependency-sorted.
+# Please leave it like that.
+EFL_SRCREV ?= "45060"
+SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
+SRCREV_pn-edb ?= "${EFL_SRCREV}"
+SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
+SRCREV_pn-eina ?= "${EFL_SRCREV}"
+SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
+SRCREV_pn-eet ?= "${EFL_SRCREV}"
+SRCREV_pn-evas-native ?= "${EFL_SRCREV}"
+SRCREV_pn-evas ?= "${EFL_SRCREV}"
+SRCREV_pn-ecore-native ?= "${EFL_SRCREV}"
+SRCREV_pn-ecore ?= "${EFL_SRCREV}"
+SRCREV_pn-edbus ?= "${EFL_SRCREV}"
+SRCREV_pn-embryo-native ?= "${EFL_SRCREV}"
+SRCREV_pn-embryo ?= "${EFL_SRCREV}"
+SRCREV_pn-edje-native ?= "${EFL_SRCREV}"
+SRCREV_pn-edje-sdk ?= "${EFL_SRCREV}"
+SRCREV_pn-edje ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary ?= "${EFL_SRCREV}"
+SRCREV_pn-emotion ?= "${EFL_SRCREV}"
+SRCREV_pn-etk-native ?= "${EFL_SRCREV}"
+SRCREV_pn-etk ?= "${EFL_SRCREV}"
+SRCREV_pn-ewl ?= "${EFL_SRCREV}"
+SRCREV_pn-epeg ?= "${EFL_SRCREV}"
+SRCREV_pn-epsilon ?= "${EFL_SRCREV}"
+SRCREV_pn-epdf ?= "${EFL_SRCREV}"
+SRCREV_pn-esmart ?= "${EFL_SRCREV}"
+SRCREV_pn-efreet ?= "${EFL_SRCREV}"
+SRCREV_pn-exml ?= "${EFL_SRCREV}"
+SRCREV_pn-enhance ?= "${EFL_SRCREV}"
+SRCREV_pn-engrave ?= "${EFL_SRCREV}"
+SRCREV_pn-evolve-native ?= "${EFL_SRCREV}"
+SRCREV_pn-evolve ?= "${EFL_SRCREV}"
+SRCREV_pn-gevas2 ?= "${EFL_SRCREV}"
+SRCREV_pn-imlib2 ?= "${EFL_SRCREV}"
+SRCREV_pn-libeweather ?= "${EFL_SRCREV}"
+
+# Enlightenment Bindings
+SRCREV_pn-eflpp ?= "${EFL_SRCREV}"
+SRCREV_pn-python-evas ?= "${EFL_SRCREV}"
+SRCREV_pn-python-ecore ?= "${EFL_SRCREV}"
+SRCREV_pn-python-edje ?= "${EFL_SRCREV}"
+SRCREV_pn-python-elementary ?= "${EFL_SRCREV}"
+SRCREV_pn-python-edbus ?= "${EFL_SRCREV}"
+SRCREV_pn-python-emotion ?= "${EFL_SRCREV}"
+SRCREV_pn-python-epsilon ?= "${EFL_SRCREV}"
+SRCREV_pn-python-ewl ?= "${EFL_SRCREV}"
+SRCREV_pn-python-etk ?= "${EFL_SRCREV}"
+
+# Enlightenment Applications
+SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
+SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
+SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
+SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
+SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
+SRCREV_pn-eve ?= "${EFL_SRCREV}"
+SRCREV_pn-examine ?= "${EFL_SRCREV}"
+SRCREV_pn-exhibit ?= "${EFL_SRCREV}"
+SRCREV_pn-expedite ?= "${EFL_SRCREV}"
+SRCREV_pn-elitaire ?= "${EFL_SRCREV}"
+SRCREV_pn-entice ?= "${EFL_SRCREV}"
+SRCREV_pn-entrance ?= "${EFL_SRCREV}"
+SRCREV_pn-e-utils ?= "${EFL_SRCREV}"
+SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
+SRCREV_pn-enna ?= "${EFL_SRCREV}"
+SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
+SRCREV_pn-exquisite-theme-illume ?= "${EFL_SRCREV}"
+SRCREV_pn-rage ?= "${EFL_SRCREV}"
+SRCREV_pn-illume ?= "${EFL_SRCREV}"
+SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
+SRCREV_pn-waker ?= "${EFL_SRCREV}"
+
+#illume default keyboards
+SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
+
+#exalt
+SRCREV_pn-exalt ?= "${EFL_SRCREV}"
+SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
+
+require conf/distro/include/sane-srcrevs-fso.inc
diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc
new file mode 100644
index 0000000000..4c5f44ff8e
--- /dev/null
+++ b/conf/distro/include/sane-toolchain-eglibc.inc
@@ -0,0 +1,16 @@
+# Originally brought to you by the Angstrom Distribution
+
+# eglibc:
+# [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+BUILD_OPTIMIZATION_pn-perl = "-O1"
+BUILD_OPTIMIZATION_sparc = "-O2"
+
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
diff --git a/conf/distro/include/sane-toolchain-glibc.inc b/conf/distro/include/sane-toolchain-glibc.inc
new file mode 100644
index 0000000000..f029c6fe46
--- /dev/null
+++ b/conf/distro/include/sane-toolchain-glibc.inc
@@ -0,0 +1,23 @@
+# Originally brought to you by the Angstrom Distribution
+
+# glibc:
+
+#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.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 -O2"
+
+FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
+FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+BUILD_OPTIMIZATION_pn-perl = "-O1"
+BUILD_OPTIMIZATION_pn-glibc = "-O2"
+BUILD_OPTIMIZATION_sparc = "-O2"
+
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
diff --git a/conf/distro/include/sane-toolchain-oabi.inc b/conf/distro/include/sane-toolchain-oabi.inc
new file mode 100644
index 0000000000..816d44230e
--- /dev/null
+++ b/conf/distro/include/sane-toolchain-oabi.inc
@@ -0,0 +1,2 @@
+PACKAGE_ARCH = "arm-oabi"
+BASE_PACKAGE_ARCH = "arm-oabi"
diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc
new file mode 100644
index 0000000000..3069820918
--- /dev/null
+++ b/conf/distro/include/sane-toolchain-uclibc.inc
@@ -0,0 +1,35 @@
+# Originally brought to you by the Angstrom Distribution
+
+# uclibc:
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl"
+PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
+
+#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
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+
+#Gcc will die with 'internal consistency error when using the above optimizations
+#with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
+#However, some packages require optimizations to compile (e.g. libmad).
+#It appears the guilty optimization is "-frename-registers", leaving that one
+#out allows the build to proceed normally. -fexpensive-optimizations may be OK,
+#it was removed while debugging an issue that ultimately turned out to be due
+#to the ICE fixed by gcc-pr32889.patch. It needs to be tested again.
+#Note that this testing was done without the gcc-pr32889.patch.
+FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
+
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
diff --git a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc
new file mode 100644
index 0000000000..fbb239a683
--- /dev/null
+++ b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc
@@ -0,0 +1,20 @@
+# Originally brought to you by the Angstrom Distribution
+
+# uclibc:
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
+
+#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
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+BUILD_OPTIMIZATION = "-Os"
+
+#Gcc will die with 'internal consistency error when using the above optimizations
+FULL_OPTIMIZATION_avr32 = ""
+BUILD_OPTIMIZATION_avr32 = ""
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
new file mode 100644
index 0000000000..04fde21b25
--- /dev/null
+++ b/conf/distro/include/sane-toolchain.inc
@@ -0,0 +1,205 @@
+# Originally brought to you by the Angstrom Distribution
+
+#############################################################################
+# TOOLCHAIN VERSION SETTINGS
+#############################################################################
+
+# Base line versions, good for most things
+PREFERRED_GCC_VERSION ?= "4.4.2"
+PREFERRED_BINUTILS ?= "2.20"
+
+# Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_eglibc ?= "2.10"
+PREFERRED_VERSION_eglibc-initial ?= "2.10"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
+
+# Some systems need a special gcc version
+PREFERRED_GCC_VERSION_486sx ?= "4.3.2"
+PREFERRED_GCC_VERSION_avr32 ?= "4.2.2"
+PREFERRED_GCC_VERSION_armv7a ?= "4.4.1"
+PREFERRED_GCC_VERSION_bfin ?= "4.1.2"
+PREFERRED_GCC_VERSION_ppc405 ?= "4.4.1"
+PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+
+# This is unrelated to the kernel version, but glibc and some userspaceapps require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.31"
+
+# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
+#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
+
+# Binutils
+PREFERRED_VERSION_binutils ?= "${PREFERRED_BINUTILS}"
+PREFERRED_VERSION_binutils-cross ?= "${PREFERRED_BINUTILS}"
+PREFERRED_VERSION_binutils-cross-sdk ?= "${PREFERRED_BINUTILS}"
+
+# Avr32 only has patches for binutils 2.17 in OE
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+
+# Compiler versions
+PREFERRED_VERSION_gcc ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${PREFERRED_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${PREFERRED_GCC_VERSION}"
+
+# Compiler selection
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+# Others
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
+#############################################################################
+# TOOLCHAIN CUSTOMIZATION
+#############################################################################
+
+# Branding
+TARGET_VENDOR = "-oe"
+
+# Add FEED_ARCH to the overrides list so that we can override the
+# ARM_INSTRUCTION_SET like below
+
+OVERRIDES .= ":${FEED_ARCH}"
+
+# ARM920T and up can use thumb mode to decrease binary size at the expense of speed
+# (the complete story is a bit more nuanced due to cache starvation)
+# Minimal turns on thumb for armv4t machine according to this RFC:
+# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
+
+# We can't set ARM_INSTRUCTION_SET_<override> directly since that will un-overridable in recipes like gcc
+PREFERRED_ARM_INSTRUCTION_SET_armv4t = "thumb"
+PREFERRED_ARM_INSTRUCTION_SET_armv5te = "thumb"
+PREFERRED_ARM_INSTRUCTION_SET_armv5teb = "thumb"
+PREFERRED_ARM_INSTRUCTION_SET ?= "arm"
+ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
+# "arm" "thumb"
+# The instruction set the compiler should use when generating application
+# code. The kernel is always compiled with arm code at present. arm code
+# is the original 32 bit ARM instruction set, thumb code is the 16 bit
+# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
+# but requires more instructions (140% for 70% smaller code) so may be
+# slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+# Whether to compile with code to allow interworking between the two
+# instruction sets. This allows thumb code to be executed on a primarily
+# arm system and vice versa. It is strongly recommended that DISTROs not
+# turn this off - the actual cost is very small.
+
+# We don't want to keep OABI compat
+ARM_KEEP_OABI = "0"
+
+# ARM EABI is softfloat by default, but let's make sure :)
+# make it overridable for platforms with FPU, like ep93xx or i.mx31
+TARGET_FPU_arm ?= "soft"
+TARGET_FPU_armeb ?= "soft"
+TARGET_FPU_ixp4xx ?= "soft"
+TARGET_FPU_ppc405 ?= "soft"
+
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv6-novfp ?= "soft"
+TARGET_FPU_armv7a ?= "hard"
+TARGET_FPU_ppc603e ?= "hard"
+
+# webkit-gtk and cairo have alignment issues with double instructions on armv5 so
+# disable them here. TODO: This knowledge should rather be encoded in the actual
+# recipes!
+TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
+TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
+
+#############################################################################
+# C LIBRARY SETTINGS
+#############################################################################
+
+# Can be "glibc", "eglibc" or "uclibc"
+LIBC ?= "eglibc"
+require conf/distro/include/${LIBC}.inc
+PSTAGE_EXTRAPATH = "${LIBC}"
+require conf/distro/include/sane-toolchain-${LIBC}.inc
+
+# Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+# Qemu doesn't like armv6/eabi/vfp
+ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0"
+ENABLE_BINARY_LOCALE_GENERATION_armv6-novfp = "0"
+ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
+
+#qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+def detect_arm_abi (d):
+ import bb
+ if bb.data.getVar('DISTRO_FEATURES',d) is None:
+ if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
+ return "oabi"
+ else:
+ return ""
+ if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
+ if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d).split():
+ return "eabi"
+ return "oabi"
+ return ""
+
+def compute_os_portion_of_target_triplet (d):
+ import bb
+ arm_eabi_supporting_arches = "armv6 armv6-novfp \
+ armv5te iwmmxt armv7a armv7 armv5teb armv4t"
+ ppc_spe_supporting_arches = "ppce500v2 ppce500"
+ gnu_suffix = ""
+ if bb.data.getVar('LIBC', d, 1) == "uclibc":
+ libc_suffix = "uclibc"
+ else:
+ libc_suffix = ""
+
+ if bb.data.getVar('TARGET_ARCH',d,1) in ['bfin']:
+ if libc_suffix is not "uclibc":
+ bb.fatal("bfin is not supported on glibc/eglibc. Please choose uclibc")
+ else:
+ os_suffix = "uclinux"
+ else:
+ os_suffix = "linux"
+ bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1)
+
+ if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \
+ bparch is not None:
+ if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d,1).split() and \
+ bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
+ if bparch not in arm_eabi_supporting_arches.split():
+ bb.fatal("DISTRO requested EABI but selected machine does not support EABI")
+ abi_suffix = ""
+ else:
+ if libc_suffix is not "uclibc":
+ gnu_suffix = "gnu"
+ abi_suffix = "eabi"
+ elif bparch in ppc_spe_supporting_arches.split():
+ if libc_suffix is not "uclibc":
+ gnu_suffix = "gnu"
+ abi_suffix = "spe"
+ else:
+ abi_suffix = ""
+ else:
+ bb.note("DISTRO_FEATURES is not set abi suffix not set")
+ abi_suffix = ""
+ if libc_suffix is not "" or abi_suffix is not "":
+ return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix
+ else:
+ return os_suffix
+
+# This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI = "${@detect_arm_abi(d)}"
+TARGET_OS = "${@compute_os_portion_of_target_triplet(d)}"
+include conf/distro/include/sane-toolchain-${ARM_ABI}.inc
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
new file mode 100644
index 0000000000..75f389cf83
--- /dev/null
+++ b/conf/distro/include/shr-autorev.inc
@@ -0,0 +1,18 @@
+# SHR autorev include
+SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
+SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
+
+SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
+SRCREV_pn-shr-settings = "${AUTOREV}"
+SRCREV_pn-shr-specs = "${AUTOREV}"
+SRCREV_pn-phoneui-apps = "${AUTOREV}"
+SRCREV_pn-phoneuid = "${AUTOREV}"
+SRCREV_pn-phonefsod = "${AUTOREV}"
+SRCREV_pn-libphone-ui = "${AUTOREV}"
+SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
+SRCREV_pn-libphone-utils = "${AUTOREV}"
+SRCREV_pn-opimd-utils = "${AUTOREV}"
+SRCREV_pn-shr-installer = "${AUTOREV}"
+SRCREV_pn-shr-wizard = "${AUTOREV}"
+
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index acfe23d742..10a2bc4a02 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,13 +16,16 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.6"
+SLUGOS_VERSION = "5.4"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
DISTRO_FEED ?= "unstable"
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci"
+
IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}"
# The following need not be set, the defaults should be adequate
@@ -38,13 +41,27 @@ TARGET_FPU = "soft"
# glib-2.0 builds require USE_NLS to be overridden
USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
-INHERIT += "package_ipk debian multimachine"
+INHERIT += "package_ipk debian testlab packaged-staging"
# FULL_OPTIMIZATION
# Optimization settings. Os works fine and is significantly better than O2.
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+# We need to keep OABI compat for things like madwifi-ng.
+ARM_KEEP_OABI = "1"
+
+TARGET_LINK_HASH_STYLE = "-Wl,--hash-style=gnu"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
+# There is a problem of sorts with Perl. This needs a better home eventually,
+# but for now put it in this file.
+FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+BUILD_OPTIMIZATION_pn-perl = "-O1"
+
#----------------------------------------------------------------------------------
# FEEDS
# The FEED_URIS lines define where on the internet SlugOS looks for packages
@@ -64,6 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}
# to enable/disable debugging in the distro. Here noirqdebug is used to
# remove the messages about unhandled interrupts - people debugging interrupt
# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
+CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc"
CMDLINE_DEBUG = "noirqdebug"
# EXTRA PACKAGES
@@ -82,6 +100,12 @@ DISTRO_EXTRA_DEPENDS ?= ""
DISTRO_EXTRA_RDEPENDS ?= ""
DISTRO_EXTRA_RRECOMMENDS ?= ""
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+#FIXME: HACK: REMOVE THIS
+IGNORE_STRIP_ERRORS = ""
+
#----------------------------------------------------------------------------------
# PACKAGE VERSION CONTROL
#----------------------------------------------------------------------------------
@@ -89,61 +113,67 @@ DISTRO_EXTRA_RRECOMMENDS ?= ""
# necessary to define which gets generated first, glibc or the kernel, and
# this is done by selecting the provider of libc (in this case it needs the
# kernel, so there has to be a non-libc gcc to build the kernel!)
-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_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-# Select 2.6 versions of the depmod support
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-
-# compiler/binary/library versions
-PREFERRED_VERSION_binutils ?= "2.16"
-PREFERRED_VERSION_binutils-cross ?= "2.16"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
-#For SVN uclibc:
-#SRCDATE_uclibc ?= "20060120"
-#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}"
-
-# Select the correct versions of the kernel and modules (these are the
-# defaults, override in the conf/distro top-level distro file).
-PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6"
-
-# Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-SRCDATE_diet-x11 ?= "20060106"
-
-# Ensure consistency across all SlugOS builds for the provider of a
-# relational database - use the latest version of the SleepyCat
-# Berkeley database
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
-
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
-
-PREFERRED_VERSION_ipkg ?= "0.99.163"
-PREFERRED_VERSION_ipkg-native ?= "0.99.163"
-
-#FIXME: HACK: REMOVE THIS
-IGNORE_STRIP_ERRORS = ""
-
-# Due to upstream instability, and another OE project with conflicting
-# needs, nail down a specific, known-working version of madwifi-ng.
-# Remove this once the madwifi-ng stuff seems to stabilize once again.
-#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-PREFERRED_VERSION_openssh ?= "4.6p1"
+# Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+# Set the preferred provider for a few toolchain-related items, otherwise
+# these may be selected from the external-toolchain instead.
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
+# Select the appropriate x11 library provider. The diet-x11 libraries are
+# much smaller, but may not be as current as the standard x11 libraries; by
+# default we will select the standard libraries and permit the use of an
+# override if the user wishes (and has the correct PREFERRED_VERSIONs set).
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+
+# Ensure consistency across all SlugOS builds for the provider of a relational
+# database - use the latest version of the SleepyCat Berkeley database
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+# We want the newer util-linux package
+PREFERRED_PROVIDER_util-linux ?= "util-linux-ng"
+
+# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+
+PREFERRED_PROVIDER_avahi ?= "avahi"
+PREFERRED_PROVIDER_gconf ?= "gconf"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
+
+# we use bluez4 instead of the older bluez3
+DISTRO_BLUETOOTH_MANAGER = "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs = "bluez4"
+PREFERRED_PROVIDER_bluez-utils = "bluez4"
+
+# Include any package preferred versions and srcrevs:
+
+require conf/distro/include/preferred-slugos-versions.inc
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/include/toolchain-external.inc b/conf/distro/include/toolchain-external.inc
new file mode 100644
index 0000000000..b1c3bd92bc
--- /dev/null
+++ b/conf/distro/include/toolchain-external.inc
@@ -0,0 +1,6 @@
+# Toolchain specific virtuals
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-toolchain-${TOOLCHAIN_BRAND}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-toolchain-${TOOLCHAIN_BRAND}"
diff --git a/conf/distro/include/toolchain-internal.inc b/conf/distro/include/toolchain-internal.inc
new file mode 100644
index 0000000000..71c6280f90
--- /dev/null
+++ b/conf/distro/include/toolchain-internal.inc
@@ -0,0 +1,6 @@
+# Toolchain specific virtuals
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc
new file mode 100644
index 0000000000..ee18fc87e1
--- /dev/null
+++ b/conf/distro/include/uclibc.inc
@@ -0,0 +1,11 @@
+# Add uclibc overrides to the overrides.
+OVERRIDES .= ":libc-uclibc"
+
+# The things uclibc can provide. We default to wanting uclibc to provide them.
+PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
+PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl"
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
diff --git a/conf/distro/iphone-compat.conf b/conf/distro/iphone-compat.conf
new file mode 100644
index 0000000000..be2017b7c5
--- /dev/null
+++ b/conf/distro/iphone-compat.conf
@@ -0,0 +1,19 @@
+require conf/distro/angstrom-2008.1.conf
+
+DISTRO_NAME = "iphone-compat"
+
+TARGET_OS = "darwin9"
+TARGET_VENDOR = "-apple"
+
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} -Wl,-L${STAGING_DIR_TARGET}${libdir}"
+
+# Compiler selection
+PREFERRED_PROVIDER_linux-libc-headers = "iphone-sdks"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "iphone-rootfs"
+PREFERRED_PROVIDER_virtual/libc = "iphone-rootfs"
+PREFERRED_PROVIDER_virtual/libiconv = "iphone-rootfs"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "odcctools-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-iphone-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-iphone-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-iphone-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-iphone-cross"
diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
new file mode 100644
index 0000000000..c60d65ddb8
--- /dev/null
+++ b/conf/distro/jlime-2010.1.conf
@@ -0,0 +1,118 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime 2010.1 <http://www.jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+# HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c,
+# Ben Nanonote.
+# Unofficial support for Netbook pro, Bsquare Maui.
+#@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
+#@MAINTAINER: Alex Ferguson <thoughtmonster@gmail.com>
+#@MAINTAINER: Filip Zyzniewski <filip.zyzniewski@gmail.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "2010.1"
+DISTRO_TYPE = "release"
+export FEED_URLS_jlime = "http://repository.jlime.com/"
+
+OVERRIDES .= ":jlime"
+
+#<>------------------------------------------------------------------>
+#<>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 = "JLiMe-${IMAGE_BASENAME}-2009.1-${MACHINE}"
+SPLASH = "psplash"
+
+#
+# Naming schemes + packages
+#
+INHERIT += "debian package_tar package_ipk src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
+IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "git"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libusb0 = "libusb"
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/gtk+ = "gtk+"
+PREFERRED_PROVIDER_gconf = "gconf"
+PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static"
+PREFERRED_PROVIDER_bluez-libs = "bluez-libs"
+
+PREFERRED_VERSION_gcc = "4.4.2"
+PREFERRED_VERSION_gcc-cross = "4.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.4.2"
+PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+PREFERRED_VERSION_coreutils-native = "6.0"
+
+#
+# Target OS & FPU system
+#
+TARGET_OS = "linux"
+TARGET_FPU_sh = "soft"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+TARGET_FPU_mipsel = "soft"
+TARGET_FPU_mips = "soft"
+
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
+
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
+PREFERRED_VERSION_glibc-initial = "2.9"
+PREFERRED_VERSION_glibc = "2.9"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
+
+#
+# General Userspace
+#
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+PREFERRED_VERSION_cdparanoia = "10.2"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
deleted file mode 100644
index 3c4dc11bb8..0000000000
--- a/conf/distro/jlime-donkey.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "jlime"
-DISTRO_VERSION = "donkey"
-
-export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
-
-#<>----------------------------------------------------------------->
-#<> No uniroot
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#<>----------------------------------------------------------------->
-#<> We will set CVS DATE when things are known to work.
-#<>-----------------------------------------------------------------<
-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_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-#<>----------------------------------------------------------------->
-#<> We want this so we can crosscompile the kernel using gcc 3.4.3
-#<> Also, select version of modules (and kernel)
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel"
-PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
-
-
-#<>----------------------------------------------------------------->
-#<>We want kdrive as our default X-Server.
-#<>-----------------------------------------------------------------<
-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
-
-
-#<>----------------------------------------------------------------->
-#<>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"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-
-#<>------------------------------------------------------------------>
-#<>Other Specific stuff.
-#<>
-#<>
-#<>We want to be able to build this for all jornadas so
-#<>to not mess up the folders we need to make them dynamic.
-#<>It will use different folders depending on Arch (set in local.conf)
-#<>------------------------------------------------------------------<
-SRC_DIST_LOCAL = "copy"
-INHERIT += "package_ipk package_tar multimachine src_distribute_local"
-BBINCLUDELOGS = "yes"
-IMAGE_FSTYPES = "tar.bz2"
-TARGET_OS = "linux"
-
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools \
- parted dialog"
-
-
-#<>------------------------------------------------------------------>
-#<>What Qte, libqte.. versions should we use.
-#<>------------------------------------------------------------------<
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-OPIE_VERSION = "1.2.2"
-require conf/distro/include/preferred-opie-versions.inc
-
-
-#<>------------------------------------------------------------------>
-#<> We want pcmciautils, not pcmcia-cs
-#<>------------------------------------------------------------------<
-PCMCIA_MANAGER = "pcmciautils"
-
-
-#<>------------------------------------------------------------------>
-#<> We are using gcc 4.1.1 so lets keep optimizations low
-#<>------------------------------------------------------------------<
-FULL_OPTIMIZATION = "-O2"
-
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-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
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
deleted file mode 100644
index 19379862ae..0000000000
--- a/conf/distro/jlime-shrek.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO = "Jornada Linux Mobility Edition"
-DISTRO_NAME = "JLime"
-DISTRO_VERSION = "Shrek"
-DISTRO_TYPE = "release"
-
-export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/Releases/shrek/${TARGET_ARCH}/feed/"
-
-SRCDATE = "20050518"
-
-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_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_gcc = "3.4.3"
-PREFERRED_VERSION_gcc-cross = "3.4.3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.3"
-PREFERRED_VERSION_linux-libc-headers = "2.6.7.0"
-PREFERRED_VERSION_glib-2.0-native = "2.6.2"
-PREFERRED_VERSION_glib-2.0 = "2.6.2"
-PREFERRED_VERSION_dpkg = "1.10.23"
-PREFERRED_VERSION_xserver-kdrive = "20050207"
-
-INHERIT += "package_tar package_ipk"
-BBINCLUDELOGS = "yes"
-MODUTILS = "26"
-IMAGE_FSTYPES = "tar.bz2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \
-kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \
-kernel-module-airo-cs kernel-module-airo console-tools \
-kernel-module-arlan \
-kernel-module-atmel-cs kernel-module-atmel kernel-module-axnet-cs \
-kernel-module-hermes \
-kernel-module-wavelan kernel-module-wavelan-cs \
-kernel-module-xirc2ps-cs kernel-module-orinoco-cs kernel-module-orinoco \
-kernel-module-nmclan-cs kernel-module-pcnet-cs e2tools e2fsprogs"
-
-TARGET_OS = "linux"
-
-OPIE_VERSION = "1.2.1"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
new file mode 100644
index 0000000000..ee187ba0c9
--- /dev/null
+++ b/conf/distro/kaeilos.conf
@@ -0,0 +1,198 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: KaeilOS(R) - http://www.kaeilos.com
+#@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 11-01-2010
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
+#
+# Use this at your own risk, we welcome bugreports filed at
+# http://bugs.openembedded.net
+#@--------------------------------------------------------------------
+
+#DISTRO_VERSION = "2009.1"
+DISTRO_VERSION = "2009.1-test-${DATE}"
+DISTRO_REVISION = "1"
+DISTRO_PR = ".5"
+
+OLDEST_KERNEL ?= "2.6.16"
+
+#build staging from packages
+INHERIT += "packaged-staging"
+
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/kaeilos-2009-preferred-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+
+#Images built can have to modes:
+# 'debug': empty rootpassword, strace included
+# 'release' no root password, no strace and gdb by default
+DISTRO_TYPE ?= "debug"
+#DISTRO_TYPE = "release"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
+# shipping some adhoc subset will be still useless and size burden for
+# users of all other languages/countries. Instead, worth to make it easy
+# to install additional languages: installer/wizard + metapackages which
+# will RRECOMMEND as much as possible content for a given language
+# (locales, UI transalations, help, etc. - useless for pros, but really
+# helpful for common users).
+# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
+IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
+
+# increase inode/block ratio for ext2 filesystem
+EXTRA_IMAGECMD_ext2 = "-i 4096"
+
+# set feed path variables
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+
+
+#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
+CVS_TARBALL_STASH ?= "\
+ http://www.angstrom-distribution.org/unstable/sources/ \
+ "
+
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+PCMCIA_MANAGER = "pcmciautils"
+
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
+
+#Initramfs for kernels
+#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/"
+#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
+
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
+
+# see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
+PREFERRED_VERSION_glibc ?= "2.9"
+PREFERRED_VERSION_glibc-initial ?= "2.9"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
+
+#powerpc needs additional patches to gcc
+ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+
+# Blackfin has its own gcc
+ANGSTROM_GCC_VERSION_bfin = "4.1.2"
+
+# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
+#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
+KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
+
+#avr32 only has support for gcc 4.2.2
+ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
+
+#armv4 needs at least gcc 4.4.2 for eabi
+ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2"
+
+#Everybody else can just use this:
+ANGSTROM_GCC_VERSION ?= "4.3.3"
+
+ANGSTROM_BINUTILS_VERSION ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20"
+ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7"
+
+PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk ?= "${ANGSTROM_BINUTILS_VERSION}"
+
+PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
+
+#avr32 only has patches for binutils 2.17 in OE
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+
+# Toolchain virtuals:
+require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
+
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+PREFERRED_PROVIDER_hotplug = "udev"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl"
+
+# see recipes/bluez/bluez4*.bb for further dependencies of this setting
+ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
+
+ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough"
+
+require conf/distro/include/kaeilos.inc
+
+# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
+# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
+IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+
+# Select xserver-xorg as default, since kdrive has been EOL'ed
+XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
+#PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+#PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+
+# do some task-base stuff here
+
+# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
+# bluez 3.x
+DISTRO_BLUETOOTH_MANAGER = "\
+ blueprobe \
+ bluez4 \
+ "
+
+# We want to ship extra debug utils in the rootfs when doing a debug build
+DEBUG_APPS ?= ""
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
+
+# KaeilOS want to ship some extra stuff. This should be moved into task-base eventually
+# contains ipkg specific stuff as well :(
+DISTRO_EXTRA_RDEPENDS += "\
+ update-modules \
+ kaeilos-version \
+ opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
+ util-linux-ng-mount util-linux-ng-umount \
+ ${DEBUG_APPS} angstrom-libc-fixup-hack \
+ "
+# ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
+
+# This also hooks into task-base, but isn't mandatory.
+# If you don't want parts of this in your task-base using images you can put this in the image recipe:
+# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd"
+# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass, not angstrom
+# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
+# avahi: makes finding your device on the network a lot easier
+# openssh-sftp-server: provides sftp which combined with avahi makes it real easy to use things like sshfs
+# psplash-angstrom: angstrom branded psplash, you can add your own psplash-foo to an image, it uses update-alternatives
+# DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier
+DISTRO_EXTRA_RRECOMMENDS += " \
+ kernel-module-vfat \
+ kernel-module-ext2 \
+ kernel-module-ext3 \
+ kernel-module-af-packet \
+ avahi-daemon \
+ avahi-autoipd \
+ openssh-sftp-server \
+ ${DEBUG_APPS} \
+ "
+
+SPLASH ?= "psplash"
+
+ARM_INSTRUCTION_SET_pn-uclibc = "arm"
+ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
deleted file mode 100644
index b8592fdf68..0000000000
--- a/conf/distro/maemo-1.0.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-require conf/distro/include/familiar.inc
-
-DISTRO = "maemo"
-DISTRO_NAME = "Maemo Linux"
-DISTRO_VERSION = "v1.0b-${DATE}"
-
-DISTRO_TYPE = "debug"
-#DISTRO_TYPE = "release"
-
-FEED_URIS += " \
- "
-#SRCDATE = 20050331
-
-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_binutils-cross = "2.15.91.0.2"
-#PREFERRED_VERSION_gcc-cross = "3.4.4"
-#PREFERRED_VERSION_gcc-cross-initial = "3.4.4
-#PREFERRED_VERSION_libtool-native = "1.5.6"
-#PREFERRED_VERSION_libtool-cross= "1.5.6"
-
-#
-# GPE
-#
-
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-
-require conf/distro/include/preferred-gpe-versions.inc
-
-#
-# Maemo
-#
-
-require conf/distro/include/maemo-preferred.inc
diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
index 26bf8b94f1..648d327677 100644
--- a/conf/distro/mamona.conf
+++ b/conf/distro/mamona.conf
@@ -1,60 +1,92 @@
#@--------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Mamona
+#@NAME: Mamona
#@--------------------------------------------------------------------
-DISTRO = "mamona"
-DISTRO_NAME = Mamona""
+DISTRO_NAME = "Mamona"
DISTRO_VERSION = "test-${DATE}"
DISTRO_TYPE = "debug"
-#DISTRO_TYPE = "release"
-TARGET_VENDOR = "-mamona"
+MAINTAINER = "Mamona Team <mamona-devel@garage.maemo.org>"
-require conf/distro/include/angstrom-glibc.inc
+TARGET_VENDOR = "-mamona"
-INHERIT += " package_deb debian"
-TARGET_OS = "linux-gnueabi"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
-TARGET_FPU_nokia770 = "soft"
-TARGET_FPU_n800 = "hard"
+INHERIT += "angstrom-mirrors mamona-mirrors"
+INHERIT += "package_deb debian"
+INHERIT += "buildallpkgs"
-FEED_ARCH_nokia770 = "armv5te"
+CXXFLAGS += "-fvisibility-inlines-hidden"
-# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
-# armv6 yet.
-FEED_ARCH_n800 = "armv5te"
-#FEED_ARCH_n800 = "armv6"
+# Kernel
+# ======
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
KERNEL = "kernel26"
MACHINE_KERNEL_VERSION = "2.6"
-
-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"
-
-#NPTL stuff
-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/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_VERSION_binutils = "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross = "2.17.50.0.5"
-
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-initial-cross = "4.1.1"
-
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+PREFERRED_VERSION_linux-omap1 ?= "2.6.22-omap1"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+PREFERRED_VERSION_linux ?= "2.6.22"
+PREFERRED_VERSION_linux-libc-headers_nokia770 = "2.6.16.osso7"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
+# Toolchain
+# =========
+
+# gcc
+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"
+
+PREFERRED_VERSION_gcc ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2"
+
+# binutils
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
+
+# *libc
+TARGET_OS = "linux-gnueabi"
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
PREFERRED_VERSION_glibc ?= "2.5"
-
PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-
PREFERRED_VERSION_glibc-initial ?= "2.5"
-
-require conf/distro/include/sane-srcdates.inc
-
-
+PREFERRED_VERSION_uclibc ?= "0.9.29"
+
+# Other Packages
+# ==============
+
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-dpkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-dpkg"
+PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
+PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_gconf = "gconf-dbus"
+
+PREFERRED_VERSION_apt = "0.7.6"
+PREFERRED_VERSION_gpsd ?= "2.33"
+PREFERRED_VERSION_hal_nokia770 = "0.5.7"
+PREFERRED_VERSION_networkmanager ?= "0.6.6"
+
+# Mplayer
+PREFERRED_VERSION_mplayer_nokia770 ?= "1.0maemo0"
+PREFERRED_VERSION_mplayer_nokia800 ?= "1.0maemo0"
+
+# Network
+PREFERRED_VERSION_wpa-supplicant = "0.5.7"
+
+# Mozilla
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_VERSION_gtk+ = "2.10.14"
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
new file mode 100644
index 0000000000..fb1887c96c
--- /dev/null
+++ b/conf/distro/micro-uclibc.conf
@@ -0,0 +1,26 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Micro uclibc
+#@DESCRIPTION: Micro Linux Distribution (uclibc based)
+#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
+#@COMMENT: This distribution configuration defines a Micro Linux distribution
+#@COMMENT: based on uclibc.
+#############################################################################
+
+#############################################################################
+# DISTRO CONFIGURATION
+#############################################################################
+
+DISTRO_NAME = "micro-uclibc"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+
+LIBC = "uclibc"
+# Based on the Micro Linux distribution
+require conf/distro/micro.conf
+
+# Use overrides for micro as well
+OVERRIDES .= ":micro"
+
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
new file mode 100644
index 0000000000..d9fc595303
--- /dev/null
+++ b/conf/distro/micro.conf
@@ -0,0 +1,107 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Micro
+#@DESCRIPTION: Micro Linux Distribution (eglibc based)
+#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
+#@COMMENT: This distribution configuration defines a truely tiny OE Linux
+#@COMMENT: distribution. The matching buildable image target (micro-image)
+#@COMMENT: basically consists of: libc, busybox, udev, sysv init, and a few
+#@COMMENT: init scripts for running up the system.
+#############################################################################
+
+#############################################################################
+# DISTRO CONFIGURATION
+#############################################################################
+DISTRO_NAME = "micro"
+DISTRO_VERSION = "${SRCDATE}"
+
+#############################################################################
+# DISTRO FEATURE SELECTION
+#############################################################################
+# No features selected
+DISTRO_FEATURES = "eabi"
+
+#############################################################################
+# LIBRARY NAMES
+#############################################################################
+# Use Debian naming scheme for library (.so) files
+INHERIT += "debian"
+
+#############################################################################
+# PACKAGING & FEEDS
+#############################################################################
+# Select packaging system
+PREFERRED_PKG_FORMAT = "ipk"
+IPKG_VARIANT = "opkg-nogpg"
+
+require conf/distro/include/sane-feed.inc
+require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name generated images
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-\
+${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+
+CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# Image output types
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+#############################################################################
+# LINUX KERNEL SELECTION
+#############################################################################
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+LIBC ?= "eglibc"
+PREFERRED_BINUTILS = "2.19.51"
+PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
+require conf/distro/include/sane-toolchain.inc
+
+#############################################################################
+# OVERRIDES adjusted from bitbake.conf to feature the MACHINE_CLASS
+#############################################################################
+OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\
+${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+
+#############################################################################
+# NLS
+#############################################################################
+USE_NLS = "no"
+USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
+
+# Disable binary locale generation
+ENABLE_BINARY_LOCALE_GENERATION = "0"
+
+# Don't install useless symlinks to libraries
+PACKAGE_SNAP_LIB_SYMLINKS = "1"
+
+# Collapse /usr into /
+prefix = ""
+exec_prefix = ""
+prefix_native = ""
+exec_prefix_native = ""
+
+# Don't install ldconfig and associated gubbins
+USE_LDCONFIG = "0"
+
+# Disable online package management
+ONLINE_PACKAGE_MANAGEMENT = "none"
+
+DISTRO_BLUETOOTH_MANAGER = "bluez4"
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
new file mode 100644
index 0000000000..df727697e2
--- /dev/null
+++ b/conf/distro/minimal-uclibc.conf
@@ -0,0 +1,41 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Minimal uClibc
+#@DESCRIPTION: uClibc based Embedded Linux Distribution Configuration (minimal)
+#
+#@COMMENT: This distribution configuration serves as a starting point for
+#@COMMENT: the integration of new target platforms, machines, or distributions.
+#@COMMENT: It bases on conservative settings and should always be buildable.
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "minimal-uclibc"
+
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+
+LIBC = "uclibc"
+
+require conf/distro/minimal.conf
+
+# NOTE:
+#
+# We get the DISTRO_FEATURES defined in minimal.conf here but
+# however there are some features like mips -mplt support which
+# is not supported on uclibc yet so we need to disable that
+# feature for uclibc based distributions, therefore we redefine
+# the DISTRO_FEATURES for minimal-uclibc and notably leave mplt
+# out. Make sure that if there is a new DISTRO_FEATURE thats added
+# to minimal.conf will not get included in minimal-uclibc.conf
+# it has to be added to the below selection if it should also be
+# enabled for minimal-uclibc
+
+# FEATURE SELECTION
+#############################################################################
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
+# Following features are for ARM and E500 based machines
+DISTRO_FEATURES += "eabi"
+
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
new file mode 100644
index 0000000000..8e0ae2eb34
--- /dev/null
+++ b/conf/distro/minimal.conf
@@ -0,0 +1,134 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Minimal
+#@DESCRIPTION: Embedded Linux Distribution Configuration
+#
+#@COMMENT: This distribution configuration can serve as a starting point for
+#@COMMENT: the integration of new target platforms, machines, or distributions.
+#############################################################################
+
+#############################################################################
+# NAME and VERSION
+#############################################################################
+DISTRO_NAME ?= "minimal"
+DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE ?= "debug"
+
+# Ensure some form of release config, so error out if someone thinks he knows better
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
+
+#############################################################################
+# FEATURE SELECTION
+#############################################################################
+# Use bluetooth 4.0
+DISTRO_BLUETOOTH_MANAGER = "bluez4"
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
+# Following features are for ARM and E500 based machines
+DISTRO_FEATURES += "eabi"
+
+# The following feature enables the MIPS ABI PLT extensions
+# This feature needs GCC 4.4 binutils 2.19 or glibc/eglibc 2.9
+# or higher
+
+DISTRO_FEATURES += "mplt"
+
+#############################################################################
+# LIBRARY NAMES
+#############################################################################
+# libfoo -> libfoo0-2 (etc)
+INHERIT += "debian"
+
+#############################################################################
+# STAGING AREA
+#############################################################################
+# Controlled by packaging system
+INHERIT += "packaged-staging"
+
+#############################################################################
+# PACKAGING & FEEDS
+#############################################################################
+# Chose the packaging system
+INHERIT += "package_ipk"
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+PREFERRED_PKG_FORMAT ?= "ipk"
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
+
+# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
+IPKG_VARIANT = "opkg-nogpg"
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}"
+
+# increase inode/block ratio for ext2 filesystem
+EXTRA_IMAGECMD_ext2 = "-i 8192"
+
+#############################################################################
+# KERNEL
+#############################################################################
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#############################################################################
+# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS
+#############################################################################
+OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+LIBC ?= "eglibc"
+require conf/distro/include/sane-toolchain.inc
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
+
+#############################################################################
+# CONTENTS
+#############################################################################
+
+# Ship extra debug utils in the rootfs when doing a debug build
+DISTRO_EXTRA_APPS ?= ""
+DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
+
+# Additional content I (only valid if you include task-base)
+# distro-feed-configs: configuration files for the online feeds
+# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken
+# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink
+DISTRO_EXTRA_RDEPENDS += "\
+ distro-feed-configs \
+ util-linux-ng-mount util-linux-ng-umount \
+ angstrom-libc-fixup-hack \
+ ${DISTRO_EXTRA_APPS} \
+"
+
+# Additional content II (can be masked with BAD_RECOMMENDATIONS)
+DISTRO_EXTRA_RRECOMMENDS += " \
+ kernel-module-vfat \
+ kernel-module-ext2 \
+ kernel-module-ext3 \
+ kernel-module-af-packet \
+ avahi-daemon \
+ avahi-autoipd \
+ openssh-sftp-server \
+"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index 2c039dbcce..1fba9e6a74 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -1,14 +1,13 @@
#@--------------------------------------------------------------------
#@TYPE: Distribution
#@NAME: MokoSlug <http://www.nslu2-linux.org>
-#@DESCRIPTION: The Linux Server companion for OpenMoko phones
+#@DESCRIPTION: The Linux Server companion for Openmoko phones
#@MAINTAINER: Rod Whitby <rod@whitby.id.au>
#@--------------------------------------------------------------------
# MokoSlug is based on Angstrom, and would hopefully just be done by features one day ...
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
-DISTRO = "mokoslug"
DISTRO_NAME = "MokoSlug"
DISTRO_VERSION = "1.0-alpha"
DISTRO_REVISION = "1"
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 334c8bba9b..7ab7b35d20 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -1,38 +1,75 @@
+#############################################################################
#@TYPE: Distribution
#@NAME: Nylon Linux
#@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution
+#############################################################################
-# this distribution is mainly for wireless networking devices and includes
-# packages necessary for wireless LAN access point, routing, encryption and
-# especially mesh routing applications
-#
-# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other
-# mipsel based platforms
-#
-# Bruno Randolf <bruno.randolf@4g-systems.biz>
+require conf/distro/angstrom-2008.1.conf
-INHERIT += "package_ipk debian nylon-mirrors"
-INHERIT += "linux-kernel-base"
+#############################################################################
+# NAME and VERSION
+#############################################################################
+DISTRO_NAME = "nylon"
+DISTRO = ${DISTRO_NAME}
+DISTRO_VERSION = "${NYLON_VERSION}"
+BUILDNAME := "${NYLON_VERSION}"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
+TARGET_FPU = "soft"
+SRCDATE := "20050527"
+TARGET_VENDOR = "-nylon"
+
+# Ensure some form of release config, so error out if someone thinks he knows better
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
+
+#############################################################################
+# PACKAGING
+#############################################################################
+# Chose the packaging system
+INHERIT += "nylon-mirrors"
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name the generated images in a sane way
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}"
+KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}"
-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_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-PREFERRED_PROVIDERS += " virtual/libx11:diet-x11"
-PREFERRED_PROVIDERS += " python:python-curses"
-PREFERRED_PROVIDER_classpath = "classpath-minimal"
+#############################################################################
+# KERNEL
+#############################################################################
+KERNEL = "kernel24"
+MACHINE_KERNEL_VERSION = "2.4"
-TARGET_FPU = "soft"
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}"
+CXXFLAGS := ${fixedCxxflags}
-SRCDATE := "20050527"
+# we're not supporting pcmcia right now
+DISTRO_FEATURES = "nfs smbfs wifi pcmcia ppp ext2 vfat usbhost pci"
+# FIXME: cannot build linux-libc-headers unless this is set.
+IPKGBUILDCMD = "stage-manager-ipkg-build -o 0 -g 0"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+PREFERRED_VERSION_busybox = "1.7.2"
PREFERRED_VERSION_glibc = "2.3.3"
+PREFERRED_VERSION_glibc-initial = "2.3.2"
PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
-PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223"
+PREFERRED_VERSION_mtd-utils = "1.1.0"
PREFERRED_VERSION_kismet = "2005-01-R1"
+PREFERRED_VERSION_automake-native = "1.10.2"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_netperf = "2.3"
PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
+PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4"
PREFERRED_VERSION_gcc-cross = "3.3.4"
PREFERRED_VERSION_gcc-cross-sdk = "3.3.4"
PREFERRED_VERSION_gcc = "3.3.4"
@@ -40,65 +77,13 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
PREFERRED_VERSION_binutils = "2.16"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-
PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
-
-KERNEL_VERSION_mtx-1 = "2.4.27"
-KERNEL_VERSION_mtx-2 = "2.4.27"
-
-#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc_mtx-3 = "3.4.4"
-### did not compile with:
-#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7"
-#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7"
-### falling back to:
-PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1"
-PREFERRED_VERSION_binutils_mtx-3 = "2.16"
+#PREFERRED_VERSION_udev = "089"
+PREFERRED_VERSION_udev = "100"
PREFERRED_VERSION_madwifi-modules = "0.9.3"
PREFERRED_VERSION_madwifi-tools = "0.9.3"
+PREFERRED_VERSION_e2fsprogs-libs = "1.41.8"
+PREFERRED_VERSION_dbus = "1.2.1"
-PREFERRED_VERSION_udev = "089"
-
-KERNEL_VERSION_mtx-3 = "2.6.15.4"
-PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a"
-
-
-#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc_mtx-3a = "3.4.4"
-### did not compile with:
-#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7"
-#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7"
-### falling back to:
-PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1"
-PREFERRED_VERSION_binutils_mtx-3a = "2.16"
-
-PREFERRED_VERSION_udev = "100"
-
-KERNEL_VERSION_mtx-3a = "2.6.16.6"
-
-
-# usually overrrided from local.conf
-NYLON_RELEASE = "unstable"
-
-# use meshcub.org mirrors for CVS sources
-CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/"
-
-export FEED_URIS = " \
- nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \
- nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed"
-
-# image names
-DISTRO_VERSION = "${NYLON_VERSION}"
-BUILDNAME := "${NYLON_VERSION}"
-#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}"
-KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}"
-
+PREFERRED_PROVIDER_hotplug = "linux-hotplug"
+PREFERRED_PROVIDER_opkg = "opkg-nogpg"
diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf
index 9de6c7d9e1..c4a4ccfaee 100644
--- a/conf/distro/openmn.conf
+++ b/conf/distro/openmn.conf
@@ -13,6 +13,8 @@ TARGET_OS = "linux"
INHERIT += "package_ipk"
INHERIT += "debian"
PACKAGE_EXTRA_ARCHS = "armv5te openmn"
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
FEED_URIS = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index c438da25d9..81d7075fc1 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -1,29 +1,96 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: OpenMoko
-#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
+#@NAME: Openmoko
+#@DESCRIPTION: Linux Distribution Configuration for the Openmoko Platform
#-----------------------------------------------------------------------------
-require conf/distro/angstrom-2007.1.conf
-require conf/distro/include/openmoko-srcdate-now.inc
+require conf/distro/include/preferred-om-2008-versions.inc
+require conf/distro/include/angstrom-2007-for-openmoko.inc
#
# Header
#
-DISTRO = "openmoko"
-DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
+DISTRO_NAME = "openmoko"
+DISTRO_VERSION = "-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
+DISTRO = "openmoko"
+
+OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
+
+INHERIT += "packaged-staging"
+
+CVS_TARBALL_STASH += "http://downloads.openmoko.org/developer/sources/"
+
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/developer/sources/"
+
+DISTRO_FEED_PREFIX ?= "om-dev"
+DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
+
+IMAGE_INITSCRIPTS = "initscripts-openmoko"
+
+# We try to minimize the distro features in the default image.
+DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
+
+# Some features (bluetooth, usbgadget) include packages we do not like.
+# Pick some of the packages manually.
+DISTRO_EXTRA_RDEPENDS += " \
+ bluez4 \
+ kernel-module-g-ether \
+ "
+
+# 2.18 seems to break badly on 64-bit systems
+PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
+
+# Bleeding-edge developers should add the following lines to their local.conf:
+# require conf/distro/include/fso-autorev.inc
+
+# override the PACKAGE_ARCH of certain packages for openmoko distro
+#
+# Same kernel used to run on both these machines...
+# Currently not used but left here in case someone wants to switch on
+# quickly
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "armv4t"
-OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+# Same kernel so same usb
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
+# same kernel so same keymaps
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
+# neod knows about both machines
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
-CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+# Select package providers
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_libgsmd = "libgsmd"
-PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
+# for jalimo
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+PREFERRED_PROVIDER_midpath = "midpath-openmoko"
-FEED_URIS = "\
- all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \
- armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \
- fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01"
+# We don't use this, but select one to shut bitbake up.
+PREFERRED_PROVIDER_virtual/libqte2 = "qte"
+# Helper to say what image we built
+OM_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/om-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${OM_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${OM_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};"
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index 928817d815..4e0f472675 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -1,9 +1,18 @@
#
-# Open Iomega distribution - based on openslug and generic confs
+# OpenProtium distribution - based upon openslug and generic confs
#
DISTRO_NAME = "openprotium"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
-DISTRO_TYPE = "alpha"
+DISTRO_VERSION = "1.3"
+DISTRO_TYPE ?= "alpha"
+TARGET_OS = "linux"
+#
+# Basic configuration
+#
+IMAGE_DEV_MANAGER = "udev"
+DISTRO_SSH_DAEMON = "dropbear"
+IMAGE_INIT_MANAGER = "sysvinit"
+IMAGE_LOGIN_MANAGER = "tinylogin"
+MACHINE_TASK_PROVIDER = "task-openprotium"
#
# Naming schemes
@@ -14,56 +23,58 @@ INHERIT += "debian"
# Packaging and output format
#
INHERIT += "package_ipk"
-IMAGE_BASENAME = "openprotium"
-IMAGE_FSTYPES = "jffs2"
-FEED_URIS = "openprotium##http://www.openprotium.org/ipkg.ppc.v1.0"
+IMAGE_FSTYPES = "jffs2 tar.gz"
+OPENPROTIUM_URI = "http://www.openprotium.org"
+FEED_ARCH_storcenter = ppc603e
+FEED_ARCH_turbostation = ppc603e
+FEED_URIS = "\
+ no-arch##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/all \
+ base##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${FEED_ARCH} \
+ ${MACHINE}##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${MACHINE} \
+ "
# For protium on the turbostation
+IMAGE_BASENAME = "openprotium"
IMAGE_BASENAME_turbostation = "openprotium-ts"
-#
-# binutils and compilers
-#
-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"
-#conflict between this and the last below.
-#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-# Select 2.6 versions of the depmod support
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
+# versions
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
-PREFERRED_VERSION_binutils = "2.16"
-PREFERRED_VERSION_binutils-cross = "2.16"
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2"
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+PREFERRED_VERSION_glibc = "2.6.1"
+PREFERRED_VERSION_glibc-initial = "2.6.1"
-PREFERRED_VERSION_glibc = "2.5"
-PREFERRED_VERSION_glibc-intermediate = "2.5"
-PREFERRED_VERSION_glibc-initial = "2.3.2"
+PREFERRED_VERSION_linux-libc-headers = "2.6.11.1"
-#
-# Target OS & FPU system
#
-USE_NLS ?= "no"
-TARGET_OS = "linux"
-HOTPLUG = "udev"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
+# Providers...
#
-# Bootstrap & Init
+# binutils and compilers
#
-#PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
+
+#silence a warning message...
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
#
+# Misc items.
#
-# Ensure consistency across all SlugOS builds for the provider of a
-# relational database - use the latest version of the SleepyCat
-# Berkeley database
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_gconf ?= "gconf"
-CMDLINE_DEBUG = "noirqdebug"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
new file mode 100644
index 0000000000..0646b17f90
--- /dev/null
+++ b/conf/distro/openwrt-sdk.conf
@@ -0,0 +1,33 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenWRT-SDK
+#@DESCRIPTION: Building packages for OpenWRT using its official SDK.
+#
+#@COMMENT: This allows to build packages only, not the whole images.
+#@COMMENT: You should install and have in path an SDK from the www.openwrt.org.
+#@COMMENT: SDK installers are both host and target specific (so look in download
+#@COMMENT: dir for your target). If there is no SDK for your host arch,
+#@COMMENT: you can also look at downloads of x-wrt.org, a sister project.
+#@COMMENT: To build a package, use command like:
+#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package>
+#-----------------------------------------------------------------------------
+
+require conf/distro/generic-uclibc.conf
+
+#
+# Header
+#
+DISTRO_NAME = "OpenWRT"
+DISTRO_REVISION = "2"
+
+# Build ipk's wrapped with tar.gz instead of ar, like OpenWRT has them
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
+
+# This is what lives in SDK
+ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+
+# Rename packages to names used in OpenWRT
+PKG_ncurses = "libncurses"
+
+# Make sure that we have correct package dependencies for SDK-provided libs.
+ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/oplinux-uclibc.conf
index 0d31c8c8ac..b8617cc763 100644
--- a/conf/distro/oplinux-uclibc.conf
+++ b/conf/distro/oplinux-uclibc.conf
@@ -29,8 +29,8 @@ DISTRO_TYPE = "debug"
# Target OS & FPU system
#
TARGET_OS = "linux-uclibc"
-PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
-PREFERRED_PROVIDER_virtual/libintl = "libintl"
+LIBC = "uclibc"
+require conf/distro/include/${LIBC}.inc
#
# Kernel
@@ -43,12 +43,14 @@ MACHINE_KERNEL_VERSION = "2.6"
# Binutils & Compiler
#
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_VERSION_gcc ?= "4.1.1"
PREFERRED_VERSION_gcc-cross ?= "4.1.1"
PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.1"
PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf
index 03e56b0148..43e8fad61c 100644
--- a/conf/distro/oplinux.conf
+++ b/conf/distro/oplinux.conf
@@ -35,32 +35,19 @@ DISTRO_TYPE = "debug"
TARGET_OS = "linux"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_esound ?= "pulseaudio"
# glibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-oplinux-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-oplinux-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-oplinux-linux-libc-for-gcc = "glibc-intermediate"
-
-
+LIBC ?= "glibc"
+require conf/distro/include/${LIBC}.inc
# Virtuals:
PREFERRED_PROVIDER_virtual/db ?= "db"
@@ -84,6 +71,7 @@ PREFERRED_VERSION_gcc ?= "4.1.1"
PREFERRED_VERSION_gcc-cross ?= "4.1.1"
PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1"
PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.1"
PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
@@ -96,7 +84,6 @@ PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
PREFERRED_VERSION_glibc-initial ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
PREFERRED_VERSION_glibc ?= "2.5"
PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index fd01d21397..0e8e272b11 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -20,11 +20,20 @@ FULL_OPTIMIZATION_pn-fetchmail = "-fexpensive-optimizations -fomit-frame-pointer
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "tty1"
# prebuilt toolchain doesn't know about -isystem
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${includedir}"
#DEBUG_OPTIMIZATION = "-O -g3"
#DEBUG_BUILD = "1"
+# We are still using 2.4 embedix kernels
+COMPATIBLE_MACHINE_pn-c7x0-kernels = "(c7x0|corgi|husky|shepherd)"
+COMPATIBLE_MACHINE_pn-collie-kernels = "collie"
+COMPATIBLE_MACHINE_pn-poodle-kernels = "(poodle|poodle255)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz|borzoi)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|corgi|husky|shepherd|poodle|poodle255|tosa)"
+COMPATIBLE_MACHINE_pn-openzaurus-sa = "collie"
+
+
#
# Base
#
@@ -34,13 +43,18 @@ DISTRO_TYPE = "debug"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-initial = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libiconv = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libintl = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native"
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native"
PREFERRED_VERSION_glibc = "2.2.5"
+PREFERRED_VERSION_linux-libc-headers = "2.4.18"
IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
#INHIBIT_PACKAGE_STRIP = "1"
@@ -52,6 +66,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
QTE_VERSION = "2.3.10"
OPIE_VERSION = "1.2.2"
PALMTOP_USE_MULTITHREADED_QT = "no"
+export palmtopdir = "/opt/QtPalmtop"
require conf/distro/include/preferred-opie-versions.inc
#
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
new file mode 100644
index 0000000000..5417f5b06d
--- /dev/null
+++ b/conf/distro/shr.conf
@@ -0,0 +1,207 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: SHR
+#@DESCRIPTION: Linux Distribution Configuration for Mobile Phones
+#-----------------------------------------------------------------------------
+
+# set default locale for images - we have to do that before
+# including angstrom-2007-for-openmoko.inc because otherwise
+# it will be already set to en-gb
+IMAGE_LINGUAS ?= "en-us"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+#LIBC = "glibc"
+
+require conf/distro/include/preferred-shr-versions.inc
+require conf/distro/include/shr-autorev.inc
+
+#
+# Header
+#
+DISTRO_NAME = "shr"
+DISTRO_VERSION = "-${DATE}"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".4"
+DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+DISTRO = "shr"
+
+DISTRO_SSH_DAEMON = "openssh"
+DISTRO_APM = "fso-apm"
+
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+#save statistical info on images
+INHERIT += "testlab"
+
+#activate the angstrom blacklister
+INHERIT += "angstrom"
+
+ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
+ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script"
+ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script"
+
+CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
+
+PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
+
+DISTRO_FEED_PREFIX ?= "shr-dev"
+DISTRO_FEED_URI ?= "http://build.shr-project.org/shr-testing/ipk"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
+
+IMAGE_INITSCRIPTS = "initscripts-shr"
+DISTRO_INITSCRIPTS = "initscripts-shr"
+DISTRO_DEV_MANAGER = "udev"
+
+IPKG_VARIANT = "opkg"
+
+# Same kernel so same usb
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
+# same kernel so same keymaps
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
+# neod knows about both machines
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
+
+# Helper to say what image we built
+SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};"
+
+#Package customization
+EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu"
+
+#Illume settings
+ILLUME_CONFIG = "e-wm-config-illume-shr"
+ILLUME_THEME = "e-wm-theme-illume-gry"
+
+# From minimal.conf
+
+#############################################################################
+# FEATURE SELECTION
+#############################################################################
+# Use bluetooth 4.0
+DISTRO_BLUETOOTH_MANAGER = "bluez4"
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
+# Following features are for ARM and E500 based machines
+DISTRO_FEATURES += "eabi"
+
+#############################################################################
+# LIBRARY NAMES
+#############################################################################
+# libfoo -> libfoo0-2 (etc)
+INHERIT += "debian"
+
+#############################################################################
+# STAGING AREA
+#############################################################################
+# Controlled by packaging system
+INHERIT += "packaged-staging"
+
+#############################################################################
+# PACKAGING & FEEDS
+#############################################################################
+# Chose the packaging system
+INHERIT += "package_ipk"
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+require conf/distro/include/sane-feed.inc
+PREFERRED_PKG_FORMAT ?= "ipk"
+require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# increase inode/block ratio for ext2 filesystem
+EXTRA_IMAGECMD_ext2 = "-i 8192"
+
+#############################################################################
+# KERNEL
+#############################################################################
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#############################################################################
+# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS
+#############################################################################
+OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+LIBC ?= "eglibc"
+require conf/distro/include/sane-toolchain.inc
+
+#############################################################################
+# PREFERRED PROVIDERS
+#############################################################################
+PREFERRED_PROVIDER_gpsd = "fso-gpsd"
+PREFERRED_PROVIDER_atd = "atd-over-fso"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+#Use newest available (X11R7.5 now)
+#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#############################################################################
+# CONTENTS
+#############################################################################
+
+# Ship extra debug utils in the rootfs when doing a debug build
+DISTRO_EXTRA_APPS ?= ""
+DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
+
+# Additional content I (only valid if you include task-base)
+# distro-feed-configs: configuration files for the online feeds
+# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken
+# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink
+DISTRO_EXTRA_RDEPENDS += "\
+ distro-feed-configs \
+ util-linux-ng-mount util-linux-ng-umount \
+ angstrom-libc-fixup-hack \
+ ${DISTRO_EXTRA_APPS} \
+"
+
+# Additional content II (can be masked with BAD_RECOMMENDATIONS)
+DISTRO_EXTRA_RRECOMMENDS += " \
+ kernel-module-vfat \
+ kernel-module-ext2 \
+ kernel-module-ext3 \
+ kernel-module-af-packet \
+ openssh-sftp-server \
+"
+
+# avahi-daemon \
+# avahi-autoipd \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 564a2d0cfb..d9b00f41a8 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -8,14 +8,16 @@
DISTRO_NAME = "SlugOS"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
+DISTRO_TYPE = "alpha"
TARGET_ARCH ?= "armeb"
ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
+TARGET_OS = "linux-gnueabi"
+IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos"
+IMAGE_INITSCRIPTS ?= "initscripts-slugos"
require conf/distro/include/slugos.inc
# glibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc ?= "glibc"
+LIBC ?= "glibc"
+require conf/distro/include/${LIBC}.inc
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 441c3484ef..df8cde8973 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -8,8 +8,11 @@ TARGET_ARCH = "armeb"
ARM_INSTRUCTION_SET = "thumb"
THUMB_INTERWORK = "yes"
TARGET_OS = "linux-uclibc"
+LIBC = "uclibc"
+require conf/distro/include/${LIBC}.inc
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc = "3.4.4"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
deleted file mode 100644
index ad75fffe11..0000000000
--- a/conf/distro/unslung.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Unslung
-#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
-
-DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.9-alpha"
-DISTRO_TYPE = "beta"
-
-FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
-FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
-
-TARGET_FPU = "soft"
-TARGET_OS = "linux"
-
-# select distro specific options to match that of the original LinkSys build
-ARM_INSTRUCTION_SET = "arm"
-THUMB_INTERWORK = "no"
-
-# for compatibility PACKAGE_ARCH stays as TARGET_ARCH and TARGET_ARCH is hard-wired
-# to armeb - this makes this stuff independent of changes in machine/nslu2.conf
-TARGET_ARCH = "armeb"
-PACKAGE_ARCH = "${TARGET_ARCH}"
-# PACKAGE_EXTRA_ARCHS has the full list of supported architectures (from nslu2be.conf).
-# We need "nslu2" added for backwards compatibility.
-PACKAGE_EXTRA_ARCHS += "nslu2"
-
-# match the optimisation settings to that which has traditionally been used
-# in unslung
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-
-INHERIT += " package_ipk"
-
-IMAGE_FSTYPES = "jffs2"
-UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
-EXTRA_IMAGECMD_jffs2 = "-n --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"
-
-UNSLUNG_EXTRA_DEPENDS ?= ""
-UNSLUNG_EXTRA_RDEPENDS ?= ""
-
-UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}"
-
-# Select between multiple alternative providers, if more than one is eligible.
-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_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-PREFERRED_PROVIDERS += " virtual/libc:glibc"
-
-PREFERRED_PROVIDER_libc6-unslung = "glibc"
-
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_glibc ?= "2.2.5"
-PREFERRED_VERSION_glibc-initial ?= "2.2.5"
-
-PREFERRED_PROVIDER_virtual/kernel = "unslung-kernel"
-PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63"
-PREFERRED_VERSION_unslung-rootfs ?= "2.3r63"
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
-PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63"
-PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-#-------------------------------------------------------------------
-# FIXME!
-# This is clearly wrong, the headers should match the 2.4.22 kernel,
-# but locking this to 2.6.11.1 at least gets Unslung building again.
-# - mwester 16 Dec 2006
-#
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
diff --git a/conf/distro/wrt54oe.conf b/conf/distro/wrt54oe.conf
index 90babfdc1a..0cea34912a 100644
--- a/conf/distro/wrt54oe.conf
+++ b/conf/distro/wrt54oe.conf
@@ -12,13 +12,16 @@
INHERIT += "package_ipk debian"
TARGET_OS = "linux-uclibc"
+LIBC = "uclibc"
+require conf/distro/include/${LIBC}.inc
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:uclibc"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
PREFERRED_VERSION_gcc = "3.4.4"