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 | |
| parent | e326b03394b70ba3853c7b0a6e285ad4096e6f22 (diff) | |
shr: update config from SHR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 7 | ||||
| -rw-r--r-- | conf/distro/shr.conf | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 769ec7c4c7..a2d1992706 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -1,5 +1,6 @@ # Upgraded # use newer version then preferred by default +PREFERRED_VERSION_boost ?= "1.40.0" PREFERRED_VERSION_dbus ?= "1.3.0" PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" @@ -11,6 +12,7 @@ PREFERRED_VERSION_strace ?= "4.5.15" PREFERRED_VERSION_linux-libc-headers = "2.6.29" # upgrades used in Angstrom +PREFERRED_VERSION_pixman = "0.17.1" PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libtool = "2.2.6a" @@ -25,8 +27,3 @@ UDEV_GE_141 = "1" # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py PREFERRED_VERSION_python-pygtk ?= "2.10.4" -PREFERRED_VERSION_gpe-gallery ?= "0.97" -PREFERRED_VERSION_boost ?= "1.33.1" -PREFERRED_VERSION_man-pages ?= "2.41" -PREFERRED_VERSION_xchat ?= "2.8.4" -PREFERRED_VERSION_x11vnc ?= "0.9.3" 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" |