diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-03 11:37:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-05 22:15:17 +0100 |
commit | eb4306e4b2739efdd1e34af89f36546fa0c6c834 (patch) | |
tree | 1771d37b8c03cf4cf7ec45676f5212d1528f2bc4 | |
parent | f841526801de853c651219f755bcf684e2a3e024 (diff) | |
download | poky-eb4306e4b2739efdd1e34af89f36546fa0c6c834.tar.gz |
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>
-rw-r--r-- | meta/classes/base.bbclass | 16 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c6494e3cea..d19d9e1d99 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -394,22 +394,6 @@ python () { | |||
394 | else: | 394 | else: |
395 | appendVar('EXTRA_OECONF', extraconf) | 395 | appendVar('EXTRA_OECONF', extraconf) |
396 | 396 | ||
397 | # If PRINC is set, try and increase the PR value by the amount specified | ||
398 | # The PR server is now the preferred way to handle PR changes based on | ||
399 | # the checksum of the recipe (including bbappend). The PRINC is now | ||
400 | # obsolete. Return a warning to the user. | ||
401 | princ = d.getVar('PRINC', True) | ||
402 | if princ and princ != "0": | ||
403 | 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))) | ||
404 | pr = d.getVar('PR', True) | ||
405 | pr_prefix = re.search("\D+",pr) | ||
406 | prval = re.search("\d+",pr) | ||
407 | if pr_prefix is None or prval is None: | ||
408 | bb.error("Unable to analyse format of PR variable: %s" % pr) | ||
409 | nval = int(prval.group(0)) + int(princ) | ||
410 | pr = pr_prefix.group(0) + str(nval) + pr[prval.end():] | ||
411 | d.setVar('PR', pr) | ||
412 | |||
413 | pn = d.getVar('PN', True) | 397 | pn = d.getVar('PN', True) |
414 | license = d.getVar('LICENSE', True) | 398 | license = d.getVar('LICENSE', True) |
415 | if license == "INVALID": | 399 | if license == "INVALID": |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f544a71d17..8653a7f3a9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -182,7 +182,6 @@ ASSUME_PROVIDED = "\ | |||
182 | PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}" | 182 | PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}" |
183 | PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}" | 183 | PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}" |
184 | PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}" | 184 | PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}" |
185 | PRINC ?= "0" | ||
186 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" | 185 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" |
187 | EXTENDPE = "${@['','${PE\x7d_'][int(d.getVar('PE',1) or 0) > 0]}" | 186 | EXTENDPE = "${@['','${PE\x7d_'][int(d.getVar('PE',1) or 0) > 0]}" |
188 | P = "${PN}-${PV}" | 187 | P = "${PN}-${PV}" |