Patchwork [meta-fsl-ppc,master] remove DSTRO string from PR due to meta-fsl-ppc is not distro specific

login
register
mail settings
Submitter Zhenhua Luo
Date Feb. 28, 2013, 10:50 a.m.
Message ID <1362048630-20556-1-git-send-email-zhenhua.luo@freescale.com>
Download mbox | patch
Permalink /patch/45275/
State Superseded
Delegated to: Matthew McClintock
Headers show

Comments

Zhenhua Luo - Feb. 28, 2013, 10:50 a.m.
conf/distro/fsl.conf has been removed, meta-fsl-ppc is not distro specific.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Otavio Salvador - Feb. 28, 2013, 12:35 p.m.
On Thu, Feb 28, 2013 at 7:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
> conf/distro/fsl.conf has been removed, meta-fsl-ppc is not distro specific.
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>

I do support this move (as indeed the BSP shouldn't be distro
specific) however this change breaks upgrade path from existend users.

Please use:

PRINC := "${@int(PRINC) + 1}"

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
McClintock Matthew-B29882 - March 1, 2013, 6:06 a.m.
On Thu, Feb 28, 2013 at 6:35 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Thu, Feb 28, 2013 at 7:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
>> conf/distro/fsl.conf has been removed, meta-fsl-ppc is not distro specific.
>>
>> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
>
> I do support this move (as indeed the BSP shouldn't be distro
> specific) however this change breaks upgrade path from existend users.
>
> Please use:
>
> PRINC := "${@int(PRINC) + 1}"

I don't think this works properly for bbapends. When the base recipes
bumps the PR the there will be overlapping PRs which will cause
conflicts... or maybe I am missing something.

I think the common practice is to not do anything to the PR for
bbappends. Even though we used to do this ${DISTRO} append.

-M
Zhenhua Luo - March 1, 2013, 7:03 a.m.
Just checked the Yocto document, PRINC := "${@int(PRINC) + 1}" is the officially suggested way. 

http://www.yoctoproject.org/docs/current/poky-ref-manual/poky-ref-manual.html#var-PRINC


Best Regards,

Zhenhua


> -----Original Message-----
> From: McClintock Matthew-B29882
> Sent: Friday, March 01, 2013 2:07 PM
> To: Otavio Salvador
> Cc: Luo Zhenhua-B19537; meta-freescale@yoctoproject.org; McClintock
> Matthew-B29882
> Subject: Re: [meta-freescale] [meta-fsl-ppc master] remove DSTRO string
> from PR due to meta-fsl-ppc is not distro specific
> 
> On Thu, Feb 28, 2013 at 6:35 AM, Otavio Salvador <otavio@ossystems.com.br>
> wrote:
> > On Thu, Feb 28, 2013 at 7:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com>
> wrote:
> >> conf/distro/fsl.conf has been removed, meta-fsl-ppc is not distro
> specific.
> >>
> >> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> >
> > I do support this move (as indeed the BSP shouldn't be distro
> > specific) however this change breaks upgrade path from existend users.
> >
> > Please use:
> >
> > PRINC := "${@int(PRINC) + 1}"
> 
> I don't think this works properly for bbapends. When the base recipes
> bumps the PR the there will be overlapping PRs which will cause
> conflicts... or maybe I am missing something.
> 
> I think the common practice is to not do anything to the PR for bbappends.
> Even though we used to do this ${DISTRO} append.
> 
> -M
Otavio Salvador - March 1, 2013, noon
On Fri, Mar 1, 2013 at 3:06 AM, McClintock Matthew-B29882
<B29882@freescale.com> wrote:
> On Thu, Feb 28, 2013 at 6:35 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Thu, Feb 28, 2013 at 7:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
>>> conf/distro/fsl.conf has been removed, meta-fsl-ppc is not distro specific.
>>>
>>> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
>>
>> I do support this move (as indeed the BSP shouldn't be distro
>> specific) however this change breaks upgrade path from existend users.
>>
>> Please use:
>>
>> PRINC := "${@int(PRINC) + 1}"
>
> I don't think this works properly for bbapends. When the base recipes
> bumps the PR the there will be overlapping PRs which will cause
> conflicts... or maybe I am missing something.

In fact it does work. When the base recipe change PR, let's say r1 to
r2, for each PRINC it will be raised. So in this case it will be r3.

> I think the common practice is to not do anything to the PR for
> bbappends. Even though we used to do this ${DISTRO} append.

For PR, yes. But for PRINC you should.

(adding Richard in Cc)

Richard, the PRServer will handle the removal of PR suffix in this
case? What it'd do?
Matthew McClintock - March 3, 2013, 4:51 p.m.
On Fri, Mar 1, 2013 at 6:00 AM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Fri, Mar 1, 2013 at 3:06 AM, McClintock Matthew-B29882
> <B29882@freescale.com> wrote:
>> On Thu, Feb 28, 2013 at 6:35 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>> On Thu, Feb 28, 2013 at 7:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
>>>> conf/distro/fsl.conf has been removed, meta-fsl-ppc is not distro specific.
>>>>
>>>> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
>>>
>>> I do support this move (as indeed the BSP shouldn't be distro
>>> specific) however this change breaks upgrade path from existend users.
>>>
>>> Please use:
>>>
>>> PRINC := "${@int(PRINC) + 1}"
>>
>> I don't think this works properly for bbapends. When the base recipes
>> bumps the PR the there will be overlapping PRs which will cause
>> conflicts... or maybe I am missing something.
>
> In fact it does work. When the base recipe change PR, let's say r1 to
> r2, for each PRINC it will be raised. So in this case it will be r3.
>
>> I think the common practice is to not do anything to the PR for
>> bbappends. Even though we used to do this ${DISTRO} append.
>
> For PR, yes. But for PRINC you should.
>
> (adding Richard in Cc)
>
> Richard, the PRServer will handle the removal of PR suffix in this
> case? What it'd do?

Sorry, I was confusing myself here... this looks to in fact be the
common practice.

-M

Patch

diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 0291bb7..38c65e6 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,3 +1,3 @@ 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PR .= "+${DISTRO}"
+PR .= ".1"