Re: [PATCH] classes/image_postprocessing: Add variant version to os_release

[Jan Kiszka <jan.kiszka@siemens.com>]

On 14.04.20 16:46, [ext] Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> to identify the image version in a human readable way
> .

No need to hectically type the commit message - full sentences would 
have been good, also stating the the recipe version of the image is 
propagated into os-release here.

> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   meta/classes/image-postproc-extension.bbclass | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass
> index 7280202..1091fa4 100644
> --- a/meta/classes/image-postproc-extension.bbclass
> +++ b/meta/classes/image-postproc-extension.bbclass
> @@ -4,10 +4,12 @@
>   update_etc_os_release() {
>       OS_RELEASE_BUILD_ID=""
>       OS_RELEASE_VARIANT=""
> +    OS_RELEASE_VARIANT_VERSION=""
>       while true; do
>           case "$1" in
>           --build-id) OS_RELEASE_BUILD_ID=$2; shift ;;
>           --variant) OS_RELEASE_VARIANT=$2; shift ;;
> +        --version) OS_RELEASE_VARIANT_VERSION=$2; shift ;;
>           -*) bbfatal "$0: invalid option specified: $1" ;;
>           *) break ;;
>           esac
> @@ -24,6 +26,11 @@ update_etc_os_release() {
>           echo "VARIANT=\"${OS_RELEASE_VARIANT}\"" | \
>               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'
> +        echo "VARIANT_VERSION=\"${PV}\"" | \
> +            sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
> +    fi
>   }
>   
>   ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_configure"
> @@ -43,7 +50,7 @@ ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_mark"
>   image_postprocess_mark() {
>       BUILD_ID=$(get_build_id)
>       update_etc_os_release \
> -        --build-id "${BUILD_ID}" --variant "${DESCRIPTION}"
> +        --build-id "${BUILD_ID}" --variant "${DESCRIPTION}" --version "${PV}"

Looking for a reason this should not be hard-coded to be PV, rather 
defaulting to it, but I didn't find one so far.

>   }
>   
>   ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id"
> 

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux