[oe-commits] Martin Jansa : shr: few more preferred providers for task-shr-feed, add testlab

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 565f3559ef9e53e32ca37f252fb94c1da6be0b11
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=565f3559ef9e53e32ca37f252fb94c1da6be0b11

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov  5 12:32:56 2009 +0100

shr: few more preferred providers for task-shr-feed, add testlab

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/distro/shr.conf |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 0d76338..01f45df 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -43,6 +43,8 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 # We only want to build UTF8 locales
 LOCALE_UTF8_ONLY = "1"
 
+INHERIT += "testlab"
+
 CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
 
 PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
@@ -79,6 +81,12 @@ PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
 PREFERRED_PROVIDER_libfribidi = "fribidi"
 PREFERRED_PROVIDER_bluez-libs = "bluez4"
 PREFERRED_PROVIDER_bluez-utils = "bluez4"
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/gail = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
 
 # Helper to say what image we built
 SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"