16 files changed, 932 insertions, 374 deletions
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index dc3929c3a7..6726710aa9 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,7 +1,8 @@
 # eglibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
-PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
+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-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "eglibc-intermediate"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 957042d7e4..1502833389 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -2,6 +2,7 @@
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 
 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']]}"
 
diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
new file mode 100644
index 0000000000..3dbb175f93
--- /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..a33a4ad2b4
--- /dev/null
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -0,0 +1,5 @@
+INHERIT += "package_ipk"
+
+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-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.inc b/conf/distro/include/angstrom.inc
index e3e77f9f18..0c3ac35672 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -14,14 +14,22 @@ 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 debian style naming
 #use multimachine buildrules 
-INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors insane"
+INHERIT += "debian multimachine sanity devshell angstrom-mirrors insane"
+
+ANGSTROM_PKG_FORMAT ?= "ipk"
+require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.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"
@@ -39,13 +47,221 @@ TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
 
+#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_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
+
+FEED_ARCH_mx31ads 	= "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"
+
+
+#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"
+
+
 #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}-${ANGSTROM_MODE}-${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}-${ANGSTROM_MODE}-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"
+# SEPPUKU_USER         = "your_bugzilla@user.id"
+# SEPPUKU_PASS         = "your_bugzilla_password"
+# in their local.conf
+
+# seppuku bbclass
+SEPPUKU_LOGIN        = "http://bugs.openembedded.org/query.cgi?"
+SEPPUKU_QUERY       = "http://bugs.openembedded.org/buglist.cgi?"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_AUTOBUILD = "1"
+
+SEPPUKU_PRODUCT      = "Openembedded"
+SEPPUKU_COMPONENT    = "build"
+
+
+
+
+
 # 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"
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
new file mode 100644
index 0000000000..ae1ec5fb9c
--- /dev/null
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -0,0 +1,83 @@
+SRCREV_pn-dfu-util ?= "${AUTOREV}"
+SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-eglibc ?= "${AUTOREV}"
+SRCREV_pn-eglibc-initial ?= "${AUTOREV}"
+SRCREV_pn-eglibc-intermediate ?= "${AUTOREV}"
+SRCREV_pn-ezxd ?= "${AUTOREV}"
+SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}"
+SRCREV_pn-fstests ?= "${AUTOREV}"
+SRCREV_pn-gnuradio ?= "${AUTOREV}"
+SRCREV_pn-hildon-1 ?= "${AUTOREV}"
+SRCREV_pn-libgsmd ?= "${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-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-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-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-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-psplash ?= "${AUTOREV}"
+SRCREV_pn-settings-daemon ?= "${AUTOREV}"
+SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
+SRCREV_pn-sphyrna ?= "${AUTOREV}"
+SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
+SRCREV_pn-xoo ?= "${AUTOREV}"
+SRCREV_pn-mplayer ?= "${AUTOREV}"
+
+SRCREV ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
new file mode 100644
index 0000000000..c4d478ccde
--- /dev/null
+++ b/conf/distro/include/moko-autorev.inc
@@ -0,0 +1,63 @@
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
+SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
+SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
+
+SRCREV_pn-moko-gtk-engine ?= "${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-icon-theme-standard2-qvga ?= "${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-simplemediaplayer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "${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-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
+
+SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
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/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc
index 263406c90b..ea24db3708 100644
--- a/conf/distro/include/preferred-openmoko-versions.inc
+++ b/conf/distro/include/preferred-openmoko-versions.inc
@@ -3,58 +3,8 @@
 #
 
 #
-# Base
+# Bootloader and Kernel
 #
 
-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"
+SRCREV_pn-linux-openmoko = "2937"
 
-#
-# 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-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index 1f39916f4f..ffcbbc2217 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}"
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..19ee48174d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -0,0 +1,282 @@
+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.1"
+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"
+
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
index fa66d61a0a..f34b29f147 100644
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -1,111 +1,111 @@
-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.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"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index b0a2edf812..e5db7a9ceb 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -13,16 +13,16 @@ SRCDATE_libxext-native ?= "20060814"
 SRCDATE_libxss ?= "20060814"
 SRCDATE_recordext ?= "20060814"
 SRCDATE_renderext ?= "20060814"
-SRCDATE_calibrateproto ?= "20070802"                     
+SRCDATE_calibrateproto ?= "20070802"
 SRCDATE_libxcalibrate ?= "20070802"
 SRCDATE_xxf86dgaext ?= "20060814"
-SRCDATE_xxf86vmext ?= "20060814" 
+SRCDATE_xxf86vmext ?= "20060814"
 
 # Matchbox / O-hand
 SRCDATE_contacts ?= "20060707"
 SRCDATE_dates ?= "20060707"
 SRCDATE_fstests ?= "20061122"
-SRCDATE_eds-dbus ?= "20070215"
+SRCDATE_eds-dbus ?= "20070704"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_matchbox-common ?= "20060612"
@@ -53,47 +53,56 @@ 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"
+EFL_SRCDATE = "20070819"
+SRCDATE_edb-native ?= "${EFL_SRCDATE}"
+SRCDATE_edb ?= "${EFL_SRCDATE}"
+SRCDATE_eet-native ?= "${EFL_SRCDATE}"
+SRCDATE_eet ?= "${EFL_SRCDATE}"
+SRCDATE_evas-native ?= "${EFL_SRCDATE}"
+SRCDATE_evas ?= "${EFL_SRCDATE}"
+SRCDATE_ecore-native ?= "${EFL_SRCDATE}"
+SRCDATE_ecore ?= "${EFL_SRCDATE}"
+SRCDATE_edbus ?= "${EFL_SRCDATE}"
+SRCDATE_embryo-native ?= "${EFL_SRCDATE}"
+SRCDATE_embryo ?= "${EFL_SRCDATE}"
+SRCDATE_edje-native ?= "${EFL_SRCDATE}"
+SRCDATE_edje ?= "${EFL_SRCDATE}"
+SRCDATE_emotion ?= "${EFL_SRCDATE}"
+SRCDATE_etk-native ?= "${EFL_SRCDATE}"
+SRCDATE_etk ?= "${EFL_SRCDATE}"
+SRCDATE_ewl ?= "${EFL_SRCDATE}"
+SRCDATE_epeg ?= "${EFL_SRCDATE}"
+SRCDATE_epsilon ?= "${EFL_SRCDATE}"
+SRCDATE_epdf ?= "${EFL_SRCDATE}"
+SRCDATE_esmart ?= "${EFL_SRCDATE}"
+SRCDATE_efreet ?= "${EFL_SRCDATE}"
+SRCDATE_exml ?= "${EFL_SRCDATE}"
+SRCDATE_enhance ?= "${EFL_SRCDATE}"
+SRCDATE_engrave ?= "${EFL_SRCDATE}"
+SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
+SRCDATE_evolve ?= "${EFL_SRCDATE}"
+SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
+
+# Enlightenment Bindings
+SRCDATE_eflpp ?= "${EFL_SRCDATE}"
+SRCDATE_python-evas ?= "${EFL_SRCDATE}"
+SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
+SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
+SRCDATE_python-etk ?= "${EFL_SRCDATE}"
 
 # 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"
+SRCDATE_edje-viewer ?= "${EFL_SRCDATE}"
+SRCDATE_edje-editor ?= "${EFL_SRCDATE}"
+SRCDATE_emphasis ?= "${EFL_SRCDATE}"
+SRCDATE_ephoto ?= "${EFL_SRCDATE}"
+SRCDATE_examine ?= "${EFL_SRCDATE}"
+SRCDATE_exhibit ?= "${EFL_SRCDATE}"
+SRCDATE_expedite ?= "${EFL_SRCDATE}"
+SRCDATE_elitaire ?= "${EFL_SRCDATE}"
+SRCDATE_entice ?= "${EFL_SRCDATE}"
+SRCDATE_e-utils ?= "${EFL_SRCDATE}"
+SRCDATE_enna ?= "${EFL_SRCDATE}"
 
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
@@ -124,7 +133,7 @@ SRCDATE_oprofile ?= "20061011"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
-SRCDATE_qemu-native ?= "20060723"
+SRCDATE_qemu-native ?= "20070613"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
new file mode 100644
index 0000000000..008881ed99
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -0,0 +1,103 @@
+# 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)
+
+SRCREV_pn-bfin-uclibc ?= "1806"
+SRCREV_pn-dfu-util ?= "2866"
+SRCREV_pn-dfu-util-native ?= "2866"
+SRCREV_pn-eglibc ?= "3531"
+SRCREV_pn-eglibc-initial ?= "3531"
+SRCREV_pn-eglibc-intermediate ?= "3531"
+SRCREV_pn-ezxd ?= "2058"
+SRCREV_pn-elf2flt="1786"
+SRCREV_pn-fbgrab-viewer-native ?= "1943"
+SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gconf-dbus ?= "606"
+SRCREV_pn-gnuradio ?= "6377"
+SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-libgsmd ?= "3074"
+SRCREV_pn-libmokogsmd2 ?= "2950"
+SRCREV_pn-libmokojournal2 ?= "2780"
+SRCREV_pn-libmokopanelui2 ?= "2958"
+SRCREV_pn-libmokoui2 ?= "3064"
+SRCREV_pn-libowl ?= "277"
+SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-linux-hackndev-2.6 ?= "1308"
+SRCREV_pn-llvm-gcc4 ?= "374"
+SRCREV_pn-llvm-gcc4-cross ?= "374"
+SRCREV_pn-maemo-mapper ?= "108"
+SRCREV_pn-matchbox-desktop-2 ?= "1649"
+SRCREV_pn-matchbox-keyboard ?= "1675"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
+SRCREV_pn-matchbox-panel-2 ?= "1626"
+SRCREV_pn-moko-gtk-engine ?= "3069"
+SRCREV_pn-neod ?= "2956"
+SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-osb-browser ?= "125"
+SRCREV_pn-osb-jscore ?= "117"
+SRCREV_pn-osb-nrcit ?= "125"
+SRCREV_pn-osb-nrcore ?= "126"
+SRCREV_pn-openmoko-appmanager ?= "1851"
+SRCREV_pn-openmoko-appmanager2 ?= "3090"
+SRCREV_pn-openmoko-browser2 ?= "3082"
+SRCREV_pn-openmoko-calculator ?= "2404"
+SRCREV_pn-openmoko-calculator2 ?= "2789"
+SRCREV_pn-openmoko-common ?= "397"
+SRCREV_pn-openmoko-common2 ?= "2679"
+SRCREV_pn-openmoko-contacts ?= "2298"
+SRCREV_pn-openmoko-contacts2 ?= "350"
+SRCREV_pn-openmoko-dates ?= "467"
+SRCREV_pn-openmoko-dates2 ?= "617"
+SRCREV_pn-openmoko-dialer ?= "2811"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
+SRCREV_pn-openmoko-feedreader2 ?= "3080"
+SRCREV_pn-openmoko-finger-demo ?= "1671"
+SRCREV_pn-openmoko-firststart2 ?= "2873"
+SRCREV_pn-openmoko-footer ?= "2354"
+SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
+SRCREV_pn-openmoko-keyboard ?= "1631"
+SRCREV_pn-openmoko-libs ?= "2367"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
+SRCREV_pn-openmoko-messages ?= "2276"
+SRCREV_pn-openmoko-panel-battery ?= "2897"
+SRCREV_pn-openmoko-panel-bt ?= "2896"
+SRCREV_pn-openmoko-panel-clock ?= "2567"
+SRCREV_pn-openmoko-panel-demo ?= "1622"
+SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
+SRCREV_pn-openmoko-panel-gps ?= "2900"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
+SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
+SRCREV_pn-openmoko-panel-usb ?= "2893"
+SRCREV_pn-openmoko-session ?= "152"
+SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "2976"
+SRCREV_pn-openmoko-stylus-demo ?= "2324"
+SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
+SRCREV_pn-openmoko-taskmanager ?= "1663"
+SRCREV_pn-openmoko-tasks ?= "320"
+SRCREV_pn-openmoko-tasks2 ?= "343"
+SRCREV_pn-openmoko-terminal2 ?= "2972"
+SRCREV_pn-openmoko-theme-standard ?= "2370"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
+SRCREV_pn-openmoko-theme-standard2 ?= "3044"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
+SRCREV_pn-openmoko-today ?= "3056"
+SRCREV_pn-openmoko-today2 ?= "3088"
+SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openocd ?= "206"
+SRCREV_pn-openocd-native ?= "206"
+SRCREV_pn-psplash ?= "249"
+SRCREV_pn-settings-daemon ?= "1615"
+SRCREV_pn-sjf2410-linux-native ?= "933"
+SRCREV_pn-sphyrna ?= "44"
+SRCREV_pn-webkit-gtk ?= "26079"
+SRCREV_pn-xoo ?= "1623"
+SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
+