summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf11
-rw-r--r--conf/distro/chinook-compat.conf13
-rw-r--r--conf/distro/ezx.conf82
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc21
-rw-r--r--conf/distro/include/angstrom-eglibc.inc2
-rw-r--r--conf/distro/include/angstrom.inc5
-rw-r--r--conf/distro/include/fso-autorev.inc3
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc78
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4.inc167
-rw-r--r--conf/distro/include/sane-srcdates.inc4
-rw-r--r--conf/distro/include/sane-srcrevs.inc35
-rw-r--r--conf/distro/include/slugos.inc3
-rw-r--r--conf/distro/minimal-uclibc.conf (renamed from conf/distro/generic-uclibc.conf)6
-rw-r--r--conf/distro/minimal.conf (renamed from conf/distro/generic.conf)7
-rw-r--r--conf/distro/openmoko.conf1
15 files changed, 212 insertions, 226 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 17029ec21e..d6354411fd 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -90,13 +90,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
#for proper NEON support we need a CSL toolchain
-ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
+#ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
+ANGSTROM_GCC_VERSION_armv7a = "4.3.1"
+
+#Horrible workaround for armv7a follows:
+# gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function
+# gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace
+
+KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
#avr32 only has support for gcc 4.2.2
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
#Everybody else can just use this:
-ANGSTROM_GCC_VERSION ?= "4.2.2"
+ANGSTROM_GCC_VERSION ?= "4.2.4"
PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index e834c8c4c8..f6029eed1b 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -52,7 +52,9 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
PREFERRED_VERSION_automake-native = "1.9.6"
@@ -84,6 +86,9 @@ PREFERRED_VERSION_glib-2.0 = "2.12.12"
PREFERRED_VERSION_pango = "1.16.4"
PREFERRED_VERSION_atk = "1.18.0"
PREFERRED_VERSION_gtk+ = "2.10.14"
+PREFERRED_VERSION_libpng = "1.2.8"
+PREFERRED_VERSION_dbus = "1.0.3"
+PREFERRED_VERSION_expat = "1.95.7"
PREFERRED_VERSION_gnome-vfs = "2.16.3"
@@ -112,6 +117,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
PREFERRED_VERSION_libsdl-directfb = "1.2.9"
PREFERRED_VERSION_libsdl-image = "1.2.3"
+PREFERRED_VERSION_libsdl-mixer = "1.2.6"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -137,7 +143,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+"
-PREFERRED_PROVIDER_gconf = "gconf"
+PREFERRED_PROVIDER_gconf = "gconf-dbus"
PREFERRED_VERSION_pixman = "0.9.6"
@@ -169,7 +175,7 @@ PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97.1"
+PREFERRED_VERSION_classpath = "0.97.2"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -192,6 +198,7 @@ PKG_glib-2.0 = "libglib2.0-0"
PKG_gconf = "libgconf2-6"
DEBIANNAME_dbus_pn-dbus = "dbus"
PKG_libhildon = "libhildon1"
+DEBIANNAME_eds-dbus_pn-libedataserver-1.2 = "libedataserver"
PKG_zlib = "zlib1g"
PKG_libglade = "libglade2-0"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
deleted file mode 100644
index 5b12b6f93b..0000000000
--- a/conf/distro/ezx.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: EZX <http://www.openezx.org>
-#@DESCRIPTION: A Linux Distribution for Motorola GSM phones
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@--------------------------------------------------------------------
-
-DISTRO_NAME = "OpenEZX"
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
-
-INHERIT += " package_ipk debian"
-
-# libc setting:
-# specify whether you want a glibc or uclibc based distribution
-#TARGET_OS = "linux-uclibc"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-#FEED_URIS += " \
-# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-SRCDATE ?= "20060507"
-
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# fix some iconv issues, needs to be commented out when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Base
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-# ezx-kernel has problems with newer g++ atm.
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-
-#
-# Utilities
-#
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 382d562426..7707215847 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,10 +1,23 @@
+PREFERRED_VERSION_automake-native = "1.10"
PREFERRED_VERSION_busybox = "1.9.2"
+PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
-PREFERRED_VERSION_glib-2.0 = "2.16.1"
+PREFERRED_VERSION_dropbear = "0.51"
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_glib-2.0 = "2.16.3"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libtool = "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross = "2.2.4"
+PREFERRED_VERSION_libtool-sdk = "2.2.4"
PREFERRED_VERSION_pango = "1.18.3"
-PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_pixman = "0.10.0"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.10"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_dropbear = "0.50"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 394ec7c2d4..07873fe700 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -14,6 +14,8 @@ PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "
TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+#TARGET_OS = "linux-gnuspe"
+
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index bd56a09de6..bbdbe7f80b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -281,9 +281,10 @@ TINDER_CLOBBER = "1"
TINDER_REPORT = "1"
# Configuration for seppuku autobuilder, people only need to put:
-# INHERIT += "seppuku"
+# INHERIT += "seppuku oestats-client"
# SEPPUKU_USER = "your_bugzilla@user.id"
# SEPPUKU_PASS = "your_bugzilla_password"
+# OESTATS_BUILDER = "your_name"
# in their local.conf
# seppuku bbclass
@@ -297,7 +298,7 @@ SEPPUKU_AUTOBUILD = "1"
SEPPUKU_PRODUCT = "Openembedded"
SEPPUKU_COMPONENT = "org.openembedded.dev"
-
+OESTATS_SERVER ?= "tinderbox.openembedded.net"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index df53515a9a..da6dafd6bc 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -1,9 +1,12 @@
+SRCREV_pn-frameworkd = "${AUTOREV}"
SRCREV_pn-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-gsmd2 = "${AUTOREV}"
SRCREV_pn-pygsm = "${AUTOREV}"
SRCREV_pn-mickeyterm = "${AUTOREV}"
SRCREV_pn-pyneod = "${AUTOREV}"
SRCREV_pn-pynoeg = "${AUTOREV}"
SRCREV_pn-python-odeviced = "${AUTOREV}"
+SRCREV_pn-python-oeventd = "${AUTOREV}"
SRCREV_pn-python-ophoned = "${AUTOREV}"
SRCREV_pn-python-ousaged = "${AUTOREV}"
SRCREV_pn-python-pytrc = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 99f0390dee..a9fbb3067d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -59,7 +59,7 @@ PREFERRED_VERSION_autofs ?= "4.1.4"
PREFERRED_VERSION_automake ?= "1.9.6"
PREFERRED_VERSION_automake-native ?= "1.9.6"
PREFERRED_VERSION_avahi ?= "0.6.22"
-PREFERRED_VERSION_avahi-python ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
PREFERRED_VERSION_avahi-ui ?= "0.6.22"
PREFERRED_VERSION_avetanabt ?= "20060413"
PREFERRED_VERSION_bacula-client ?= "1.38.11"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_btscanner ?= "2.0"
PREFERRED_VERSION_btsco ?= "0.42"
PREFERRED_VERSION_btsco-module ?= "0.42"
PREFERRED_VERSION_btxml ?= "1.0"
-PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_busybox-static ?= "1.2.1"
PREFERRED_VERSION_bvi ?= "1.3.1"
PREFERRED_VERSION_bwmon ?= "1.3"
@@ -162,10 +162,10 @@ PREFERRED_VERSION_chrpath-native ?= "0.13"
PREFERRED_VERSION_ckermit ?= "211"
PREFERRED_VERSION_clamav ?= "0.91.1"
PREFERRED_VERSION_clamsmtp ?= "1.8"
-PREFERRED_VERSION_classpath ?= "0.97.1"
-PREFERRED_VERSION_classpath-gtk ?= "0.97.1"
-PREFERRED_VERSION_classpath-minimal ?= "0.97.1"
-PREFERRED_VERSION_classpath-native ?= "0.97.1"
+PREFERRED_VERSION_classpath ?= "0.97.2"
+PREFERRED_VERSION_classpath-gtk ?= "0.97.2"
+PREFERRED_VERSION_classpath-minimal ?= "0.97.2"
+PREFERRED_VERSION_classpath-native ?= "0.96.1"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"
PREFERRED_VERSION_cmake-native ?= "2.4.7"
@@ -201,8 +201,8 @@ PREFERRED_VERSION_ctorrent ?= "1.3.4"
PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
PREFERRED_VERSION_cumulus ?= "1.2.1"
PREFERRED_VERSION_cups ?= "1.2.12"
-PREFERRED_VERSION_curl ?= "7.16.4"
-PREFERRED_VERSION_curl-native ?= "7.16.4"
+PREFERRED_VERSION_curl ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.0"
PREFERRED_VERSION_custominput ?= "1.1.0"
PREFERRED_VERSION_cvs ?= "1.12.9"
PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -221,6 +221,7 @@ PREFERRED_VERSION_dbench ?= "4.0"
PREFERRED_VERSION_dbh ?= "1.0-18"
PREFERRED_VERSION_db-native ?= "4.3.29"
PREFERRED_VERSION_dbus ?= "1.2.1"
+PREFERRED_VERSION_dbus-native ?= "1.2.1"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
PREFERRED_VERSION_dbus-native ?= "1.0.3"
@@ -272,7 +273,7 @@ PREFERRED_VERSION_dpkg ?= "1.13.25"
PREFERRED_VERSION_dpkg-native ?= "1.13.25"
PREFERRED_VERSION_driftnet ?= "0.1.6"
PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
-PREFERRED_VERSION_dropbear ?= "0.49"
+PREFERRED_VERSION_dropbear ?= "0.51"
PREFERRED_VERSION_dsniff ?= "2.3"
PREFERRED_VERSION_duma ?= "2.5.7"
PREFERRED_VERSION_dvb-image ?= "1.0"
@@ -465,7 +466,7 @@ PREFERRED_VERSION_gkrellm ?= "2.2.10"
PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
-PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
PREFERRED_VERSION_glibc ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_glibmm ?= "2.12.10"
@@ -476,9 +477,9 @@ PREFERRED_VERSION_glrr ?= "20050529"
PREFERRED_VERSION_glrr-widgets ?= "20050529"
PREFERRED_VERSION_glurp ?= "0.11.3"
PREFERRED_VERSION_gmailfs ?= "0.7.3"
-PREFERRED_VERSION_gmp ?= "4.2.1"
+PREFERRED_VERSION_gmp ?= "4.2.2"
PREFERRED_VERSION_gmpc ?= "0.13.0"
-PREFERRED_VERSION_gmp-native ?= "4.2.1"
+PREFERRED_VERSION_gmp-native ?= "4.2.2"
PREFERRED_VERSION_gnash ?= "0.8.2"
PREFERRED_VERSION_gnocky ?= "0.0.3"
PREFERRED_VERSION_gnokii ?= "0.6.14"
@@ -606,7 +607,7 @@ PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
PREFERRED_VERSION_gspcav1 ?= "20070110"
PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2"
PREFERRED_VERSION_gst-meta-base ?= "0.10"
-PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.4"
+PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7"
PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6"
PREFERRED_VERSION_gst-plugins-base ?= "0.10.17"
PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1"
@@ -1226,16 +1227,28 @@ PREFERRED_VERSION_microcom ?= "1.02"
PREFERRED_VERSION_micro-emacs ?= "20060909"
PREFERRED_VERSION_microwindows ?= "0.90"
PREFERRED_VERSION_midori ?= "0.0.17"
-PREFERRED_VERSION_midpath ?= "0.1"
-PREFERRED_VERSION_midpath-alsa ?= "0.1"
-PREFERRED_VERSION_midpath-cldc ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-native ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-sdl ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-x11 ?= "0.1"
-PREFERRED_VERSION_midpath-gtk ?= "0.1"
-PREFERRED_VERSION_midpath-qt3x11 ?= "0.1"
-PREFERRED_VERSION_midpath-qte ?= "0.1"
-PREFERRED_VERSION_midpath-test ?= "0.1"
+PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc1"
PREFERRED_VERSION_mikmod ?= "3.2.2-beta1"
PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814"
PREFERRED_VERSION_militaryalphabet ?= "0.2.1"
@@ -1296,7 +1309,7 @@ PREFERRED_VERSION_mythfront-config ?= "1.10"
PREFERRED_VERSION_mythfront-session ?= "1.5"
PREFERRED_VERSION_nabi ?= "0.17"
PREFERRED_VERSION_nail ?= "11.21"
-PREFERRED_VERSION_nano ?= "2.0.6"
+PREFERRED_VERSION_nano ?= "2.0.7"
PREFERRED_VERSION_nasm-native ?= "0.98.38"
PREFERRED_VERSION_nautilus ?= "2.12.2"
PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
@@ -1344,7 +1357,6 @@ PREFERRED_VERSION_obexpush ?= "1.0.0"
PREFERRED_VERSION_obexpush-native ?= "1.0.0"
PREFERRED_VERSION_octave ?= "2.1.73"
PREFERRED_VERSION_offlineimap ?= "4.0.14"
-PREFERRED_VERSION_olsr ?= "0.3-1"
PREFERRED_VERSION_olsrd ?= "0.5.3"
PREFERRED_VERSION_omext ?= "0.2"
PREFERRED_VERSION_omniorb ?= "4.0.7"
@@ -1368,6 +1380,8 @@ PREFERRED_VERSION_openssl-native ?= "0.9.7g"
PREFERRED_VERSION_openswan ?= "2.4.7"
PREFERRED_VERSION_openttd ?= "0.4.0.1"
PREFERRED_VERSION_openvpn ?= "2.0.9"
+SRCREV_pn-opkg-native ?= "4488"
+SRCREV_pn-opkg ?= "4488"
PREFERRED_VERSION_oplinux-packages ?= "1.0"
PREFERRED_VERSION_oprofile ?= "0.9.3"
PREFERRED_VERSION_orage ?= "4.4.1"
@@ -1475,7 +1489,7 @@ PREFERRED_VERSION_proj-4-native ?= "4.9"
PREFERRED_VERSION_psmisc ?= "22.2"
PREFERRED_VERSION_psplash-zap ?= "1.0"
PREFERRED_VERSION_pth ?= "2.0.2"
-PREFERRED_VERSION_pulseaudio ?= "0.9.9"
+PREFERRED_VERSION_pulseaudio ?= "0.9.10"
PREFERRED_VERSION_puppy ?= "1.11"
PREFERRED_VERSION_puzz-le ?= "2.0.0"
PREFERRED_VERSION_puzzles ?= "r7436"
@@ -1499,7 +1513,7 @@ PREFERRED_VERSION_python-fpconst ?= "0.6.0"
PREFERRED_VERSION_python-gammu ?= "0.24"
PREFERRED_VERSION_python-gmpy ?= "1.0.1"
PREFERRED_VERSION_python-gnosis ?= "1.2.2"
-PREFERRED_VERSION_python-gst ?= "0.10.8"
+PREFERRED_VERSION_python-gst ?= "0.10.10"
PREFERRED_VERSION_python-hmm ?= "0.4"
PREFERRED_VERSION_python-imaging ?= "1.1.6"
PREFERRED_VERSION_python-imdbpy ?= "3.1"
@@ -1527,8 +1541,8 @@ PREFERRED_VERSION_python-pyfits ?= "1.1"
PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
PREFERRED_VERSION_python-pygame ?= "1.7.1"
PREFERRED_VERSION_python-pygnome ?= "2.16.2"
-PREFERRED_VERSION_python-pygobject ?= "2.12.3"
-PREFERRED_VERSION_python-pygobject-native ?= "2.12.3"
+PREFERRED_VERSION_python-pygobject ?= "2.14.2"
+PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
PREFERRED_VERSION_python-pygoogle ?= "0.6"
PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
PREFERRED_VERSION_python-pygtk ?= "2.10.4"
@@ -1879,7 +1893,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
PREFERRED_VERSION_u-boot ?= "1.2.0"
PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "118"
+PREFERRED_VERSION_udev ?= "115"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
PREFERRED_VERSION_ufraw ?= "0.12"
@@ -1958,9 +1972,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
PREFERRED_VERSION_wmctrl ?= "1.07"
PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
-PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
-PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.10"
PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
PREFERRED_VERSION_wrt-init ?= "1.0"
PREFERRED_VERSION_wrt-utils ?= "1.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index d81067302e..d6cdc13d5d 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -40,58 +40,60 @@ PREFERRED_VERSION_bdftopcf ?= "1.0.1"
PREFERRED_VERSION_beforelight ?= "1.0.3"
PREFERRED_VERSION_bitmap ?= "1.0.3"
PREFERRED_VERSION_editres ?= "1.0.3"
-PREFERRED_VERSION_fontosfnt ?= "1.0.3"
-PREFERRED_VERSION_fslsfonts ?= "1.0.1"
-PREFERRED_VERSION_fstobdf ?= "1.0.2"
+PREFERRED_VERSION_fontosfnt ?= "1.0.4"
+PREFERRED_VERSION_fslsfonts ?= "1.0.2"
+PREFERRED_VERSION_fstobdf ?= "1.0.3"
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.3"
-PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
-PREFERRED_VERSION_mkfontdir ?= "1.0.3"
-PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
+PREFERRED_VERSION_mkfontdir ?= "1.0.4"
+PREFERRED_VERSION_mkfontscale ?= "1.0.5"
PREFERRED_VERSION_oclock ?= "1.0.1"
PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.3"
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_showfont ?= "1.0.2"
PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_twm ?= "1.0.4"
PREFERRED_VERSION_viewres ?= "1.0.1"
-PREFERRED_VERSION_x11perf ?= "1.4.1"
-PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_x11perf ?= "1.5"
+PREFERRED_VERSION_xauth ?= "1.0.3"
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_xcompmgr ?= "1.1.4"
PREFERRED_VERSION_xcmsdb ?= "1.0.1"
PREFERRED_VERSION_xconsole ?= "1.0.3"
PREFERRED_VERSION_xcursorgen ?= "1.0.2"
PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.6"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xdm ?= "1.1.8"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
PREFERRED_VERSION_xdriinfo ?= "1.0.2"
PREFERRED_VERSION_xedit ?= "1.0.2"
-PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.3"
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.2"
-PREFERRED_VERSION_xfs ?= "1.0.5"
-PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfs ?= "1.0.8"
+PREFERRED_VERSION_xfsinfo ?= "1.0.2"
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.7"
+PREFERRED_VERSION_xinit ?= "1.0.9"
PREFERRED_VERSION_xinput ?= "1.3.0"
-PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbcomp ?= "1.0.5"
PREFERRED_VERSION_xkbevd ?= "1.0.2"
PREFERRED_VERSION_xkbprint ?= "1.0.1"
PREFERRED_VERSION_xkbutils ?= "1.0.1"
@@ -111,12 +113,12 @@ PREFERRED_VERSION_xphelloworld ?= "1.0.1"
PREFERRED_VERSION_xplsprinters ?= "1.0.1"
PREFERRED_VERSION_xpr ?= "1.0.2"
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_xprop ?= "1.0.4"
+PREFERRED_VERSION_xrandr ?= "1.2.3"
+PREFERRED_VERSION_xrdb ?= "1.0.5"
PREFERRED_VERSION_xrefresh ?= "1.0.2"
PREFERRED_VERSION_xrx ?= "1.0.1"
-PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xset ?= "1.0.4"
PREFERRED_VERSION_xsetmode ?= "1.0.0"
PREFERRED_VERSION_xsetpointer ?= "1.0.1"
PREFERRED_VERSION_xsetroot ?= "1.0.2"
@@ -139,62 +141,63 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
# driver
PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0"
-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-digitaledge ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.99.4"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.3.0"
PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
-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-apm ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
PREFERRED_VERSION_xf86-video-ati ?= "6.8.0"
-PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
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-dummy ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.9.0"
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-glint ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
PREFERRED_VERSION_xf86-video-intel ?= "2.2.1"
PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
-PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.7"
-PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0"
-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.4"
-PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.9"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
@@ -202,32 +205,35 @@ 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-tdfx ?= "1.4.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-trident ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.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.15.2"
-PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.1"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
# font
PREFERRED_VERSION_encodings ?= "1.0.2"
PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
PREFERRED_VERSION_font-util-native ?= "1.0.1"
PREFERRED_VERSION_font-util ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
# lib
PREFERRED_VERSION_diet-x11 ?= "1.1.3"
PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfs ?= "1.0.1"
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 ?= "1.1.4"
PREFERRED_VERSION_libx11-native ?= "1.1.1"
PREFERRED_VERSION_libxau ?= "1.0.3"
PREFERRED_VERSION_libxaw ?= "1.0.4"
@@ -239,46 +245,49 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2"
PREFERRED_VERSION_libxevie ?= "1.0.2"
PREFERRED_VERSION_libxext ?= "1.0.4"
PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfont ?= "1.3.2"
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_libxinerama ?= "1.0.3"
+PREFERRED_VERSION_libxkbfile ?= "1.0.5"
PREFERRED_VERSION_libxkbui ?= "1.0.2"
PREFERRED_VERSION_libxmu ?= "1.0.4"
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_libxscrnsaver ?= "1.1.3"
PREFERRED_VERSION_libxt ?= "1.0.5"
PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxv ?= "1.0.4"
PREFERRED_VERSION_libxvmc ?= "1.0.4"
PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_xtrans ?= "1.0.4"
+PREFERRED_VERSION_pixman ?= "0.10.0"
+PREFERRED_VERSION_xtrans ?= "1.2"
# proto
PREFERRED_VERSION_compositeproto ?= "0.4"
PREFERRED_VERSION_damageproto ?= "1.1.0"
PREFERRED_VERSION_fixesproto ?= "4.0"
PREFERRED_VERSION_glproto ?= "1.4.9"
-PREFERRED_VERSION_inputproto ?= "1.4.2.1"
+PREFERRED_VERSION_inputproto ?= "1.4.3"
PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_printproto ?= "1.0.4"
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.11"
-PREFERRED_VERSION_xproto ?= "7.0.11"
+PREFERRED_VERSION_xproto-native ?= "7.0.12"
+PREFERRED_VERSION_xproto ?= "7.0.12"
# 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_util-macros-native ?= "1.1.6"
+PREFERRED_VERSION_util-macros ?= "1.1.6"
PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
# xserver
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 835bfadabe..10a0330f17 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE ?= "20080518"
+EFL_SRCDATE ?= "20080610"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -139,7 +139,7 @@ SRCDATE_mpd ?= "20070210"
SRCDATE_mystun-server ?= "20060814"
SRCDATE_olsrd ?= "20060814"
SRCDATE_opencvs ?= "20060814"
-SRCDATE_oprofile ?= "20061011"
+SRCDATE_oprofile ?= "20080210"
SRCDATE_portaudio ?= "20060814"
SRCDATE_putty ?= "20060814"
SRCDATE_python-cairo ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2e6a2bbc5f..f60c218772 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -12,6 +12,7 @@
# you know what that means? like... a, b, c, d, e, f, g...
SRCREV_pn-aircrack-ng ?= "802"
+SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
SRCREV_pn-assassin ?= "93"
SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-uclibc ?= "21996"
@@ -31,16 +32,19 @@ SRCREV_pn-enlazar ?= "37"
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
SRCREV_pn-exalt-module ?= "78"
+SRCREV_pn-ezx-boot-usb-native = "2186"
SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffmpeg ?= "12186"
+SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
@@ -76,12 +80,13 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeyterm ?= "7b91951addfd51850a23c23ad8ba7f853c4d3416;hb=7b91951addfd51850a23c23ad8ba7f853c4d3416"
+SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "26455"
+SRCREV_pn-mplayer ?= "27047"
SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-multitap-pad ?= "373"
+SRCREV_pn-navit ?= "1096"
SRCREV_pn-neod ?= "4336"
SRCREV_pn-netsurf ?= "3859"
SRCREV_pn-networkmanager ?= "3202"
@@ -139,7 +144,7 @@ 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 ?= "398"
+SRCREV_pn-openmoko-tasks2 ?= "399"
SRCREV_pn-openmoko-terminal2 ?= "4039"
SRCREV_pn-openmoko-theme-standard ?= "4167"
SRCREV_pn-openmoko-theme-standard-qvga ?= "4167"
@@ -152,16 +157,18 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4247"
-SRCREV_pn-opkg-native ?= "4247"
-SRCREV_pn-opkg-sdk ?= "4247"
-SRCREV_pn-oprofileui ?= "160"
-SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6"
+SRCREV_pn-opkg ?= "4488"
+SRCREV_pn-opkg-native ?= "4452"
+SRCREV_pn-opkg-sdk ?= "4488"
+SRCREV_pn-oprofileui ?= "173"
+SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
-SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
-SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6"
-SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e"
+SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
+SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
+SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
+SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
+SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
@@ -169,7 +176,7 @@ SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
+SRCREV_pn-python-pyrtc = "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
@@ -183,6 +190,8 @@ SRCREV_pn-webkit-gtk ?= "32839"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
+SRCREV_pn-wlan-ng-modules ?= "1859"
+SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"
+SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3acc8b2bc2..8661e5b065 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,5 +166,8 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+PREFERRED_PROVIDER_avahi ?= "avahi"
+PREFERRED_PROVIDER_gconf ?= "gconf"
+
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 1f2356e734..d76a9c444f 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Generic uClibC
-#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration
+#@NAME: Minimal uClibC
+#@DESCRIPTION: uClibC Embedded Linux Distribution Configuration (minimal)
#
#@COMMENT: This distribution configuration serves as a starting point for
#@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -13,7 +13,7 @@ require conf/distro/generic.conf
#
# Header
#
-DISTRO_NAME = "generic-uClibC"
+DISTRO_NAME = "minimal-uclibc"
#
# Target OS & FPU system
diff --git a/conf/distro/generic.conf b/conf/distro/minimal.conf
index d67be1d738..b54b0c8c8b 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/minimal.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Generic
-#@DESCRIPTION: Generic Embedded Linux Distribution Configuration
+#@NAME: Minimal
+#@DESCRIPTION: Embedded Linux Distribution Configuration (minimal)
#
#@COMMENT: This distribution configuration serves as a starting point for
#@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -11,7 +11,7 @@
#
# Header
#
-DISTRO_NAME = "generic-glibc"
+DISTRO_NAME = "minimal-glibc"
DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
@@ -80,3 +80,4 @@ require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index d7a3b98f6e..75d9a9756a 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -62,6 +62,7 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
PREFERRED_PROVIDER_classpath = "classpath"
PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+PREFERRED_PROVIDER_midpath = "midpath-openmoko"
# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 00:00:42 +0000