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

[Henning Schild <henning.schild@siemens.com>]

Am Wed, 3 Nov 2021 13:36:24 +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
> 6e6b257..87749c8 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