[PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-test/multiconfig/multiconfig-image-packager_0.1.bb  | 2 +-
 meta/lib/oe/sstatesig.py                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
index 3dbc0f5d155..a76a6bea1b8 100644
--- a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
+++ b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
@@ -8,7 +8,7 @@ MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz"
 
 MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}"
 
-do_install[mcdepends] += "multiconfig::${MCNAME}:core-image-minimal:do_image_complete multiconfig::${MCNAME}:virtual/kernel:do_deploy"
+do_install[mcdepends] += "mc::${MCNAME}:core-image-minimal:do_image_complete mc::${MCNAME}:virtual/kernel:do_deploy"
 
 do_install () {
     install -d ${D}/var/lib/machines/${MCNAME}
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 417943db902..13af16e473c 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -155,7 +155,7 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
         else:
             def get_mc(tid):
                 tid = tid.rsplit('.', 1)[0]
-                if tid.startswith('multiconfig:'):
+                if tid.startswith('mc:'):
                     elems = tid.split(':')
                     return elems[1]
             def recipename_from_dep(dep):
-- 
2.20.1

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[Joshua Watt]

Is there a reason for this change other than aesthetics?

FWIW, we maintain some recipes across several versions of poky, so this 
rename is going to cause me some headaches

On 6/7/19 10:48 AM, Richard Purdie wrote:
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>   .../recipes-test/multiconfig/multiconfig-image-packager_0.1.bb  | 2 +-
>   meta/lib/oe/sstatesig.py                                        | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
> index 3dbc0f5d155..a76a6bea1b8 100644
> --- a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
> +++ b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
> @@ -8,7 +8,7 @@ MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz"
>   
>   MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}"
>   
> -do_install[mcdepends] += "multiconfig::${MCNAME}:core-image-minimal:do_image_complete multiconfig::${MCNAME}:virtual/kernel:do_deploy"
> +do_install[mcdepends] += "mc::${MCNAME}:core-image-minimal:do_image_complete mc::${MCNAME}:virtual/kernel:do_deploy"
>   
>   do_install () {
>       install -d ${D}/var/lib/machines/${MCNAME}
> diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
> index 417943db902..13af16e473c 100644
> --- a/meta/lib/oe/sstatesig.py
> +++ b/meta/lib/oe/sstatesig.py
> @@ -155,7 +155,7 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
>           else:
>               def get_mc(tid):
>                   tid = tid.rsplit('.', 1)[0]
> -                if tid.startswith('multiconfig:'):
> +                if tid.startswith('mc:'):
>                       elems = tid.split(':')
>                       return elems[1]
>               def recipename_from_dep(dep):

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[richard.purdie]

On Fri, 2019-06-07 at 10:51 -0500, Joshua Watt wrote:
> Is there a reason for this change other than aesthetics?

I have had a lot of complaints and in real world use I can understand
why...

> FWIW, we maintain some recipes across several versions of poky, so
> this rename is going to cause me some headaches

The mcdepends code is tollerant of either naming. We could teach cooker
to translate any commandline references so both worked there. Would
that be good enough to work for you?

Cheers,

Richard

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[Joshua Watt]

On 6/7/19 11:23 AM, richard.purdie@linuxfoundation.org wrote:
> On Fri, 2019-06-07 at 10:51 -0500, Joshua Watt wrote:
>> Is there a reason for this change other than aesthetics?
> I have had a lot of complaints and in real world use I can understand
> why...
>
>> FWIW, we maintain some recipes across several versions of poky, so
>> this rename is going to cause me some headaches
> The mcdepends code is tollerant of either naming. We could teach cooker
> to translate any commandline references so both worked there. Would
> that be good enough to work for you?

Ya, that would be sufficient. I'll work up a patch for that.

>
> Cheers,
>
> Richard
>

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[akuster808]

On 6/7/19 8:51 AM, Joshua Watt wrote:
> Is there a reason for this change other than aesthetics?
>
> FWIW, we maintain some recipes across several versions of poky, so
> this rename is going to cause me some headaches
Versions.. as in stable branches?

- armin
>
> On 6/7/19 10:48 AM, Richard Purdie wrote:
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>>   .../recipes-test/multiconfig/multiconfig-image-packager_0.1.bb  | 2 +-
>>   meta/lib/oe/sstatesig.py                                        | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git
>> a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>> b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>>
>> index 3dbc0f5d155..a76a6bea1b8 100644
>> ---
>> a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>> +++
>> b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>> @@ -8,7 +8,7 @@ MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz"
>>     MC_DEPLOY_DIR_IMAGE =
>> "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}"
>>   -do_install[mcdepends] +=
>> "multiconfig::${MCNAME}:core-image-minimal:do_image_complete
>> multiconfig::${MCNAME}:virtual/kernel:do_deploy"
>> +do_install[mcdepends] +=
>> "mc::${MCNAME}:core-image-minimal:do_image_complete
>> mc::${MCNAME}:virtual/kernel:do_deploy"
>>     do_install () {
>>       install -d ${D}/var/lib/machines/${MCNAME}
>> diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
>> index 417943db902..13af16e473c 100644
>> --- a/meta/lib/oe/sstatesig.py
>> +++ b/meta/lib/oe/sstatesig.py
>> @@ -155,7 +155,7 @@ class
>> SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
>>           else:
>>               def get_mc(tid):
>>                   tid = tid.rsplit('.', 1)[0]
>> -                if tid.startswith('multiconfig:'):
>> +                if tid.startswith('mc:'):
>>                       elems = tid.split(':')
>>                       return elems[1]
>>               def recipename_from_dep(dep):

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[Joshua Watt]

On 6/7/19 3:08 PM, akuster808 wrote:
>
> On 6/7/19 8:51 AM, Joshua Watt wrote:
>> Is there a reason for this change other than aesthetics?
>>
>> FWIW, we maintain some recipes across several versions of poky, so
>> this rename is going to cause me some headaches
> Versions.. as in stable branches?

Yes.

>
> - armin
>> On 6/7/19 10:48 AM, Richard Purdie wrote:
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> ---
>>>    .../recipes-test/multiconfig/multiconfig-image-packager_0.1.bb  | 2 +-
>>>    meta/lib/oe/sstatesig.py                                        | 2 +-
>>>    2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git
>>> a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>>> b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>>>
>>> index 3dbc0f5d155..a76a6bea1b8 100644
>>> ---
>>> a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>>> +++
>>> b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
>>> @@ -8,7 +8,7 @@ MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz"
>>>      MC_DEPLOY_DIR_IMAGE =
>>> "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}"
>>>    -do_install[mcdepends] +=
>>> "multiconfig::${MCNAME}:core-image-minimal:do_image_complete
>>> multiconfig::${MCNAME}:virtual/kernel:do_deploy"
>>> +do_install[mcdepends] +=
>>> "mc::${MCNAME}:core-image-minimal:do_image_complete
>>> mc::${MCNAME}:virtual/kernel:do_deploy"
>>>      do_install () {
>>>        install -d ${D}/var/lib/machines/${MCNAME}
>>> diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
>>> index 417943db902..13af16e473c 100644
>>> --- a/meta/lib/oe/sstatesig.py
>>> +++ b/meta/lib/oe/sstatesig.py
>>> @@ -155,7 +155,7 @@ class
>>> SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
>>>            else:
>>>                def get_mc(tid):
>>>                    tid = tid.rsplit('.', 1)[0]
>>> -                if tid.startswith('multiconfig:'):
>>> +                if tid.startswith('mc:'):
>>>                        elems = tid.split(':')
>>>                        return elems[1]
>>>                def recipename_from_dep(dep):

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[Alejandro Hernandez]

On 6/7/2019 9:30 AM, Joshua Watt wrote:
> On 6/7/19 11:23 AM, richard.purdie@linuxfoundation.org wrote:
>> On Fri, 2019-06-07 at 10:51 -0500, Joshua Watt wrote:
>>> Is there a reason for this change other than aesthetics?
>> I have had a lot of complaints and in real world use I can understand
>> why...
>>
>>> FWIW, we maintain some recipes across several versions of poky, so
>>> this rename is going to cause me some headaches
>> The mcdepends code is tollerant of either naming. We could teach cooker
>> to translate any commandline references so both worked there. Would
>> that be good enough to work for you?
>
> Ya, that would be sufficient. I'll work up a patch for that.

I believe that I originally named it 'multiconfig' to try to make it 
more explicit for users,

but if people think its more intuitive to use 'mc' I'm not against it, 
using either also

works for me.


Cheers,

Alejandro


>
>>
>> Cheers,
>>
>> Richard
>>

Re: [PATCH] multiconfig: Adapt to bitbake switch 'multiconfig' -> 'mc'

[richard.purdie]

On Mon, 2019-06-10 at 10:53 -0700, Alejandro Hernandez wrote:
> On 6/7/2019 9:30 AM, Joshua Watt wrote:
> > On 6/7/19 11:23 AM, richard.purdie@linuxfoundation.org wrote:
> > > On Fri, 2019-06-07 at 10:51 -0500, Joshua Watt wrote:
> > > > Is there a reason for this change other than aesthetics?
> > > I have had a lot of complaints and in real world use I can
> > > understand
> > > why...
> > > 
> > > > FWIW, we maintain some recipes across several versions of poky,
> > > > so
> > > > this rename is going to cause me some headaches
> > > The mcdepends code is tollerant of either naming. We could teach
> > > cooker
> > > to translate any commandline references so both worked there.
> > > Would
> > > that be good enough to work for you?
> > 
> > Ya, that would be sufficient. I'll work up a patch for that.
> 
> I believe that I originally named it 'multiconfig' to try to make it 
> more explicit for users,

I remember the discussions and I was fairly strongly in favour of
"multiconfig" as well...

> but if people think its more intuitive to use 'mc' I'm not against
> it, using either also works for me.

On balance its proving annoying to people and the feedback I'm getting
is people strongly prefer "mc:", even if it makes me think midnight
commander! :)

Cheers,

Richard