summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-11-06 10:15:27 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2009-11-06 10:15:27 +0100
commit44b9190fb62a6a09276c765685cc8ddde9cb201f (patch)
treeac61baa4cf259e02de0ce8f1c7b76b3713f2e257 /conf/distro
parentc994c0a4526e8d7a16fecaceffde4f42ed1f45ff (diff)
parent35cc93da885ac6d438da6aaed9517e91d4a7e6b3 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 1429fa0d65..5f6ef768ad 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -167,6 +167,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
PREFERRED_PROVIDER_bluez-libs = "bluez4"
PREFERRED_PROVIDER_bluez-utils = "bluez4"
PREFERRED_PROVIDER_util-linux = "util-linux-ng"
+# The default is too old for linux-libc-headers-2.6.31:
+PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789"
ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"