diff options
| author | Philip Balister <philip@balister.org> | 2009-07-19 16:22:23 -0400 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2009-07-19 16:22:23 -0400 |
| commit | 6568b9e34d43470336d0240fa8dbfc5122a9474e (patch) | |
| tree | 72392c0a276bde79fe4991b60081738d6e843f68 /conf/distro | |
| parent | ff4bd21194d38ee0b9f6892e3cae5ffc34504cad (diff) | |
| parent | 918aa5c5a17a342eaafad143cdc0ccff059e5884 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 470c31a788..9b1968f343 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -160,6 +160,9 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" PREFERRED_PROVIDER_bluez-libs = "bluez4" PREFERRED_PROVIDER_bluez-utils = "bluez4" +ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez3 has been replace by bluez4" +ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez3 has been replace by bluez4" + # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index a40fe5fbc8..669c8ada3c 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -70,6 +70,9 @@ INHERIT += "debian" #activate config checker INHERIT += "sanity" +#activate the blacklister +INHERIT += "angstrom" + #make devshell available as task INHERIT += "devshell" |