propagate from branch 'org.openembedded.dev' (head ab0d9a488e49d9ec307f6d034845a25a157b066b)

            to branch 'org.openembedded.dev.avr32' (head 4c5317ddb5784cda08980db89021f3fc1e9b786e)

11 files changed, 627 insertions, 314 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 909e66dcd9..9b3c3fed11 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -11,6 +11,7 @@ DISTRO_VERSION = "2007.9-test-${DATE}"
 DISTRO_REVISION = "46"
 
 require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace and gdb included
@@ -216,7 +217,7 @@ 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"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh16"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
@@ -267,9 +268,9 @@ 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"
+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"
@@ -320,6 +321,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 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
+require conf/distro/include/preferred-openmoko-versions.inc
 
 
 # Virtuals:
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 655d435994..9d2223ccd9 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -6,12 +6,20 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
 #@--------------------------------------------------------------------
 
+
+# Use Xorg R7.3 release
+require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+
+
 # 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"
 
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh16"
+
 require conf/distro/angstrom-2007.1.conf
 
 #DISTRO_VERSION = "2008.1"
@@ -21,10 +29,6 @@ DISTRO_REVISION = "0"
 PREFERRED_VERSION_gcc               = "4.2.1"
 PREFERRED_VERSION_gcc-cross         = "4.2.1"
 
-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"
-
 #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"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 865f0bc5a6..0c3ac35672 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -16,6 +16,11 @@ 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"
 
+#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>"
 
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
new file mode 100644
index 0000000000..82540840b1
--- /dev/null
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -0,0 +1,77 @@
+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-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders ?= "${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 ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
new file mode 100644
index 0000000000..5a1dc34784
--- /dev/null
+++ b/conf/distro/include/moko-autorev.inc
@@ -0,0 +1,43 @@
+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-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc
deleted file mode 100644
index 80c861b95c..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.9.0+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-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
new file mode 100644
index 0000000000..7ffa788c91
--- /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 ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_editres ?= "1.0.2"
+PREFERRED_VERSION_fontosfnt ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_listres ?= "X11R7.0-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 ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfs ?= "1.0.4"
+PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinit ?= "1.0.5"
+PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmag ?= "1.0.2"
+PREFERRED_VERSION_xman ?= "1.0.3"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xprop ?= "1.0.3"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1"
+
+#data
+PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-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 ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2"
+PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.1"
+PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0"
+PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-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 ?= "X11R7.1-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 ?= "X11R7.1-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 ?= "X11R7.1-0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-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 ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1"
+
+# lib
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_liblbxutil ?= "X11R7.1-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 ?= "X11R7.1-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 ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-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 ?= "X11R7.1-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 ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_imake ?= "X11R7.1-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 ?= "X11R7.1-1.0.2"
+
+# xserver
+PREFERRED_VERSION_xserver-kdrive ?= "1.4.0"
+PREFERRED_VERSION_xserver-xorg ?= "1.4.0"
+
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-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
new file mode 100644
index 0000000000..d53217b82b
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -0,0 +1,84 @@
+#Ggenerated 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 ?= "3468"
+SRCREV_pn-eglibc-initial ?= "3468"
+SRCREV_pn-eglibc-intermediate ?= "3468"
+SRCREV_pn-ezxd ?= "2052"
+SRCREV_pn-elf2flt="1786"
+SRCREV_pn-fbgrab-viewer-native ?= "1943"
+SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gnuradio ?= "6377"
+SRCREV_pn-hildon-1 ?= "13708"
+SRCREV_pn-libgsmd ?= "2806"
+SRCREV_pn-libmokogsmd2 ?= "2950"
+SRCREV_pn-libmokojournal2 ?= "2780"
+SRCREV_pn-libmokopanelui2 ?= "2958"
+SRCREV_pn-libmokoui2 ?= "2868"
+SRCREV_pn-libowl ?= "277"
+SRCREV_pn-libxosd ?= "627"
+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 ?= "1583"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "1583"
+SRCREV_pn-matchbox-panel-2 ?= "1626"
+SRCREV_pn-neod ?= "2956"
+SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-openmoko-appmanager ?= "1851"
+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 ?= "335"
+SRCREV_pn-openmoko-dates ?= "467"
+SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dialer ?= "2811"
+SRCREV_pn-openmoko-dialer2 ?= "2946"
+SRCREV_pn-openmoko-feedreader2 ?= "2944"
+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 ?= "2840"
+SRCREV_pn-openmoko-keyboard ?= "1631"
+SRCREV_pn-openmoko-libs ?= "2367"
+SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
+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 ?= "2936"
+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-standard ?= "2827"
+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 ?= "320"
+SRCREV_pn-openmoko-theme-standard ?= "2370"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
+SRCREV_pn-openmoko-today ?= "2556"
+SRCREV_pn-openmoko-today2 ?= "2955"
+SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-psplash ?= "249"
+SRCREV_pn-settings-daemon ?= "1615"
+SRCREV_pn-sjf2410-linux-native ?= "933"
+SRCREV_pn-sphyrna ?= "44"
+SRCREV_pn-webkit-gtk ?= "25507"
+SRCREV_pn-xoo ?= "1623"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 7061ef2c63..26bcc2472c 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -11,7 +11,7 @@ require conf/distro/angstrom-2007.1.conf
 #
 DISTRO = "openmoko"
 DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-August-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 
@@ -29,3 +29,11 @@ FEED_URIS = "\
   updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
   updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
   updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 "
+
+# 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"
+
+require conf/distro/include/preferred-openmoko-versions.inc
+require conf/distro/include/moko-autorev.inc
+