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.

This has been deprecated with a warning and then an error for quite some
time so we can remove it now.

(From OE-Core rev: a4d530bcf55f03258078c10a123e2717444e1060)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-05-03 11:37:42 +01:00
parent f841526801
commit eb4306e4b2
2 changed files with 0 additions and 17 deletions

View File

@@ -394,22 +394,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.error("Use of PRINC %s 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." % (princ, 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":

View File

@@ -182,7 +182,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}"