[RFC PATCH] base.bbclass: Deprecate the PRINC logic

[RFC PATCH] base.bbclass: Deprecate the PRINC logic

[Mark Hatle]

Background:

At the recent TSC meeting we were discussing ways of removing the PRINC
in favor of the PR server, which should now be standard.  The first step
in this process is coming up with a simple patch that declared PRINC as
deprecated.  If this type of patch is successful, the block of code could
be replaced with a bb.error eventually.

It is not expected that this patch will go in by itself, but instead
should be coordinated with changes to the recipes in common layers such
as openembedded-core, meta-openembedded/meta-* and other community layers.

The commit message follows:

The PRINC logic is now deprecated, the PR server should be used to handle
the automatic incrementing of the PR (package release) field.

A warning message has been added when princ is defined as anything but '0'.

The default setting of '0' has been retained as some layers use embedded
python to increment the PRINC filed.  This fails if the base PRINC is not
defined.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/base.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index b1642a2..29084a2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -465,8 +465,12 @@ python () {
             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 is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service"
         pr = d.getVar('PR', True)
         pr_prefix = re.search("\D+",pr)
         prval = re.search("\d+",pr)
-- 
1.8.1.2.545.g2f19ada

Re: [RFC PATCH] base.bbclass: Deprecate the PRINC logic

[Richard Purdie]

On Wed, 2013-05-29 at 08:51 -0500, Mark Hatle wrote:
> Background:
> 
> At the recent TSC meeting we were discussing ways of removing the PRINC
> in favor of the PR server, which should now be standard.  The first step
> in this process is coming up with a simple patch that declared PRINC as
> deprecated.  If this type of patch is successful, the block of code could
> be replaced with a bb.error eventually.
> 
> It is not expected that this patch will go in by itself, but instead
> should be coordinated with changes to the recipes in common layers such
> as openembedded-core, meta-openembedded/meta-* and other community layers.
> 
> The commit message follows:
> 
> The PRINC logic is now deprecated, the PR server should be used to handle
> the automatic incrementing of the PR (package release) field.
> 
> A warning message has been added when princ is defined as anything but '0'.
> 
> The default setting of '0' has been retained as some layers use embedded
> python to increment the PRINC filed.  This fails if the base PRINC is not
> defined.
> 
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
>  meta/classes/base.bbclass | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index b1642a2..29084a2 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -465,8 +465,12 @@ python () {
>              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 is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service"

There is a missing ")" here.

Cheers,

Richard

>          pr = d.getVar('PR', True)
>          pr_prefix = re.search("\D+",pr)
>          prval = re.search("\d+",pr)

Re: [RFC PATCH] base.bbclass: Deprecate the PRINC logic

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2643 bytes --]

On Wed, May 29, 2013 at 08:51:36AM -0500, Mark Hatle wrote:
> Background:
> 
> At the recent TSC meeting we were discussing ways of removing the PRINC
> in favor of the PR server, which should now be standard.  The first step
> in this process is coming up with a simple patch that declared PRINC as
> deprecated.  If this type of patch is successful, the block of code could
> be replaced with a bb.error eventually.
> 
> It is not expected that this patch will go in by itself, but instead
> should be coordinated with changes to the recipes in common layers such
> as openembedded-core, meta-openembedded/meta-* and other community layers.

This doesn't say what's the process of getting all PR increments
applied.

Should we send list of recipes and required PR increments per layer (and
someone will sum these increments and create actual PR bump from it). Or
will we take turns and send actual PR bump patches per layer and someone 
will define order of layers to go in (so that we prevent many conflicts 
while merging)?

> The commit message follows:
> 
> The PRINC logic is now deprecated, the PR server should be used to handle
> the automatic incrementing of the PR (package release) field.
> 
> A warning message has been added when princ is defined as anything but '0'.
> 
> The default setting of '0' has been retained as some layers use embedded
> python to increment the PRINC filed.  This fails if the base PRINC is not
> defined.
> 
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
>  meta/classes/base.bbclass | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index b1642a2..29084a2 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -465,8 +465,12 @@ python () {
>              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 is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service"
>          pr = d.getVar('PR', True)
>          pr_prefix = re.search("\D+",pr)
>          prval = re.search("\d+",pr)
> -- 
> 1.8.1.2.545.g2f19ada
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [RFC PATCH] base.bbclass: Deprecate the PRINC logic

[Richard Purdie]

On Wed, 2013-05-29 at 16:37 +0200, Martin Jansa wrote:
> On Wed, May 29, 2013 at 08:51:36AM -0500, Mark Hatle wrote:
> > Background:
> > 
> > At the recent TSC meeting we were discussing ways of removing the PRINC
> > in favor of the PR server, which should now be standard.  The first step
> > in this process is coming up with a simple patch that declared PRINC as
> > deprecated.  If this type of patch is successful, the block of code could
> > be replaced with a bb.error eventually.
> > 
> > It is not expected that this patch will go in by itself, but instead
> > should be coordinated with changes to the recipes in common layers such
> > as openembedded-core, meta-openembedded/meta-* and other community layers.
> 
> This doesn't say what's the process of getting all PR increments
> applied.
> 
> Should we send list of recipes and required PR increments per layer (and
> someone will sum these increments and create actual PR bump from it). Or
> will we take turns and send actual PR bump patches per layer and someone 
> will define order of layers to go in (so that we prevent many conflicts 
> while merging)?

This is something we need to figure out. The realistic process is
probably do this layer by layer. If we can batch some up together that
would obviously be better...

Cheers,

Richard

Re: [OE-core] [RFC PATCH] base.bbclass: Deprecate the PRINC logic

[Otavio Salvador]

On Wed, May 29, 2013 at 11:47 AM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Wed, 2013-05-29 at 16:37 +0200, Martin Jansa wrote:
> > On Wed, May 29, 2013 at 08:51:36AM -0500, Mark Hatle wrote:
> > > Background:
> > >
> > > At the recent TSC meeting we were discussing ways of removing the PRINC
> > > in favor of the PR server, which should now be standard.  The first
> step
> > > in this process is coming up with a simple patch that declared PRINC as
> > > deprecated.  If this type of patch is successful, the block of code
> could
> > > be replaced with a bb.error eventually.
> > >
> > > It is not expected that this patch will go in by itself, but instead
> > > should be coordinated with changes to the recipes in common layers such
> > > as openembedded-core, meta-openembedded/meta-* and other community
> layers.
> >
> > This doesn't say what's the process of getting all PR increments
> > applied.
> >
> > Should we send list of recipes and required PR increments per layer (and
> > someone will sum these increments and create actual PR bump from it). Or
> > will we take turns and send actual PR bump patches per layer and someone
> > will define order of layers to go in (so that we prevent many conflicts
> > while merging)?
>
> This is something we need to figure out. The realistic process is
> probably do this layer by layer. If we can batch some up together that
> would obviously be better...
>

If this is the case, to ensure we have the PR in sync we should have it
PRINC as a bb.error; this will cause some pain but will avoid PRServer
picking the layer PRINC and losing it in next build. Or does PRServer
handle this gracefully?

Regards,

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [OE-core] [RFC PATCH] base.bbclass: Deprecate the PRINC logic

[Richard Purdie]

On Wed, 2013-05-29 at 14:00 -0300, Otavio Salvador wrote:
> On Wed, May 29, 2013 at 11:47 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>         On Wed, 2013-05-29 at 16:37 +0200, Martin Jansa wrote:
>         > On Wed, May 29, 2013 at 08:51:36AM -0500, Mark Hatle wrote:
>         > > Background:
>         > >
>         > > At the recent TSC meeting we were discussing ways of
>         removing the PRINC
>         > > in favor of the PR server, which should now be standard.
>          The first step
>         > > in this process is coming up with a simple patch that
>         declared PRINC as
>         > > deprecated.  If this type of patch is successful, the
>         block of code could
>         > > be replaced with a bb.error eventually.
>         > >
>         > > It is not expected that this patch will go in by itself,
>         but instead
>         > > should be coordinated with changes to the recipes in
>         common layers such
>         > > as openembedded-core, meta-openembedded/meta-* and other
>         community layers.
>         >
>         > This doesn't say what's the process of getting all PR
>         increments
>         > applied.
>         >
>         > Should we send list of recipes and required PR increments
>         per layer (and
>         > someone will sum these increments and create actual PR bump
>         from it). Or
>         > will we take turns and send actual PR bump patches per layer
>         and someone
>         > will define order of layers to go in (so that we prevent
>         many conflicts
>         > while merging)?
>         
>         
>         This is something we need to figure out. The realistic process
>         is
>         probably do this layer by layer. If we can batch some up
>         together that
>         would obviously be better...

> If this is the case, to ensure we have the PR in sync we should have
> it PRINC as a bb.error; this will cause some pain but will avoid
> PRServer picking the layer PRINC and losing it in next build. Or does
> PRServer handle this gracefully?

I proposed this but other TSC members didn't like the approach and would
prefer a grace/warning period, maybe spanning until after the next
release.

I can see the arguments both ways...

Cheers,

Richard