Skip to contentSkip to conversation

Richard Purdie : bitbake.conf/base.bbclass: Drop PRINC support

oe-commits Martin Jansa 1 participant 1 message Apr 19, 2014 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Jansa

author
#1 lore raw
Quoted 26 lines · On Sat, Apr 19, 2014 at 03:29:36PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master-next
Commit: 2f157327963df245d61897df7a1dd214da4c98fd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2f157327963df245d61897df7a1dd214da4c98fd
Author: Richard Purdie <[email protected]>
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 <[email protected]>

---

 meta/classes/base.bbclass | 16 ----------------
 meta/conf/bitbake.conf    |  1 -
 2 files changed, 17 deletions(-)
meta/classes/base.bbclass +0 -0
index f4f5321..109bbad 100644

meta/classes/base.bbclass python () { · line 462

Quoted 10 lines
meta/classes/base.bbclass +0 -7
@@ -453,22 +453,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 %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)))

Shouldn't this warning stay for next release? People should knowingly remove PRINCs from their layers instead of PR going backwards silently (except qa check when buildhistory is enabled).

Quoted 30 lines
meta/classes/base.bbclass +0 -9
-        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":
meta/conf/bitbake.conf +0 -1
index b3786a7..bcc387c 100644
@@ -190,7 +190,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}"
Signature · 5 lines
-- 
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-commits
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]