summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2009-03-26 10:32:41 -0500
committerMike Westerhof <mwester@dls.net>2009-03-26 10:32:41 -0500
commit318dd21d6e354f5b2002de71cc4ab6baa0c9ad4c (patch)
treec7839c14f4fde20551008229e070adfb93f05110 /conf
parentd3926917500d5f101d18fccd64412f9380dcf60e (diff)
downloadopenembedded-318dd21d6e354f5b2002de71cc4ab6baa0c9ad4c.tar.gz
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.
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc6
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 992235a4b9..8c8de40f9d 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"