Merging in linux-stable updates, git send-email

Merging in linux-stable updates, git send-email

[Koen Kooi]

Hi,

The update to 3.2.5 for the bone kernel is almost done, but it involves adding ~275 patches. Does it make sense to git-send-email that megapatch for review? The difficulty is rooted in the origin of the TI kernel: linux-omap instead of Linus' tree, so we can't (easily) rebase all the patches on top of 3.2.5, so it's actually 3.2.5 rebased onto TI v3.2-staging and then the extra beaglebone patches added.

Git am -3 takes care of duplicate patches and automerging conflicts but I'd still like to find out what the best way to review this is.

regards,

Koen

Re: Merging in linux-stable updates, git send-email

[Maupin, Chase]

Koen,

Which recipe are you going to update here?  I assume this is not the linux-ti33x-psp_3.2.bb recipe but something else?

Sincerely,
Chase Maupin
Software Applications
ARM MPU
e-mail: chase.maupin@ti.com
phone: (214) 567-2950

For support:
Forums - http://community.ti.com/forums/
Wiki - http://wiki.davincidsp.com/ 


> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> bounces@yoctoproject.org] On Behalf Of Koen Kooi
> Sent: Friday, February 10, 2012 8:08 AM
> To: meta-ti@yoctoproject.org
> Subject: [meta-ti] Merging in linux-stable updates, git send-email
> 
> Hi,
> 
> The update to 3.2.5 for the bone kernel is almost done, but it
> involves adding ~275 patches. Does it make sense to git-send-email
> that megapatch for review? The difficulty is rooted in the origin
> of the TI kernel: linux-omap instead of Linus' tree, so we can't
> (easily) rebase all the patches on top of 3.2.5, so it's actually
> 3.2.5 rebased onto TI v3.2-staging and then the extra beaglebone
> patches added.
> 
> Git am -3 takes care of duplicate patches and automerging conflicts
> but I'd still like to find out what the best way to review this is.
> 
> regards,
> 
> Koen
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti

Re: Merging in linux-stable updates, git send-email

[Koen Kooi]

Op 10 feb. 2012, om 16:05 heeft Maupin, Chase het volgende geschreven:

> Koen,
> 
> Which recipe are you going to update here?  I assume this is not the linux-ti33x-psp_3.2.bb recipe but something else?

Exactly that recipe: https://github.com/Angstrom-distribution/meta-ti/commit/a77ccb569019bba7cefc72e598504d26a72fa596

regards,

Koen

> 
> Sincerely,
> Chase Maupin
> Software Applications
> ARM MPU
> e-mail: chase.maupin@ti.com
> phone: (214) 567-2950
> 
> For support:
> Forums - http://community.ti.com/forums/
> Wiki - http://wiki.davincidsp.com/ 
> 
> 
>> -----Original Message-----
>> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
>> bounces@yoctoproject.org] On Behalf Of Koen Kooi
>> Sent: Friday, February 10, 2012 8:08 AM
>> To: meta-ti@yoctoproject.org
>> Subject: [meta-ti] Merging in linux-stable updates, git send-email
>> 
>> Hi,
>> 
>> The update to 3.2.5 for the bone kernel is almost done, but it
>> involves adding ~275 patches. Does it make sense to git-send-email
>> that megapatch for review? The difficulty is rooted in the origin
>> of the TI kernel: linux-omap instead of Linus' tree, so we can't
>> (easily) rebase all the patches on top of 3.2.5, so it's actually
>> 3.2.5 rebased onto TI v3.2-staging and then the extra beaglebone
>> patches added.
>> 
>> Git am -3 takes care of duplicate patches and automerging conflicts
>> but I'd still like to find out what the best way to review this is.
>> 
>> regards,
>> 
>> Koen
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti

Re: Merging in linux-stable updates, git send-email

[Maupin, Chase]

So you changed the recipe name to use 3.2.5 for the PV.  But when I set the DISTRO_FEATURES to include tipspkernel I don't get all the patches you added to update to 3.2.5.  So can you maybe do a logic similar to how the patches are handled to set the PV based on whether tipspkernel is set in DISTRO_FEATURES?

Sincerely,
Chase Maupin
Software Applications
ARM MPU
e-mail: chase.maupin@ti.com
phone: (214) 567-2950

For support:
Forums - http://community.ti.com/forums/
Wiki - http://wiki.davincidsp.com/ 


> -----Original Message-----
> From: Koen Kooi [mailto:koen@dominion.thruhere.net]
> Sent: Friday, February 10, 2012 9:16 AM
> To: Maupin, Chase
> Cc: meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] Merging in linux-stable updates, git send-
> email
> 
> 
> Op 10 feb. 2012, om 16:05 heeft Maupin, Chase het volgende
> geschreven:
> 
> > Koen,
> >
> > Which recipe are you going to update here?  I assume this is not
> the linux-ti33x-psp_3.2.bb recipe but something else?
> 
> Exactly that recipe: https://github.com/Angstrom-distribution/meta-
> ti/commit/a77ccb569019bba7cefc72e598504d26a72fa596
> 
> regards,
> 
> Koen
> 
> >
> > Sincerely,
> > Chase Maupin
> > Software Applications
> > ARM MPU
> > e-mail: chase.maupin@ti.com
> > phone: (214) 567-2950
> >
> > For support:
> > Forums - http://community.ti.com/forums/
> > Wiki - http://wiki.davincidsp.com/
> >
> >
> >> -----Original Message-----
> >> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> >> bounces@yoctoproject.org] On Behalf Of Koen Kooi
> >> Sent: Friday, February 10, 2012 8:08 AM
> >> To: meta-ti@yoctoproject.org
> >> Subject: [meta-ti] Merging in linux-stable updates, git send-
> email
> >>
> >> Hi,
> >>
> >> The update to 3.2.5 for the bone kernel is almost done, but it
> >> involves adding ~275 patches. Does it make sense to git-send-
> email
> >> that megapatch for review? The difficulty is rooted in the
> origin
> >> of the TI kernel: linux-omap instead of Linus' tree, so we can't
> >> (easily) rebase all the patches on top of 3.2.5, so it's
> actually
> >> 3.2.5 rebased onto TI v3.2-staging and then the extra beaglebone
> >> patches added.
> >>
> >> Git am -3 takes care of duplicate patches and automerging
> conflicts
> >> but I'd still like to find out what the best way to review this
> is.
> >>
> >> regards,
> >>
> >> Koen
> >> _______________________________________________
> >> meta-ti mailing list
> >> meta-ti@yoctoproject.org
> >> https://lists.yoctoproject.org/listinfo/meta-ti

Re: Merging in linux-stable updates, git send-email

[Koen Kooi]

Op 10 feb. 2012, om 17:05 heeft Maupin, Chase het volgende geschreven:

> So you changed the recipe name to use 3.2.5 for the PV.  But when I set the DISTRO_FEATURES to include tipspkernel I don't get all the patches you added to update to 3.2.5.  So can you maybe do a logic similar to how the patches are handled to set the PV based on whether tipspkernel is set in DISTRO_FEATURES?

I have updated the patch locally to keep PV at 3.2. I can live with PV being "wrong" for the patched kernel till we figure out the python magic. Using gitpkgv would get us around all this, but that's a story for another day :)

regards,

Koen

> 
> Sincerely,
> Chase Maupin
> Software Applications
> ARM MPU
> e-mail: chase.maupin@ti.com
> phone: (214) 567-2950
> 
> For support:
> Forums - http://community.ti.com/forums/
> Wiki - http://wiki.davincidsp.com/ 
> 
> 
>> -----Original Message-----
>> From: Koen Kooi [mailto:koen@dominion.thruhere.net]
>> Sent: Friday, February 10, 2012 9:16 AM
>> To: Maupin, Chase
>> Cc: meta-ti@yoctoproject.org
>> Subject: Re: [meta-ti] Merging in linux-stable updates, git send-
>> email
>> 
>> 
>> Op 10 feb. 2012, om 16:05 heeft Maupin, Chase het volgende
>> geschreven:
>> 
>>> Koen,
>>> 
>>> Which recipe are you going to update here?  I assume this is not
>> the linux-ti33x-psp_3.2.bb recipe but something else?
>> 
>> Exactly that recipe: https://github.com/Angstrom-distribution/meta-
>> ti/commit/a77ccb569019bba7cefc72e598504d26a72fa596
>> 
>> regards,
>> 
>> Koen
>> 
>>> 
>>> Sincerely,
>>> Chase Maupin
>>> Software Applications
>>> ARM MPU
>>> e-mail: chase.maupin@ti.com
>>> phone: (214) 567-2950
>>> 
>>> For support:
>>> Forums - http://community.ti.com/forums/
>>> Wiki - http://wiki.davincidsp.com/
>>> 
>>> 
>>>> -----Original Message-----
>>>> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
>>>> bounces@yoctoproject.org] On Behalf Of Koen Kooi
>>>> Sent: Friday, February 10, 2012 8:08 AM
>>>> To: meta-ti@yoctoproject.org
>>>> Subject: [meta-ti] Merging in linux-stable updates, git send-
>> email
>>>> 
>>>> Hi,
>>>> 
>>>> The update to 3.2.5 for the bone kernel is almost done, but it
>>>> involves adding ~275 patches. Does it make sense to git-send-
>> email
>>>> that megapatch for review? The difficulty is rooted in the
>> origin
>>>> of the TI kernel: linux-omap instead of Linus' tree, so we can't
>>>> (easily) rebase all the patches on top of 3.2.5, so it's
>> actually
>>>> 3.2.5 rebased onto TI v3.2-staging and then the extra beaglebone
>>>> patches added.
>>>> 
>>>> Git am -3 takes care of duplicate patches and automerging
>> conflicts
>>>> but I'd still like to find out what the best way to review this
>> is.
>>>> 
>>>> regards,
>>>> 
>>>> Koen
>>>> _______________________________________________
>>>> meta-ti mailing list
>>>> meta-ti@yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/meta-ti
> 

Re: Merging in linux-stable updates, git send-email

[Maupin, Chase]

> -----Original Message-----
> From: Koen Kooi [mailto:koen@dominion.thruhere.net]
> Sent: Friday, February 10, 2012 10:15 AM
> To: Maupin, Chase
> Cc: meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] Merging in linux-stable updates, git send-
> email
> 
> 
> Op 10 feb. 2012, om 17:05 heeft Maupin, Chase het volgende
> geschreven:
> 
> > So you changed the recipe name to use 3.2.5 for the PV.  But when
> I set the DISTRO_FEATURES to include tipspkernel I don't get all
> the patches you added to update to 3.2.5.  So can you maybe do a
> logic similar to how the patches are handled to set the PV based on
> whether tipspkernel is set in DISTRO_FEATURES?
> 
> I have updated the patch locally to keep PV at 3.2. I can live with
> PV being "wrong" for the patched kernel till we figure out the
> python magic. Using gitpkgv would get us around all this, but
> that's a story for another day :)

So for this recipe would the following line of code not work?

PV = "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "${PV}", "3.2.5", d)}"

Then leave the recipe as linux-ti33x-psp_3.2.bb but your PV should be correct for your kernel right?

> 
> regards,
> 
> Koen
> 
> >
> > Sincerely,
> > Chase Maupin
> > Software Applications
> > ARM MPU
> > e-mail: chase.maupin@ti.com
> > phone: (214) 567-2950
> >
> > For support:
> > Forums - http://community.ti.com/forums/
> > Wiki - http://wiki.davincidsp.com/
> >
> >
> >> -----Original Message-----
> >> From: Koen Kooi [mailto:koen@dominion.thruhere.net]
> >> Sent: Friday, February 10, 2012 9:16 AM
> >> To: Maupin, Chase
> >> Cc: meta-ti@yoctoproject.org
> >> Subject: Re: [meta-ti] Merging in linux-stable updates, git
> send-
> >> email
> >>
> >>
> >> Op 10 feb. 2012, om 16:05 heeft Maupin, Chase het volgende
> >> geschreven:
> >>
> >>> Koen,
> >>>
> >>> Which recipe are you going to update here?  I assume this is
> not
> >> the linux-ti33x-psp_3.2.bb recipe but something else?
> >>
> >> Exactly that recipe: https://github.com/Angstrom-
> distribution/meta-
> >> ti/commit/a77ccb569019bba7cefc72e598504d26a72fa596
> >>
> >> regards,
> >>
> >> Koen
> >>
> >>>
> >>> Sincerely,
> >>> Chase Maupin
> >>> Software Applications
> >>> ARM MPU
> >>> e-mail: chase.maupin@ti.com
> >>> phone: (214) 567-2950
> >>>
> >>> For support:
> >>> Forums - http://community.ti.com/forums/
> >>> Wiki - http://wiki.davincidsp.com/
> >>>
> >>>
> >>>> -----Original Message-----
> >>>> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> >>>> bounces@yoctoproject.org] On Behalf Of Koen Kooi
> >>>> Sent: Friday, February 10, 2012 8:08 AM
> >>>> To: meta-ti@yoctoproject.org
> >>>> Subject: [meta-ti] Merging in linux-stable updates, git send-
> >> email
> >>>>
> >>>> Hi,
> >>>>
> >>>> The update to 3.2.5 for the bone kernel is almost done, but it
> >>>> involves adding ~275 patches. Does it make sense to git-send-
> >> email
> >>>> that megapatch for review? The difficulty is rooted in the
> >> origin
> >>>> of the TI kernel: linux-omap instead of Linus' tree, so we
> can't
> >>>> (easily) rebase all the patches on top of 3.2.5, so it's
> >> actually
> >>>> 3.2.5 rebased onto TI v3.2-staging and then the extra
> beaglebone
> >>>> patches added.
> >>>>
> >>>> Git am -3 takes care of duplicate patches and automerging
> >> conflicts
> >>>> but I'd still like to find out what the best way to review
> this
> >> is.
> >>>>
> >>>> regards,
> >>>>
> >>>> Koen
> >>>> _______________________________________________
> >>>> meta-ti mailing list
> >>>> meta-ti@yoctoproject.org
> >>>> https://lists.yoctoproject.org/listinfo/meta-ti
> >

Re: Merging in linux-stable updates, git send-email

[Denys Dmytriyenko]

On Fri, Feb 10, 2012 at 04:18:28PM +0000, Maupin, Chase wrote:
> 
> > -----Original Message-----
> > From: Koen Kooi [mailto:koen@dominion.thruhere.net]
> > Sent: Friday, February 10, 2012 10:15 AM
> > To: Maupin, Chase
> > Cc: meta-ti@yoctoproject.org
> > Subject: Re: [meta-ti] Merging in linux-stable updates, git send-
> > email
> > 
> > 
> > Op 10 feb. 2012, om 17:05 heeft Maupin, Chase het volgende
> > geschreven:
> > 
> > > So you changed the recipe name to use 3.2.5 for the PV.  But when
> > I set the DISTRO_FEATURES to include tipspkernel I don't get all
> > the patches you added to update to 3.2.5.  So can you maybe do a
> > logic similar to how the patches are handled to set the PV based on
> > whether tipspkernel is set in DISTRO_FEATURES?
> > 
> > I have updated the patch locally to keep PV at 3.2. I can live with
> > PV being "wrong" for the patched kernel till we figure out the
> > python magic. Using gitpkgv would get us around all this, but
> > that's a story for another day :)
> 
> So for this recipe would the following line of code not work?
> 
> PV = "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "${PV}", "3.2.5", d)}"

You'll have a circular resolution in there, basically doing PV = ${PV}

You'd want to use := instead. But anyway, it seems heavy handed for the 
purpose...

-- 
Denys


> Then leave the recipe as linux-ti33x-psp_3.2.bb but your PV should be 
> correct for your kernel right?

Re: Merging in linux-stable updates, git send-email

[Maupin, Chase]

> -----Original Message-----
> From: Denys Dmytriyenko [mailto:denis@denix.org]
> Sent: Friday, February 10, 2012 10:28 AM
> To: Maupin, Chase
> Cc: Koen Kooi; meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] Merging in linux-stable updates, git send-
> email
> 
> On Fri, Feb 10, 2012 at 04:18:28PM +0000, Maupin, Chase wrote:
> >
> > > -----Original Message-----
> > > From: Koen Kooi [mailto:koen@dominion.thruhere.net]
> > > Sent: Friday, February 10, 2012 10:15 AM
> > > To: Maupin, Chase
> > > Cc: meta-ti@yoctoproject.org
> > > Subject: Re: [meta-ti] Merging in linux-stable updates, git
> send-
> > > email
> > >
> > >
> > > Op 10 feb. 2012, om 17:05 heeft Maupin, Chase het volgende
> > > geschreven:
> > >
> > > > So you changed the recipe name to use 3.2.5 for the PV.  But
> when
> > > I set the DISTRO_FEATURES to include tipspkernel I don't get
> all
> > > the patches you added to update to 3.2.5.  So can you maybe do
> a
> > > logic similar to how the patches are handled to set the PV
> based on
> > > whether tipspkernel is set in DISTRO_FEATURES?
> > >
> > > I have updated the patch locally to keep PV at 3.2. I can live
> with
> > > PV being "wrong" for the patched kernel till we figure out the
> > > python magic. Using gitpkgv would get us around all this, but
> > > that's a story for another day :)
> >
> > So for this recipe would the following line of code not work?
> >
> > PV = "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "${PV}",
> "3.2.5", d)}"
> 
> You'll have a circular resolution in there, basically doing PV =
> ${PV}
> 
> You'd want to use := instead. But anyway, it seems heavy handed for
> the
> purpose...

Well, as long as we use the PSP version as the base I'm OK, which is what I think Koen is saying.

> 
> --
> Denys
> 
> 
> > Then leave the recipe as linux-ti33x-psp_3.2.bb but your PV
> should be
> > correct for your kernel right?