diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2005-11-03 21:54:43 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2005-11-03 21:54:43 +0000 |
| commit | f8c3971ef43dbf0f774852bec673d60e2923d967 (patch) | |
| tree | b2a0abc3fca60537d5254b0706771a43ef61dab6 /bin | |
| parent | f4aa4d1f2442e226ec4cdf23f2bf322c6fb4128c (diff) | |
| download | bitbake-f8c3971ef43dbf0f774852bec673d60e2923d967.tar.gz | |
bitbake/bin/bitbake
Patch for #436 to fix
CVSDATE = "xxx"
CVSDATE_somepackage = "yyy"
PREFERRED_VERSION_somepackage = "zzz-${CVSDATE}"
results in "zzz-xxx", not the expected and preferred "zzz-yyy".
This is due to PN not being in OVERRIDES at this stage of bitbake operation.
applied RP's patch from http://bugs.openembedded.org/attachment.cgi?id=365&action=view
thanks RP
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/bitbake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/bitbake b/bin/bitbake index d327a69ab..dac3c9374 100755 --- a/bin/bitbake +++ b/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 |