Skip to contentSkip to conversation

base-files: exclude METADATA_REVISION for signature computation

PATCH In review Chen Qi 2 participants 3 messages Mar 8, 2021 – Mar 15, 2021

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 base-files: exclude METADATA_REVISION for signature computation

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.

---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/base-files/base-files_3.0.14.bb +1 -0
index 94299431f6..338e75580f 100644
@@ -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
Signature · 1 line
2.17.1
#1 lore raw
Quoted 22 lines · 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.

---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +

 1 file changed, 1 insertion(+)
meta/recipes-core/base-files/base-files_3.0.14.bb +0 -0
index 94299431f6..338e75580f 100644
@@ -144,6 +144,7 @@ do_install_append_libc-glibc () {
  }

Quoted 5 lines

 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

author
#2 lore raw
Quoted 31 lines · Richard Purdie
Quoted 26 lines · 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.

---
  meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +
  1 file changed, 1 insertion(+)
meta/recipes-core/base-files/base-files_3.0.14.bb +1 -0
index 94299431f6..338e75580f 100644
@@ -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}
Quoted 1 line
          if [ -n "${DISTRO_NAME}" ]; then

Unfortunately this causes cache validation issues and hence multilib conflicts:

Quoted 7 lines

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