summaryrefslogtreecommitdiffstats
path: root/meta/classes/distrodata.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/distrodata.bbclass')
-rw-r--r--meta/classes/distrodata.bbclass23
1 files changed, 18 insertions, 5 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 1774dc035d..aef7973945 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -563,7 +563,10 @@ python do_checkpkg() {
563 chk_uri = src_uri 563 chk_uri = src_uri
564 pdesc = localdata.getVar('DESCRIPTION', True) 564 pdesc = localdata.getVar('DESCRIPTION', True)
565 pgrp = localdata.getVar('SECTION', True) 565 pgrp = localdata.getVar('SECTION', True)
566 pversion = localdata.getVar('PV', True) 566 if localdata.getVar('PRSPV', True):
567 pversion = localdata.getVar('PRSPV', True)
568 else:
569 pversion = localdata.getVar('PV', True)
567 plicense = localdata.getVar('LICENSE', True) 570 plicense = localdata.getVar('LICENSE', True)
568 psection = localdata.getVar('SECTION', True) 571 psection = localdata.getVar('SECTION', True)
569 phome = localdata.getVar('HOMEPAGE', True) 572 phome = localdata.getVar('HOMEPAGE', True)
@@ -590,9 +593,16 @@ python do_checkpkg() {
590 593
591 (type, host, path, user, pswd, parm) = bb.decodeurl(uri) 594 (type, host, path, user, pswd, parm) = bb.decodeurl(uri)
592 if type in ['http', 'https', 'ftp']: 595 if type in ['http', 'https', 'ftp']:
593 pcurver = d.getVar('PV', True) 596 if d.getVar('PRSPV', True):
597 pcurver = d.getVar('PRSPV', True)
598 else:
599 pcurver = d.getVar('PV', True)
594 else: 600 else:
595 pcurver = d.getVar("SRCREV", True) 601 if d.getVar('PRSPV', True):
602 pcurver = d.getVar('PRSPV', True)
603 else:
604 pcurver = d.getVar("SRCREV", True)
605
596 606
597 if type in ['http', 'https', 'ftp']: 607 if type in ['http', 'https', 'ftp']:
598 newver = pcurver 608 newver = pcurver
@@ -614,7 +624,10 @@ python do_checkpkg() {
614 alturi = bb.encodeurl([type, host, altpath, user, pswd, {}]) 624 alturi = bb.encodeurl([type, host, altpath, user, pswd, {}])
615 my_uri = d.getVar('REGEX_URI', True) 625 my_uri = d.getVar('REGEX_URI', True)
616 if my_uri: 626 if my_uri:
617 newver = d.getVar('PV', True) 627 if d.getVar('PRSPV', True):
628 newver = d.getVar('PRSPV', True)
629 else:
630 newver = d.getVar('PV', True)
618 else: 631 else:
619 newver = check_new_dir(alturi, dirver, d) 632 newver = check_new_dir(alturi, dirver, d)
620 altpath = path 633 altpath = path
@@ -736,7 +749,7 @@ python do_checkpkg() {
736 pupver = latest_pv + tmp3.group('git_prefix') + latest_head 749 pupver = latest_pv + tmp3.group('git_prefix') + latest_head
737 else: 750 else:
738 if not tmp3: 751 if not tmp3:
739 bb.plain("#DEBUG# Current version (%s) doesn't match the usual pattern" %pversion) 752 bb.plain("#DEBUG# Package %s: current version (%s) doesn't match the usual pattern" %(pname, pversion))
740 elif type == 'svn': 753 elif type == 'svn':
741 options = [] 754 options = []
742 if user: 755 if user: