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

Mark Hatle mark.hatle at windriver.com
Mon Mar 3 14:59:47 UTC 2014


On 3/2/14, 11:39 AM, Richard Purdie wrote:
> PRINC is no longer needed since we have the PR service instead
> which people should be using. Drop the PRINC code.

Will dropping this support break someone who is moving from a prior version of 
oe-core (i.e. will any of the PRs go backwards?)

--Mark

> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> ---
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 3e9051c..3cbf2cb 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -455,18 +455,6 @@ python () {
>           else:
>               appendVar('EXTRA_OECONF', extraconf)
>
> -    # If PRINC is set, try and increase the PR value by the amount specified
> -    princ = d.getVar('PRINC', True)
> -    if princ and princ != "0":
> -        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 4879aa2..a4a7107 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -188,7 +188,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-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>




More information about the Openembedded-core mailing list