diff options
| author |   Martin.Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:31:48 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:32:37 +0100 |
| commit | 2263b51333532bb8cdbbf24708aaecd4d5167c38 (patch) | |
| tree | f051a841e0d682e0be04136b5d29252a19621ee7 /conf/distro/shr.conf | |
| parent | e326b03394b70ba3853c7b0a6e285ad4096e6f22 (diff) | |
| download | openembedded-2263b51333532bb8cdbbf24708aaecd4d5167c38.tar.gz | |
shr: update config from SHR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/distro/shr.conf')
| -rw-r--r-- | 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 e45fc07334..1da9b36bb2 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -39,8 +39,15 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales LOCALE_UTF8_ONLY = "1" +#save statistical info on images INHERIT += "testlab" +#activate the angstrom blacklister +INHERIT += "angstrom" + +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" + CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" @@ -84,6 +91,7 @@ PREFERRED_PROVIDER_virtual/gail = "gtk+" PREFERRED_PROVIDER_opkg = "opkg" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_atd = "atd-over-fso" +PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" # Helper to say what image we built SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" |