sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 10c948a67546dd4ed2ac00b5210ef4b3eeca9401)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2015-09-25 14:41:37 +03:00 committed by Richard Purdie
parent 320500e38e
commit 5cc44fe4fd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/lib/oe/recipeutils.py
View File

@ -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.