[oe-commits] Richard Purdie : bitbake.conf/base.bbclass: Drop PRINC support

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e3678fa7effdcee923c4130e5ecb480f97695fc0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e3678fa7effdcee923c4130e5ecb480f97695fc0

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Mar  2 17:39:21 2014 +0000

bitbake.conf/base.bbclass: Drop PRINC support

PRINC is no longer needed since we have the PR service instead
which people should be using. Drop the PRINC code.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/base.bbclass | 16 ----------------
 meta/conf/bitbake.conf    |  1 -
 2 files changed, 17 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 27b5f53..3cbf2cb 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -455,22 +455,6 @@ python () {
         else:
             appendVar('EXTRA_OECONF', extraconf)
 
-    # If PRINC is set, try and increase the PR value by the amount specified
-    # The PR server is now the preferred way to handle PR changes based on
-    # the checksum of the recipe (including bbappend).  The PRINC is now
-    # obsolete.  Return a warning to the user.
-    princ = d.getVar('PRINC', True)
-    if princ and princ != "0":
-        bb.warn("Use of PRINC was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service." % d.getVar("FILE", True))
-        pr = d.getVar('PR', True)
-        pr_prefix = re.search("\D+",pr)
-        prval = re.search("\d+",pr)
-        if pr_prefix is None or prval is None:
-            bb.error("Unable to analyse format of PR variable: %s" % pr)
-        nval = int(prval.group(0)) + int(princ)
-        pr = pr_prefix.group(0) + str(nval) + pr[prval.end():]
-        d.setVar('PR', pr)
-
     pn = d.getVar('PN', True)
     license = d.getVar('LICENSE', True)
     if license == "INVALID":
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4879aa2..a4a7107 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -188,7 +188,6 @@ ASSUME_PROVIDED = "\
 PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}"
 PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}"
 PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}"
-PRINC ?= "0"
 PF = "${PN}-${EXTENDPE}${PV}-${PR}"
 EXTENDPE = "${@['','${PE\x7d_'][int(d.getVar('PE',1) or 0) > 0]}"
 P = "${PN}-${PV}"