From f7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 Jul 2015 19:42:52 +0300 Subject: distrodata.bbclass: drop the manual upstream version check logic It's already taken care of in meta/lib/oe/recipeutils.py Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/classes/distrodata.bbclass | 19 +------------------ 1 file changed, 1 insertion(+), 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() { elif cmp == 0: pstatus = "MATCH" - """Read from manual distro tracking fields as alternative""" - pmver = d.getVar("RECIPE_UPSTREAM_VERSION", True) - if not pmver: - pmver = "N/A" - pmstatus = "ErrNoRecipeData" - else: - mpv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pmver, uri_type) - upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type) - - cmp = vercmp_string(mpv, upv) - if cmp == -1: - pmstatus = "UPDATE" - elif cmp == 0: - pmstatus = "MATCH" - else: - pmstatus = "" - psrcuri = psrcuri.split()[0] pdepends = "".join(pdepends.split("\t")) pdesc = "".join(pdesc.split("\t")) @@ -375,7 +358,7 @@ python do_checkpkg() { with open(logfile, "a") as f: writer = csv.writer(f, delimiter='\t') writer.writerow([pname, pversion, pupver, plicense, psection, phome, - prelease, pdepends, pbugtracker, ppe, pdesc, pstatus, pmver, + prelease, pdepends, pbugtracker, ppe, pdesc, pstatus, pupver, psrcuri, maintainer, no_upgr_reason]) f.close() bb.utils.unlockfile(lf) -- cgit 1.2.3-korg