summaryrefslogtreecommitdiff
path: root/conf/distro/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/include')
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc234
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc63
-rw-r--r--conf/distro/include/angstrom-2010-preferred-versions.inc88
-rw-r--r--conf/distro/include/angstrom-codec-engine-2.25-preferred-versions.inc14
-rw-r--r--conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc53
-rw-r--r--conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc50
-rw-r--r--conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc50
-rw-r--r--conf/distro/include/angstrom-codec-engine-latestproduction-preferred-versions.inc50
-rw-r--r--conf/distro/include/angstrom-eglibc.inc14
-rw-r--r--conf/distro/include/angstrom-glibc.inc2
-rw-r--r--conf/distro/include/angstrom-jalimo.conf32
-rw-r--r--conf/distro/include/angstrom-uclibc.inc6
-rw-r--r--conf/distro/include/angstrom-uclinux-uclibc.inc6
-rw-r--r--conf/distro/include/angstrom.inc11
-rw-r--r--conf/distro/include/arm-thumb.inc30
-rw-r--r--conf/distro/include/fso-autorev.inc38
-rw-r--r--conf/distro/include/glibc-external.inc2
-rw-r--r--conf/distro/include/glibc-internal.inc2
-rw-r--r--conf/distro/include/glibc.inc2
-rw-r--r--conf/distro/include/kaeilos-2009-preferred-versions.inc89
-rw-r--r--conf/distro/include/kaeilos-2010.inc155
-rw-r--r--conf/distro/include/kaeilos.inc7
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2131
-rw-r--r--conf/distro/include/preferred-om-2009-versions.inc27
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3.inc1
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.4.inc1
-rw-r--r--conf/distro/include/preferred-shr-versions.inc58
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc74
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.0.inc347
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.1.inc191
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.2.inc276
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.3.inc287
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc7
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4.inc249
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc10
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.5.inc15
-rw-r--r--conf/distro/include/preferred-xorg-versions-live.inc173
-rw-r--r--conf/distro/include/preferred-xorg-versions.inc115
-rw-r--r--conf/distro/include/sane-feed.inc6
-rw-r--r--conf/distro/include/sane-srcdates.inc58
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc46
-rw-r--r--conf/distro/include/sane-srcrevs.inc415
-rw-r--r--conf/distro/include/sane-toolchain-eglibc.inc10
-rw-r--r--conf/distro/include/sane-toolchain-java.inc6
-rw-r--r--conf/distro/include/sane-toolchain-uclibc.inc8
-rw-r--r--conf/distro/include/sane-toolchain.inc34
-rw-r--r--conf/distro/include/shr-autorev.inc7
-rw-r--r--conf/distro/include/slugos.inc24
-rw-r--r--conf/distro/include/toolchain-external.inc2
-rw-r--r--conf/distro/include/toolchain-internal.inc1
-rw-r--r--conf/distro/include/uclibc.inc8
51 files changed, 922 insertions, 4663 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
deleted file mode 100644
index 6741bae3e1..0000000000
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ /dev/null
@@ -1,234 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Angstrom <http://www.angstrom-distribution.org>
-#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen@openembedded.org>
-#@--------------------------------------------------------------------
-
-DISTRO_VERSION = "2007.11RC3"
-DISTRO_REVISION = "51"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#Images built can have to modes:
-# 'debug': empty rootpassword, strace included
-# 'release' no root password, no strace and gdb by default
-DISTRO_TYPE ?= "debug"
-#DISTRO_TYPE = "release"
-
-# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
-# shipping some adhoc subset will be still useless and size burden for
-# users of all other languages/countries. Instead, worth to make it easy
-# to install additional languages: installer/wizard + metapackages which
-# will RRECOMMEND as much as possible content for a given language
-# (locales, UI transalations, help, etc. - useless for pros, but really
-# helpful for common users).
-# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
-IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
-
-# set feed path variables
-FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
-
-
-#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
-CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/"
-
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-PCMCIA_MANAGER = "pcmciautils"
-
-#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
-RDEPENDS_kernel-base_hx4700 = ""
-RDEPENDS_kernel-base_htcuniversal = ""
-
-PREFERRED_PROVIDER_libgsmd = "libgsmd"
-
-# older gtk-webcore releases don't work on ARM/EABI
-# We need to switch to a fixed SRCDATE or release as soon as possible
-PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
-PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-
-#Small machines prefer kdrive, but we might ship full Xorg in other images
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-
-#use EABI ready toolchain
-PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2"
-
-PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-intermediate_dht-walnut ?= "4.1.1"
-
-PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-intermediate_xilinx-ml403 ?= "4.1.1"
-
-PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-intermediate_mpc8323e-rdb ?= "4.1.1"
-
-PREFERRED_VERSION_binutils ?= "2.18"
-PREFERRED_VERSION_binutils-cross ?= "2.18"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
-
-#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
-PREFERRED_VERSION_avr32-gcc = "4.1.2"
-PREFERRED_VERSION_avr32-gcc-cross = "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
-PREFERRED_VERSION_gcc-cross-intermediate_avr32 = "4.0.2"
-
-PREFERRED_VERSION_binutils_avr32 = "2.17"
-PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
-PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
-
-#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
-PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21"
-
-#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
-
-#there's is no avr32 patch for 0.9.29
-PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
-PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
-
-PREFERRED_VERSION_glibc-initial ?= "2.5"
-
-# To use an EABI compatible version 3 series gcc, either uncomment
-# the lines below or set them in local.conf:
-#
-# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
-# PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4+csl-arm-2005q3"
-
-#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-require conf/distro/include/preferred-e-versions.inc
-
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-
-#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial"
-
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-
-# Others:
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_esound ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp ?= "ntp"
-PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_libxss = "libxss"
-
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+ ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
-
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-require conf/distro/include/angstrom${ARM_ABI}.inc
-
-# do some task-base stuff here
-
-# We want to ship extra debug utils in the rootfs when doing a debug build
-DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
-
-#this should go away soon
-EXTRA_STUFF ?= ""
-
-
-# Angstrom want to ship some extra stuff. This should be moved into task-base eventually
-# contains ipkg specific stuff as well :(
-
-#work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails
-DISTRO_EXTRA_DEPENDS += " \
- mtd-utils-native \
- "
-
-DISTRO_EXTRA_RDEPENDS += "\
- update-modules \
-# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \
- angstrom-version \
- opkg opkg-collateral distro-feed-configs \
- util-linux-mount util-linux-umount \
- ${EXTRA_STUFF} \
- ${DEBUG_APPS} \
- "
-
-DISTRO_EXTRA_RRECOMMENDS += " \
- kernel-module-vfat \
- kernel-module-ext2 \
- kernel-module-af-packet \
- openssh-sftp-server \
- "
-
-SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index d61e0e258e..967b4f4ab8 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,36 +1,51 @@
-ANGSTROM_QT_VERSION ?= "4.6.0"
+ANGSTROM_QT_VERSION ?= "4.6.3"
+CE_VERSION ?= "2.25.01"
-PREFERRED_VERSION_autoconf = "2.63"
-PREFERRED_VERSION_autoconf-native = "2.63"
-PREFERRED_VERSION_automake-native = "1.10.2"
+require conf/distro/include/angstrom-codec-engine-${CE_VERSION}-preferred-versions.inc
+
+PREFERRED_VERSION_autoconf = "2.65"
+PREFERRED_VERSION_autoconf-native = "2.65"
+PREFERRED_VERSION_automake = "1.11.1"
+PREFERRED_VERSION_automake-native = "1.11.1"
PREFERRED_VERSION_busybox = "1.13.2"
-PREFERRED_VERSION_cairo = "1.8.8"
-PREFERRED_VERSION_dbus = "1.2.3"
+PREFERRED_VERSION_cairo = "1.10.0"
+PREFERRED_VERSION_dbus = "1.2.24"
PREFERRED_VERSION_dropbear = "0.51"
-PREFERRED_VERSION_fontconfig = "2.6.0"
-PREFERRED_VERSION_glib-2.0 = "2.22.1"
-PREFERRED_VERSION_glib-2.0-native = "2.22.1"
-PREFERRED_VERSION_glibmm = "2.22.1"
+PREFERRED_VERSION_fontconfig = "2.8.0"
+PREFERRED_VERSION_glib-2.0 = "2.24.1"
+PREFERRED_VERSION_glib-2.0-native = "2.24.1"
+PREFERRED_VERSION_glibmm = "2.24.0"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.18.3"
-PREFERRED_VERSION_gtkmm = "2.18.1"
-PREFERRED_VERSION_hal = "0.5.13"
+PREFERRED_VERSION_gtk+ = "2.20.1"
+PREFERRED_VERSION_gtk+-native = "2.20.1"
+PREFERRED_VERSION_gtkmm = "2.20.0"
+PREFERRED_VERSION_hal = "0.5.14"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
PREFERRED_VERSION_libsdl-x11 = "1.2.14"
-PREFERRED_VERSION_libtool = "2.2.6a"
-PREFERRED_VERSION_libtool-native = "2.2.6a"
-PREFERRED_VERSION_libtool-cross = "2.2.6a"
-PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_libtool = "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross = "2.2.6b"
+PREFERRED_VERSION_libtool-sdk = "2.2.6b"
+PREFERRED_VERSION_lighttpd = "1.4.26"
PREFERRED_VERSION_mesa = "7.6"
PREFERRED_VERSION_mesa-dri = "7.6"
PREFERRED_VERSION_mesa-xlib = "7.6"
+PREFERRED_VERSION_mythplugins = "0.22"
+PREFERRED_VERSION_myththemes = "0.22"
+PREFERRED_VERSION_mythtv = "0.22"
+PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr30165"
+PREFERRED_VERSION_network-manager-applet = "0.8"
+PREFERRED_VERSION_networkmanager = "0.8"
+PREFERRED_VERSION_openssl = "1.0.0a"
+PREFERRED_VERSION_openssl-native = "1.0.0a"
PREFERRED_VERSION_pango = "1.24.4"
+PREFERRED_VERSION_pango-native = "1.24.4"
#PREFERRED_VERSION_pixman = "0.13.2"
PREFERRED_VERSION_pkgconfig = "0.23"
PREFERRED_VERSION_pkgconfig-native = "0.23"
PREFERRED_VERSION_pulseaudio = "0.9.15"
-PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_python-pycairo = "1.8.0"
PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
@@ -39,14 +54,18 @@ PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_samba = "3.3.9"
-PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+PREFERRED_VERSION_tiff = "3.9.2+4.0.0beta5"
-PREFERRED_VERSION_udev = "141"
+PREFERRED_VERSION_udev = "151"
+PREFERRED_VERSION_udev_libc-uclibc = "141"
UDEV_GE_141 = "1"
-PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_usbutils = "0.86"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_wget = "1.11.4"
+PREFERRED_VERSION_xserver-common = "1.33"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.7.4"
#
# meta-moblin package SRCREVs
@@ -63,5 +82,3 @@ SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
-
-
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
new file mode 100644
index 0000000000..4bd90fae9f
--- /dev/null
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -0,0 +1,88 @@
+ANGSTROM_MESA_VERSION = "7.8.2"
+ANGSTROM_QT_VERSION ?= "4.6.3"
+CE_VERSION ?= "2.25.01"
+
+require conf/distro/include/angstrom-codec-engine-${CE_VERSION}-preferred-versions.inc
+require conf/distro/include/preferred-xorg-versions-live.inc
+
+PREFERRED_VERSION_autoconf = "2.65"
+PREFERRED_VERSION_autoconf-native = "2.65"
+PREFERRED_VERSION_automake = "1.11.1"
+PREFERRED_VERSION_automake-native = "1.11.1"
+PREFERRED_VERSION_busybox = "1.17.1"
+PREFERRED_VERSION_cairo = "1.10.0"
+PREFERRED_VERSION_dbus = "1.2.24"
+PREFERRED_VERSION_dropbear = "0.51"
+PREFERRED_VERSION_fontconfig = "2.8.0"
+PREFERRED_VERSION_glib-2.0 = "2.24.1"
+PREFERRED_VERSION_glib-2.0-native = "2.24.1"
+PREFERRED_VERSION_glibmm = "2.24.0"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gtk+ = "2.20.1"
+PREFERRED_VERSION_gtk+-native = "2.20.1"
+PREFERRED_VERSION_gtkmm = "2.20.0"
+PREFERRED_VERSION_hal = "0.5.14"
+PREFERRED_VERSION_libgemwidget = "1.0"
+PREFERRED_VERSION_libgpephone = "0.4"
+PREFERRED_VERSION_libsdl-x11 = "1.2.14"
+PREFERRED_VERSION_libtool = "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross = "2.2.6b"
+PREFERRED_VERSION_libtool-sdk = "2.2.6b"
+PREFERRED_VERSION_lighttpd = "1.4.26"
+PREFERRED_VERSION_mesa = "${ANGSTROM_MESA_VERSION}"
+PREFERRED_VERSION_mesa-dri = "${ANGSTROM_MESA_VERSION}"
+PREFERRED_VERSION_mesa-xlib = "${ANGSTROM_MESA_VERSION}"
+PREFERRED_VERSION_mythplugins = "0.22"
+PREFERRED_VERSION_myththemes = "0.22"
+PREFERRED_VERSION_mythtv = "0.22"
+PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr30165"
+PREFERRED_VERSION_network-manager-applet = "0.8"
+PREFERRED_VERSION_networkmanager = "0.8"
+PREFERRED_VERSION_openssl = "1.0.0a"
+PREFERRED_VERSION_openssl-native = "1.0.0a"
+PREFERRED_VERSION_pango = "1.24.4"
+PREFERRED_VERSION_pango-native = "1.24.4"
+PREFERRED_VERSION_perl = "5.10.1"
+PREFERRED_VERSION_perl-native = "5.10.1"
+#PREFERRED_VERSION_pixman = "0.13.2"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.15"
+PREFERRED_VERSION_python-pycairo = "1.8.0"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+PREFERRED_VERSION_samba = "3.3.9"
+PREFERRED_VERSION_tiff = "3.9.2+4.0.0beta5"
+
+PREFERRED_VERSION_udev = "151"
+PREFERRED_VERSION_udev_libc-uclibc = "141"
+UDEV_GE_141 = "1"
+
+PREFERRED_VERSION_usbutils = "0.86"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_wget = "1.11.4"
+PREFERRED_VERSION_xserver-common = "1.33"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.8.1"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
diff --git a/conf/distro/include/angstrom-codec-engine-2.25-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-2.25-preferred-versions.inc
new file mode 100644
index 0000000000..3c3480cf44
--- /dev/null
+++ b/conf/distro/include/angstrom-codec-engine-2.25-preferred-versions.inc
@@ -0,0 +1,14 @@
+# Codec engine needs a specific set of version of its dependencies, so we specify them here:
+
+PREFERRED_VERSION_ti-codec-engine = "2_25_00_05"
+
+PREFERRED_VERSION_ti-biosutils = "1_02_02"
+PREFERRED_VERSION_ti-cgt6x = "6_1_9"
+PREFERRED_VERSION_ti-dspbios = "5_41_02_14"
+PREFERRED_VERSION_ti-dsplink-module = "1_64"
+PREFERRED_VERSION_ti-edma3lld = "01_11_00_02"
+PREFERRED_VERSION_ti-framework-components = "2_25_00_04"
+PREFERRED_VERSION_ti-linuxutils = "2_25_01_06"
+PREFERRED_VERSION_ti-lpm-module = "2_24_01"
+PREFERRED_VERSION_ti-xdais = "6_25_00_07"
+PREFERRED_VERSION_ti-xdctools = "3_16_01_27"
diff --git a/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc
new file mode 100644
index 0000000000..b6b9ec0ce8
--- /dev/null
+++ b/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc
@@ -0,0 +1,53 @@
+# Codec engine needs a specific set of version of its dependencies, so we specify them here:
+# - using edma-lld 01.11.00.03 (instead of 01.11.00.02) to fix installer issue.
+
+PREFERRED_VERSION_ti-codec-engine = "2_25_01_06"
+PREFERRED_VERSION_ti-codec-engine-examples = "2_25_01_06"
+
+PREFERRED_VERSION_ti-biosutils = "1_02_02"
+PREFERRED_VERSION_ti-cgt6x = "6_1_9"
+PREFERRED_VERSION_ti-dspbios = "5_41_02_14"
+PREFERRED_VERSION_ti-dsplink = "1_64"
+PREFERRED_VERSION_ti-dsplink-examples = "1_64"
+PREFERRED_VERSION_ti-dsplink-module = "1_64"
+PREFERRED_VERSION_ti-edma3lld = "01_11_00_03"
+PREFERRED_VERSION_ti-framework-components = "2_25_01_05"
+PREFERRED_VERSION_ti-linuxutils = "2_25_01_06"
+PREFERRED_VERSION_ti-local-power-manager = "1_24_01"
+PREFERRED_VERSION_ti-lpm-module = "1_24_01"
+PREFERRED_VERSION_ti-lpm-utils = "1_24_01"
+PREFERRED_VERSION_ti-xdais = "6_25_01_08"
+PREFERRED_VERSION_ti-xdctools = "3_16_01_27"
+
+PREFERRED_VERSION_ti-codecs-dm355 = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm355-server = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm365 = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm365-server = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm6446 = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6446-server = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6467 = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-dm6467-server = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-omap3530 = "1_00_01"
+PREFERRED_VERSION_ti-codecs-omap3530-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137 = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl138 = "1_00_00"
+PREFERRED_VERSION_ti-codecs-omapl138-server = "1_00_00"
+PREFERRED_VERSION_ti-dm355mm-module = "1_13"
+PREFERRED_VERSION_ti-dm365mm-module = "1_0_3"
+PREFERRED_VERSION_ti-dvsdk-demos = "3_10_00_11"
+
+PREFERRED_VERSION_ti-dmai = "2_10_00_01+svnr%"
+PREFERRED_VERSION_ti-dmai-apps = "2_10_00_01+svnr%"
+PREFERRED_VERSION_ti-dmai-tests = "2_10_00_01+svnr%"
+# PREFERRED_VERSION_ti-dmai = ""
+# PREFERRED_VERSION_ti-dmai-apps = ""
+# PREFERRED_VERSION_ti-dmai-tests = ""
+# PREFERRED_VERSION_gstreamer-ti = ""
+# PREFERRED_VERSION_gstreamer-ti-demo-script = ""
+
+# PREFERRED_VERSION_matrix-gui = ""
+# PREFERRED_VERSION_bitblit = ""
+# PREFERRED_VERSION_ti-dsplib = ""
+# PREFERRED_VERSION_ti-sysbios = ""
+
diff --git a/conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc
new file mode 100644
index 0000000000..920263a3ef
--- /dev/null
+++ b/conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc
@@ -0,0 +1,50 @@
+# Codec engine needs a specific set of version of its dependencies, so we specify them here:
+# - using edma-lld 01.11.00.03 (instead of 01.11.00.02) to fix installer issue.
+
+PREFERRED_VERSION_ti-codec-engine = "2_25_02_11"
+PREFERRED_VERSION_ti-codec-engine-examples = "2_25_02_11"
+
+PREFERRED_VERSION_ti-biosutils = "1_02_02"
+PREFERRED_VERSION_ti-cgt6x = "6_1_5"
+PREFERRED_VERSION_ti-dspbios = "5_41_00_06"
+PREFERRED_VERSION_ti-dsplink = "1_64"
+PREFERRED_VERSION_ti-dsplink-examples = "1_64"
+PREFERRED_VERSION_ti-dsplink-module = "1_64"
+PREFERRED_VERSION_ti-edma