diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-07-27 19:42:52 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 07:34:08 +0100 |
commit | 4d027f03ccb5facd71a0309b352a571dc1e6a4c6 (patch) | |
tree | 892e7d7090d19c636deaf865eb26518f20cfd43b /meta/classes | |
parent | a1ec19cd9787f7600c8edb538579009f2a49265e (diff) | |
download | poky-4d027f03ccb5facd71a0309b352a571dc1e6a4c6.tar.gz |
distrodata.bbclass: drop the manual upstream version check logic
It's already taken care of in meta/lib/oe/recipeutils.py
(From OE-Core rev: f7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae)
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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/distrodata.bbclass | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index af3af33133..010cdc6a0f 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass | |||
@@ -350,23 +350,6 @@ python do_checkpkg() { | |||
350 | elif cmp == 0: | 350 | elif cmp == 0: |
351 | pstatus = "MATCH" | 351 | pstatus = "MATCH" |
352 | 352 | ||
353 | """Read from manual distro tracking fields as alternative""" | ||
354 | pmver = d.getVar("RECIPE_UPSTREAM_VERSION", True) | ||
355 | if not pmver: | ||
356 | pmver = "N/A" | ||
357 | pmstatus = "ErrNoRecipeData" | ||
358 | else: | ||
359 | mpv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pmver, uri_type) | ||
360 | upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type) | ||
361 | |||
362 | cmp = vercmp_string(mpv, upv) | ||
363 | if cmp == -1: | ||
364 | pmstatus = "UPDATE" | ||
365 | elif cmp == 0: | ||
366 | pmstatus = "MATCH" | ||
367 | else: | ||
368 | pmstatus = "" | ||
369 | |||
370 | psrcuri = psrcuri.split()[0] | 353 | psrcuri = psrcuri.split()[0] |
371 | pdepends = "".join(pdepends.split("\t")) | 354 | pdepends = "".join(pdepends.split("\t")) |
372 | pdesc = "".join(pdesc.split("\t")) | 355 | pdesc = "".join(pdesc.split("\t")) |
@@ -375,7 +358,7 @@ python do_checkpkg() { | |||
375 | with open(logfile, "a") as f: | 358 | with open(logfile, "a") as f: |
376 | writer = csv.writer(f, delimiter='\t') | 359 | writer = csv.writer(f, delimiter='\t') |
377 | writer.writerow([pname, pversion, pupver, plicense, psection, phome, | 360 | writer.writerow([pname, pversion, pupver, plicense, psection, phome, |
378 | prelease, pdepends, pbugtracker, ppe, pdesc, pstatus, pmver, | 361 | prelease, pdepends, pbugtracker, ppe, pdesc, pstatus, pupver, |
379 | psrcuri, maintainer, no_upgr_reason]) | 362 | psrcuri, maintainer, no_upgr_reason]) |
380 | f.close() | 363 | f.close() |
381 | bb.utils.unlockfile(lf) | 364 | bb.utils.unlockfile(lf) |