From 7a6baf02617d1edced4eaff235e73d746e2a3b68 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 26 Feb 2016 17:55:20 +0000 Subject: providers: Fix PREFERRED_VERSION lookup for '_' in PN PN can contain '_', e.g. gcc-cross-x86_64 and an override cannot hence we do this manually rather than use OVERRIDES. Signed-off-by: Richard Purdie --- lib/bb/providers.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/bb/providers.py') diff --git a/lib/bb/providers.py b/lib/bb/providers.py index 68c8d592d..ffa532cff 100644 --- a/lib/bb/providers.py +++ b/lib/bb/providers.py @@ -121,11 +121,14 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): preferred_file = None preferred_ver = None - localdata = data.createCopy(cfgData) - localdata.setVar('OVERRIDES', "%s:pn-%s:%s" % (data.getVar('OVERRIDES', localdata), pn, pn)) - bb.data.update_data(localdata) + # pn can contain '_', e.g. gcc-cross-x86_64 and an override cannot + # hence we do this manually rather than use OVERRIDES + preferred_v = cfgData.getVar("PREFERRED_VERSION_pn-%s" % pn, True) + if not preferred_v: + preferred_v = cfgData.getVar("PREFERRED_VERSION_%s" % pn, True) + if not preferred_v: + preferred_v = cfgData.getVar("PREFERRED_VERSION", True) - preferred_v = localdata.getVar('PREFERRED_VERSION', True) if preferred_v: m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) if m: -- cgit 1.2.3-korg