aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKlaus Kurzmann <mok@fluxnetz.de>2010-12-04 20:04:14 +0100
committerKlaus Kurzmann <mok@fluxnetz.de>2010-12-04 21:00:16 +0100
commit8ed56c77b914739450bf00394a68dc72cce8818d (patch)
tree2dd25fac366d5c270a83d4d58d395a4fa8f85397 /conf
parentf7b3b6a2878f2869cacb1bb21342ee5226dfc904 (diff)
downloadopenembedded-8ed56c77b914739450bf00394a68dc72cce8818d.tar.gz
glib-2.0: add 2.26 with DEFAULT_PREFERENCE = "-1" and prefer it for SHR
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/preferred-shr-versions.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 75c31d1262..9942a74774 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -40,8 +40,8 @@ PREFERRED_VERSION_libtool-sdk = "${LIBTOOL_VERSION}"
PREFERRED_VERSION_udev = "151"
PREFERRED_VERSION_usbutils = "0.86"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
-PREFERRED_VERSION_glib-2.0 = "2.24.1"
-PREFERRED_VERSION_glib-2.0-native = "2.24.1"
+PREFERRED_VERSION_glib-2.0 = "2.26.1"
+PREFERRED_VERSION_glib-2.0-native = "2.26.1"
PREFERRED_VERSION_openssl = "1.0.0b"
PREFERRED_VERSION_openssl-native = "1.0.0b"
UDEV_GE_141 = "1"