[OE-core] [PATCH 26/26] distrodata.bbclass: drop the manual upstream version check logic
Alexander Kanavin
alexander.kanavin at linux.intel.com
Thu Jul 30 13:31:55 UTC 2015
It's already taken care of in meta/lib/oe/recipeutils.py
Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
---
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 d33187b..7cb7736 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -347,23 +347,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"))
@@ -372,7 +355,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)
--
2.1.4
More information about the Openembedded-core
mailing list