[oe-commits] Mike Westerhof : SlugOS: set preferred versions for openssl and openssl-native

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 318dd21d6e354f5b2002de71cc4ab6baa0c9ad4c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=318dd21d6e354f5b2002de71cc4ab6baa0c9ad4c

Author: Mike Westerhof <mwester at dls.net>
Date:   Thu Mar 26 10:32:41 2009 -0500

SlugOS: set preferred versions for openssl and openssl-native
otherwise we get different versions for the two, due to conflicting
DEFAULT_PREFERENCEs being set in the various recipes.

---

 conf/distro/include/preferred-slugos-versions.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 992235a..8c8de40 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -71,3 +71,9 @@ PREFERRED_VERSION_libusb			?= "0.0.0"
 
 # boost 1.36 won't build
 PREFERRED_VERSION_boost				?= "1.33.1"
+
+# We don't really care which openssl and openssl-native we get, but
+# the DEFAULT_PREFERENCE set in the recipes is such that if we don't
+# specify explicitly, we may get mismatched versions.
+PREFERRED_VERSION_openssl			?= "0.9.8j"
+PREFERRED_VERSION_openssl-native		?= "0.9.8j"