aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-07-27 19:42:52 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 15:35:36 +0100
commitf7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae (patch)
tree2baeeb99c02fd302b71e6b5e9ee00a7edae3eb63
parentc63d1a544a3021a4eee2171fc710e71dfa7e6b07 (diff)
downloadopenembedded-core-contrib-f7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae.tar.gz
openembedded-core-contrib-f7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae.tar.bz2
openembedded-core-contrib-f7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae.zip
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 <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/distrodata.bbclass19
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() {
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)