aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-27 08:12:18 -0700
committerTom Rini <tom_rini@mentor.com>2011-03-27 08:12:18 -0700
commit71a1b6b9d62842cc032575631c85637a1e2ef365 (patch)
tree95cdc31e097b164f64f818eed435c37c37284a16 /conf
parent10a58fa72aa22fa35d93c767ac56334661c70a75 (diff)
parent270ae8757d7a25c148e6f66acdbf155982e27c2f (diff)
downloadopenembedded-71a1b6b9d62842cc032575631c85637a1e2ef365.tar.gz
openembedded-71a1b6b9d62842cc032575631c85637a1e2ef365.tar.bz2
openembedded-71a1b6b9d62842cc032575631c85637a1e2ef365.zip
Merge branch '2011.03-maintenance-pr7' of git://dominion.thruhere.net/var/cache/git/openembedded into 2011.03-maintenance
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/shr.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 59ad0be135..415e44961c 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -53,7 +53,6 @@ INHERIT += "recipe_sanity"
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"
ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
-ANGSTROM_BLACKLIST_pn-libnl = "libnld has been replaced by libnl2"
ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script"
ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script"
ANGSTROM_BLACKLIST_pn-qt4-x11-free-gles = "qt4-x11-free is fine even without gles"
@@ -79,7 +78,6 @@ ANGSTROM_BLACKLIST_pn-linux-jlime-current = "strange kernel, spank maintainer"
ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintainer"
ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer"
-
CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
#The shr-mirrors.bbclass repleaces this