[OE-core] [PATCH] bitbake.conf/base.bbclass: Drop PRINC support

[Gary Thomas]

On 2014-11-04 04:26, Richard Purdie wrote:
> 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 for a while so we can remove it
> now.
>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index e1b25ff..b2c4f08 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -369,22 +369,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)))
> -        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 2a8a37f..8842d6b 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -181,7 +181,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}"

Won't this just silently make use of PRINC a no-op?  What about
the users that had their head in the sand for the last few months
but still expect PRINC to have some effect (and maybe don't use
PR server)?  I would think escalating this to an error would make
more sense (and follow other warnings that are now errors).

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------