summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-02-14 09:34:23 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-02-14 09:34:23 +0000
commit2283c29df32fe23efb6bb86d5b993ebb68a218fe (patch)
treef6cd7c32bd2722097ef5bfba288e17fe3c766f7e
parent930c99332ebdc3e41fedd5f5b72b556c3c1c6157 (diff)
parent701f7ac23e9258cfc371495a3c35375c4532ff87 (diff)
merge of '05fe85ad77e7aace526412ed46891996775f2107'
and '9f227060931d6ef3c46ac867c9d5ab6f7ff4c7b8'
-rw-r--r--conf/distro/angstrom-2008.1.conf13
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc8
2 files changed, 12 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 4f950ffff1..b24a57f537 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -22,6 +22,7 @@ DISTRO_REVISION = "1"
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/angstrom-2008-preferred-versions.inc
#Images built can have to modes:
# 'debug': empty rootpassword, strace included
@@ -71,15 +72,9 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
#Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+ = "2.12.3"
-PREFERRED_VERSION_glib-2.0 = "2.14.4"
-PREFERRED_VERSION_pango = "1.18.1"
-
-# prefer newest for speed and fun
-PREFERRED_VERSION_udev = "115"
-
-# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable
-PREFERRED_VERSION_busybox = "1.7.2"
+PREFERRED_VERSION_gtk+ ?= "2.12.3"
+PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
+PREFERRED_VERSION_pango ?= "1.18.1"
PREFERRED_PROVIDER_avahi = "avahi"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
new file mode 100644
index 0000000000..5641c8ee39
--- /dev/null
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -0,0 +1,8 @@
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.10"
+