* Re: [oe-commits] Richard Purdie : bitbake.conf/base.bbclass: Drop PRINC support
[not found] <20140419152936.AAFAF5028A@opal.openembedded.org>
@ 2014-04-19 16:03 ` Martin Jansa
0 siblings, 0 replies; only message in thread
From: Martin Jansa @ 2014-04-19 16:03 UTC (permalink / raw)
To: openembedded-core; +Cc: openembedded-commits
[-- Attachment #1: Type: text/plain, Size: 3328 bytes --]
On Sat, Apr 19, 2014 at 03:29:36PM +0000, git@git.openembedded.org 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 <richard.purdie@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@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 f4f5321..109bbad 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -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).
> - 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 b3786a7..bcc387c 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -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}"
>
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] only message in thread