[OE-core] [PATCH] multilib.conf: Ensure that RECIPE_SYSROOT is unchanged for native

ChenQi Qi.Chen at windriver.com
Wed Dec 18 01:19:20 UTC 2019


On 12/17/2019 09:55 PM, Mike Crowe wrote:
> On Tuesday 17 December 2019 at 16:56:11 +0800, ChenQi wrote:
>> On 12/17/2019 04:02 PM, Mike Crowe via Openembedded-core wrote:
>>> Ensure that RECIPE_SYSROOT is the same for -native recipes whether
>>> multilib.conf is included or not.
>>>
>>> Without this change task signatures for -native recipes change when
>>> switching between MACHINEs that require multilib.conf and those that
>>> don't.
>>>
>>> This fix was one of the ones suggested by Khem Raj in
>>> http://lists.openembedded.org/pipermail/openembedded-core/2019-December/290303.html
>>>
>>> Add test_sstate_multilib_or_not_native_samesigs test case to
>>> sstatetests.py to ensure that this stays fixed.
>>>
>>> Signed-off-by: Mike Crowe <mac at mcrowe.com>
>>> ---
>>>    meta/conf/multilib.conf                     |  1 +
>>>    meta/lib/oeqa/selftest/cases/sstatetests.py | 40 +++++++++++++++++++++
>>>    2 files changed, 41 insertions(+)
>>>
>>> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
>>> index cfed3fbbd0..58f2ac5c86 100644
>>> --- a/meta/conf/multilib.conf
>>> +++ b/meta/conf/multilib.conf
>>> @@ -9,6 +9,7 @@ MULTILIBS ??= "multilib:lib32"
>>>    STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
>>>    STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
>>>    RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
>>> +RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot"
>> How about just removing MLPREFIX?
> I'm afraid that I don't understand what you are suggesting. The above
> change does remove MLPREFIX for -native only.
>
> Thanks.
>
> Mike.
>
I mean removing all these MLPREFIX, so that STAGING_DIR_HOST, 
STAGING_DIR_TARGET and RECIPE_SYSROOT will all be ${WORKDIR}/recipe-sysroot.

Best Regards,

Chen Qi



More information about the Openembedded-core mailing list