* [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
@ 2015-05-03 10:37 Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2015-05-03 10:37 UTC (permalink / raw)
To: openembedded-core
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 and then an error for quite some
time so we can remove it now.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c6494e3..d19d9e1 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -394,22 +394,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.error("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 f544a71..8653a7f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -182,7 +182,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}"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
@ 2014-11-04 11:26 Richard Purdie
2014-11-04 12:08 ` Gary Thomas
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2014-11-04 11:26 UTC (permalink / raw)
To: openembedded-core
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@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}"
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
2014-11-04 11:26 Richard Purdie
@ 2014-11-04 12:08 ` Gary Thomas
2014-11-04 12:12 ` Otavio Salvador
0 siblings, 1 reply; 6+ messages in thread
From: Gary Thomas @ 2014-11-04 12:08 UTC (permalink / raw)
To: openembedded-core
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@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
------------------------------------------------------------
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
2014-11-04 12:08 ` Gary Thomas
@ 2014-11-04 12:12 ` Otavio Salvador
2014-11-04 13:24 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Otavio Salvador @ 2014-11-04 12:12 UTC (permalink / raw)
To: Gary Thomas; +Cc: Patches and discussions about the oe-core layer
On Tue, Nov 4, 2014 at 10:08 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> 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).
I agree with Gary, move this to ERROR now and drop in 1.9.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
2014-11-04 12:12 ` Otavio Salvador
@ 2014-11-04 13:24 ` Richard Purdie
2014-11-04 15:32 ` Otavio Salvador
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2014-11-04 13:24 UTC (permalink / raw)
To: Otavio Salvador
Cc: Gary Thomas, Patches and discussions about the oe-core layer
On Tue, 2014-11-04 at 10:12 -0200, Otavio Salvador wrote:
> On Tue, Nov 4, 2014 at 10:08 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> > 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).
>
> I agree with Gary, move this to ERROR now and drop in 1.9.
Its been printing warnings since May 2013. I tried to merge this 6
months ago, I was told to wait another release, by you:
http://lists.openembedded.org/pipermail/openembedded-core/2014-March/090169.html
Now I need to keep the patch for another 6 months. This really is taking
too long IMO. I may well get bored and just drop the patch (and forget
any other ideas about trying to cleanup things).
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] bitbake.conf/base.bbclass: Drop PRINC support
2014-11-04 13:24 ` Richard Purdie
@ 2014-11-04 15:32 ` Otavio Salvador
0 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2014-11-04 15:32 UTC (permalink / raw)
To: Richard Purdie
Cc: Gary Thomas, Patches and discussions about the oe-core layer
On Tue, Nov 4, 2014 at 11:24 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2014-11-04 at 10:12 -0200, Otavio Salvador wrote:
>> On Tue, Nov 4, 2014 at 10:08 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>> > 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).
>>
>> I agree with Gary, move this to ERROR now and drop in 1.9.
>
> Its been printing warnings since May 2013. I tried to merge this 6
> months ago, I was told to wait another release, by you:
>
> http://lists.openembedded.org/pipermail/openembedded-core/2014-March/090169.html
>
> Now I need to keep the patch for another 6 months. This really is taking
> too long IMO. I may well get bored and just drop the patch (and forget
> any other ideas about trying to cleanup things).
I understand your frustration but I think we ought to be conservative
here. People tend to have old layers around and we risk to those never
get PRINC removed if we don't 'explicit' the error for those users.
I think we ought ERROR now and remove it in 1.9.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-05-03 10:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-03 10:37 [PATCH] bitbake.conf/base.bbclass: Drop PRINC support Richard Purdie
-- strict thread matches above, loose matches on Subject: below --
2014-11-04 11:26 Richard Purdie
2014-11-04 12:08 ` Gary Thomas
2014-11-04 12:12 ` Otavio Salvador
2014-11-04 13:24 ` Richard Purdie
2014-11-04 15:32 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.