[OE-core] [PATCH RFC] bitbake.conf/base.bbclass: Drop PRINC support
Martin Jansa
martin.jansa at gmail.com
Mon Mar 3 11:52:38 UTC 2014
On Sun, Mar 02, 2014 at 05:39:21PM +0000, Richard Purdie wrote:
> PRINC is no longer needed since we have the PR service instead
> which people should be using. Drop the PRINC code.
Many layers are still using it and there wasn't enough of PV bumps to
remove them :(.
> 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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140303/94049d6c/attachment-0002.sig>
More information about the Openembedded-core
mailing list