diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-07-16 16:31:21 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-07-16 16:31:21 +0200 |
| commit | dd6ca0445dbd8bc9804c6c7ece7f84a235e17cf9 (patch) | |
| tree | 14eedacfd0ac11f6039af04aba02f15edfc6ece4 /conf | |
| parent | 2dff7b788dc52c5da3fd2c5863dfad857a7d1710 (diff) | |
| parent | b0ee2783b35fd328ba73ac92cdbee49afdb6dcdc (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -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" |