From 182e8eec6dd24e0f8e256bfbac704924c7c94a67 Mon Sep 17 00:00:00 2001 From: Stefan Lendl Date: Tue, 27 Nov 2018 14:19:45 +0100 Subject: make PREFERRED_VERSION_openssl* overwritable on sumo defaultsetup.conf and therefore default-versions.inc is sourced pretty late in bitbake.conf. default-versions.inc overwrites previous assignments of PREFERRED_VERSION_openssl. Assigning it with ?= allows other .conf files to assign correctly. in particular assignment in conf/local.conf and machine config is used instead of default. (From OE-Core rev: dc69018e3be64c244b4b97d81f1f1a1e9e552c10) Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-versions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/conf/distro/include/default-versions.inc') diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 868073843a..3d88e8f656 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc @@ -2,6 +2,6 @@ # Default preferred versions # -PREFERRED_VERSION_openssl = "1.0.%" -PREFERRED_VERSION_openssl-native = "1.0.%" -PREFERRED_VERSION_nativesdk-openssl = "1.0.%" +PREFERRED_VERSION_openssl ?= "1.0.%" +PREFERRED_VERSION_openssl-native ?= "1.0.%" +PREFERRED_VERSION_nativesdk-openssl ?= "1.0.%" -- cgit v1.2.3-54-g00ecf