From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
Date: Sun, 03 May 2015 11:37:42 +0100 [thread overview]
Message-ID: <1430649462.18360.93.camel@linuxfoundation.org> (raw)
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c6494e3..d19d9e1 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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":
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f544a71..8653a7f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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}"
next reply other threads:[~2015-05-03 10:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-03 10:37 Richard Purdie [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-04 11:26 [PATCH] bitbake.conf/base.bbclass: Drop PRINC support Richard Purdie
2014-11-04 12:08 ` Gary Thomas
2014-11-04 12:12 ` Otavio Salvador
2014-11-04 13:24 ` Richard Purdie
2014-11-04 15:32 ` Otavio Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430649462.18360.93.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.