diff options
| author |   Phil Blundell <philb@gnu.org> | 2004-07-26 21:53:09 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-07-26 21:53:09 +0000 |
| commit | 0af273b85c60279570acd5b06784d06d7c8a7d12 (patch) | |
| tree | 11c76af659c355838c6aa04827214759f2acdb37 | |
| parent | 374e997b2adecbe3b969fe63a14d65123972bb46 (diff) | |
| download | bitbake-contrib-0af273b85c60279570acd5b06784d06d7c8a7d12.tar.gz | |
add support for DEFAULT_PREFERENCE when selecting version to build (sorts higher than version)
| -rw-r--r-- | bin/oemake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/oemake b/bin/oemake index 5160fffbc..d28220ebe 100644 --- a/bin/oemake +++ b/bin/oemake @@ -226,17 +226,21 @@ def buildPackage(item): # get highest priority file set files = pkg_pn[pn][0] latest = None + latest_p = 0 latest_f = None for f in files: the_data = make.pkgdata[f] pv = oe.data.getVar('PV', the_data, 1) pr = oe.data.getVar('PR', the_data, 1) - if (latest is None) or (make.vercmp(latest, (pv, pr)) < 0): + dp = int(oe.data.getVar('DEFAULT_PREFERENCE', the_data, 1) or "0") + + if (latest is None) or ((latest_p == dp) and (make.vercmp(latest, (pv, pr)) < 0)) or (dp > latest_p): latest = (pv, pr) latest_f = f + latest_p = dp preferred_file = latest_f preferred_ver = latest - + oe.debug(1, "selecting %s as latest version of provider %s" % (preferred_file, pn)) preferred_versions[pn] = (preferred_ver, preferred_file) |