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

Joshua Watt jpewhacker at gmail.com
Fri Jun 7 20:27:38 UTC 2019


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 at 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):


More information about the Openembedded-core mailing list