[PATCH 0/1] Ensure generation of /etc/os-release is idempotent

[PATCH 0/1] Ensure generation of /etc/os-release is idempotent

[Felix Moessbauer]

Please note that this fix originally was part of the
"Improve handling of ISAR_RELEASE_CMD" series.
This series is no longer relevant (due to recent changes in what is sstate-cached).

Hence, I re-send this as a standalone patch, because this fix is still required.

Best regards,
Felix

Felix Moessbauer (1):
  Ensure generation of /etc/os-release is idempotent

 meta/classes/image-postproc-extension.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.30.2

[PATCH 1/1] Ensure generation of /etc/os-release is idempotent

[Felix Moessbauer]

Prior to this patch, the generation of the os-release file
was not idempotent as there was a name-glitch in VARIAN_VERSION.
By that, the script did not detect an existing VARIANT_VERSION
and add one additional one per invocation.

Fixes: 78b24427a050 ("classes/image-postproc: Add image version")

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/image-postproc-extension.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass
index 3f00c21b..ca520273 100644
--- a/meta/classes/image-postproc-extension.bbclass
+++ b/meta/classes/image-postproc-extension.bbclass
@@ -27,7 +27,7 @@ update_etc_os_release() {
             sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
     fi
     if [ -n "${OS_RELEASE_VARIANT_VERSION}" ]; then
-        sudo sed -i '/^ISAR_IMAGE_VERSION=.*/d' '${IMAGE_ROOTFS}/etc/os-release'
+        sudo sed -i '/^VARIANT_VERSION=.*/d' '${IMAGE_ROOTFS}/etc/os-release'
         echo "VARIANT_VERSION=\"${PV}\"" | \
             sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
     fi
-- 
2.30.2

Re: [PATCH 1/1] Ensure generation of /etc/os-release is idempotent

[Henning Schild]

ACK

Am Wed, 9 Mar 2022 16:34:44 +0100
schrieb Felix Moessbauer <felix.moessbauer@siemens.com>:

> Prior to this patch, the generation of the os-release file
> was not idempotent as there was a name-glitch in VARIAN_VERSION.
> By that, the script did not detect an existing VARIANT_VERSION
> and add one additional one per invocation.
> 
> Fixes: 78b24427a050 ("classes/image-postproc: Add image version")
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/classes/image-postproc-extension.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/image-postproc-extension.bbclass
> b/meta/classes/image-postproc-extension.bbclass index
> 3f00c21b..ca520273 100644 ---
> a/meta/classes/image-postproc-extension.bbclass +++
> b/meta/classes/image-postproc-extension.bbclass @@ -27,7 +27,7 @@
> update_etc_os_release() { sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
>      fi
>      if [ -n "${OS_RELEASE_VARIANT_VERSION}" ]; then
> -        sudo sed -i '/^ISAR_IMAGE_VERSION=.*/d'
> '${IMAGE_ROOTFS}/etc/os-release'
> +        sudo sed -i '/^VARIANT_VERSION=.*/d'
> '${IMAGE_ROOTFS}/etc/os-release' echo "VARIANT_VERSION=\"${PV}\"" | \
>              sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
>      fi

Re: [PATCH 0/1] Ensure generation of /etc/os-release is idempotent

[Anton Mikanovich]

09.03.2022 18:34, Felix Moessbauer wrote:
> Please note that this fix originally was part of the
> "Improve handling of ISAR_RELEASE_CMD" series.
> This series is no longer relevant (due to recent changes in what is sstate-cached).
>
> Hence, I re-send this as a standalone patch, because this fix is still required.
>
> Best regards,
> Felix
>
> Felix Moessbauer (1):
>    Ensure generation of /etc/os-release is idempotent
>
>   meta/classes/image-postproc-extension.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
Applied to next, thanks.