All of lore.kernel.org
 help / color / mirror / Atom feed
* Re: [meta-ti] [master][PATCH] layer.conf: add hardknott to compatible release branches
       [not found] <166DD7328409F7DB.26345@lists.yoctoproject.org>
@ 2021-03-19 20:31 ` Denys Dmytriyenko
  2021-03-19 22:58   ` praneeth
  0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2021-03-19 20:31 UTC (permalink / raw)
  To: Praneeth Bajjuri; +Cc: meta-ti

Praneeth,

When merging, please make sure the correct patch goes to correct branch, 
as indicated in the subject tag - this one is for master and the other 
for dunfell. Best time to merge them is when you don't have anything 
pending in -next. So, instead of cherry-picking between branches, just 
merge different patches. Thanks!


On Fri, Mar 19, 2021 at 04:07:19PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> While at it, remove old releases before dunfell.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>  conf/layer.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 2393e61..3bed9fc 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-ti"
>  BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_meta-ti = "6"
>  
> -LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus dunfell gatesgarth"
> +LAYERSERIES_COMPAT_meta-ti = "dunfell gatesgarth hardknott"
>  
>  LICENSE_PATH += "${LAYERDIR}/licenses"
>  
> -- 
> 2.7.4

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [meta-ti] [master][PATCH] layer.conf: add hardknott to compatible release branches
  2021-03-19 20:31 ` [meta-ti] [master][PATCH] layer.conf: add hardknott to compatible release branches Denys Dmytriyenko
@ 2021-03-19 22:58   ` praneeth
  2021-03-19 23:03     ` Denys Dmytriyenko
  0 siblings, 1 reply; 3+ messages in thread
From: praneeth @ 2021-03-19 22:58 UTC (permalink / raw)
  To: Denys Dmytriyenko; +Cc: meta-ti



On 3/19/2021 3:31 PM, Denys Dmytriyenko wrote:
> Praneeth,
> 
> When merging, please make sure the correct patch goes to correct branch,
> as indicated in the subject tag - this one is for master and the other
> for dunfell. Best time to merge them is when you don't have anything
> pending in -next. So, instead of cherry-picking between branches, just
> merge different patches. Thanks!
> 

sounds good. done . merged to master and dunfell the seperate patches.


> 
> On Fri, Mar 19, 2021 at 04:07:19PM -0400, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko <denys@konsulko.com>
>>
>> While at it, remove old releases before dunfell.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>> ---
>>   conf/layer.conf | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/conf/layer.conf b/conf/layer.conf
>> index 2393e61..3bed9fc 100644
>> --- a/conf/layer.conf
>> +++ b/conf/layer.conf
>> @@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-ti"
>>   BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
>>   BBFILE_PRIORITY_meta-ti = "6"
>>   
>> -LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus dunfell gatesgarth"
>> +LAYERSERIES_COMPAT_meta-ti = "dunfell gatesgarth hardknott"
>>   
>>   LICENSE_PATH += "${LAYERDIR}/licenses"
>>   
>> -- 
>> 2.7.4
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [meta-ti] [master][PATCH] layer.conf: add hardknott to compatible release branches
  2021-03-19 22:58   ` praneeth
@ 2021-03-19 23:03     ` Denys Dmytriyenko
  0 siblings, 0 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2021-03-19 23:03 UTC (permalink / raw)
  To: Bajjuri, Praneeth; +Cc: meta-ti

On Fri, Mar 19, 2021 at 05:58:26PM -0500, Bajjuri, Praneeth wrote:
> 
> 
> On 3/19/2021 3:31 PM, Denys Dmytriyenko wrote:
> >Praneeth,
> >
> >When merging, please make sure the correct patch goes to correct branch,
> >as indicated in the subject tag - this one is for master and the other
> >for dunfell. Best time to merge them is when you don't have anything
> >pending in -next. So, instead of cherry-picking between branches, just
> >merge different patches. Thanks!
> >
> 
> sounds good. done . merged to master and dunfell the seperate patches.

Thanks!


> >On Fri, Mar 19, 2021 at 04:07:19PM -0400, Denys Dmytriyenko wrote:
> >>From: Denys Dmytriyenko <denys@konsulko.com>
> >>
> >>While at it, remove old releases before dunfell.
> >>
> >>Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >>---
> >>  conf/layer.conf | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >>diff --git a/conf/layer.conf b/conf/layer.conf
> >>index 2393e61..3bed9fc 100644
> >>--- a/conf/layer.conf
> >>+++ b/conf/layer.conf
> >>@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-ti"
> >>  BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
> >>  BBFILE_PRIORITY_meta-ti = "6"
> >>-LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus dunfell gatesgarth"
> >>+LAYERSERIES_COMPAT_meta-ti = "dunfell gatesgarth hardknott"
> >>  LICENSE_PATH += "${LAYERDIR}/licenses"
> >>-- 
> >>2.7.4

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-19 23:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <166DD7328409F7DB.26345@lists.yoctoproject.org>
2021-03-19 20:31 ` [meta-ti] [master][PATCH] layer.conf: add hardknott to compatible release branches Denys Dmytriyenko
2021-03-19 22:58   ` praneeth
2021-03-19 23:03     ` Denys Dmytriyenko

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.