diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-11-03 18:22:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-11-03 18:22:25 +0000 |
| commit | d910c678defeafa54c27e018922bccfd7bfc11e7 (patch) | |
| tree | 2874edf811909212bc57b74695f0a5825e43fb50 /bitbake | |
| parent | 36223e6101c2f85df759f7772511033be04b5a99 (diff) | |
| download | openembedded-core-d910c678defeafa54c27e018922bccfd7bfc11e7.tar.gz openembedded-core-d910c678defeafa54c27e018922bccfd7bfc11e7.tar.bz2 openembedded-core-d910c678defeafa54c27e018922bccfd7bfc11e7.zip | |
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
Diffstat (limited to 'bitbake')
| -rwxr-xr-x | bitbake/bin/bitbake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index d327a69ab8..dac3c93749 100755 --- 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 |