[OE-core][PATCH] base-files: exclude METADATA_REVISION for signature computation

[OE-core][PATCH] base-files: exclude METADATA_REVISION for signature computation

[Chen Qi]

A previous commit changes poky's DISTRO_VERSION to include METADATA_REVISION.

  """
  poky.conf: do not write current date into distro version, use git hash instead
  """

This results in base-files do_install depend on the METADATA_REVISION, which is not
expected, exclude it.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 94299431f6..338e75580f 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -144,6 +144,7 @@ do_install_append_libc-glibc () {
 }
 
 DISTRO_VERSION[vardepsexclude] += "DATE"
+DISTRO_VERSION[vardepsexclude] += "METADATA_REVISION"
 do_install_basefilesissue () {
 	install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
         if [ -n "${DISTRO_NAME}" ]; then
-- 
2.17.1

Re: [OE-core][PATCH] base-files: exclude METADATA_REVISION for signature computation

[Richard Purdie]

On Mon, 2021-03-08 at 13:52 +0800, Chen Qi wrote:
> A previous commit changes poky's DISTRO_VERSION to include METADATA_REVISION.
> 
>   """
>   poky.conf: do not write current date into distro version, use git hash instead
>   """
> 
> This results in base-files do_install depend on the METADATA_REVISION, which is not
> expected, exclude it.
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
> index 94299431f6..338e75580f 100644
> --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
> +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
> @@ -144,6 +144,7 @@ do_install_append_libc-glibc () {
>  }
>  
> 
>  DISTRO_VERSION[vardepsexclude] += "DATE"
> +DISTRO_VERSION[vardepsexclude] += "METADATA_REVISION"
>  do_install_basefilesissue () {
>  	install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
>          if [ -n "${DISTRO_NAME}" ]; then

Unfortunately this causes cache validation issues and hence 
multilib conflicts:

https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/3222

Cheers,

Richard

Re: [OE-core][PATCH] base-files: exclude METADATA_REVISION for signature computation

[Chen Qi]

On 03/15/2021 12:35 AM, Richard Purdie wrote:
> On Mon, 2021-03-08 at 13:52 +0800, Chen Qi wrote:
>> A previous commit changes poky's DISTRO_VERSION to include METADATA_REVISION.
>>
>>    """
>>    poky.conf: do not write current date into distro version, use git hash instead
>>    """
>>
>> This results in base-files do_install depend on the METADATA_REVISION, which is not
>> expected, exclude it.
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
>> index 94299431f6..338e75580f 100644
>> --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
>> +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
>> @@ -144,6 +144,7 @@ do_install_append_libc-glibc () {
>>   }
>>   
>>
>>   DISTRO_VERSION[vardepsexclude] += "DATE"
>> +DISTRO_VERSION[vardepsexclude] += "METADATA_REVISION"
>>   do_install_basefilesissue () {
>>   	install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
>>           if [ -n "${DISTRO_NAME}" ]; then
> Unfortunately this causes cache validation issues and hence
> multilib conflicts:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/3222
>
> Cheers,
>
> Richard
>
>
Thanks. I think we can drop this patch.
We record meta data revision in base-files, we have 'base-files' in 
SIGGEN_EXCLUDERECIPES_ABISAFE, and we record METADATA_REVISION in eSDK 
to avoid warning. Current status is good from my point of view.

Best Regards,
Chen Qi