diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-09-25 14:41:37 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:58:25 +0100 |
| commit | 10c948a67546dd4ed2ac00b5210ef4b3eeca9401 (patch) | |
| tree | 9748f4a25939b67724f9686942ce75df0acd6dab /meta | |
| parent | ccbb12f9ec7c0a5714a8b1a24efb46755408c256 (diff) | |
| download | openembedded-core-10c948a67546dd4ed2ac00b5210ef4b3eeca9401.tar.gz openembedded-core-10c948a67546dd4ed2ac00b5210ef4b3eeca9401.tar.bz2 openembedded-core-10c948a67546dd4ed2ac00b5210ef4b3eeca9401.zip | |
recipeutils.py: don't hardcode the upstream version as 1.0 when SRC_URI is empty or absent
Instead, simply return the version of the recipe, so that the upstream
version checker will declare that they match.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 35b88d386c..5fd5dcba98 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -732,11 +732,14 @@ def get_recipe_upstream_version(rd): ru['type'] = 'U' ru['datetime'] = '' + pv = rd.getVar('PV', True) + # XXX: If don't have SRC_URI means that don't have upstream sources so - # returns 1.0. + # returns the current recipe version, so that upstream version check + # declares a match. src_uris = rd.getVar('SRC_URI', True) if not src_uris: - ru['version'] = '1.0' + ru['version'] = pv ru['type'] = 'M' ru['datetime'] = datetime.now() return ru @@ -745,8 +748,6 @@ def get_recipe_upstream_version(rd): src_uri = src_uris.split()[0] uri_type, _, _, _, _, _ = decodeurl(src_uri) - pv = rd.getVar('PV', True) - manual_upstream_version = rd.getVar("RECIPE_UPSTREAM_VERSION", True) if manual_upstream_version: # manual tracking of upstream version. |