Update bitbake to use package name as an override when working out PREFERRED_VERSION

git-svn-id: https://svn.o-hand.com/repos/poky@166 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index d327a69ab852f1b26c7a09f064cc9b1a94427172..dac3c93749cfbf29b75acb07afd924354fbfff21 100755 (executable)
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -281,7 +281,11 @@ class BBCooker:
 
         preferred_file = None
 
-        preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, self.configuration.data, 1)
+        localdata = data.createCopy(self.configuration.data)
+        bb.data.setVar('OVERRIDES', "%s:%s" % (pn, data.getVar('OVERRIDES', localdata)), localdata)
+        bb.data.update_data(localdata)
+
+        preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, localdata, 1)
         if preferred_v:
             m = re.match('(.*)_(.*)', preferred_v)
             if m:
@@ -308,6 +312,8 @@ class BBCooker:
             else:
                 bb.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s" % (preferred_file, pv_str, pn))
 
+        del localdata
+
         # get highest priority file set
         files = tmp_pn[0]
         latest = None