From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6815578895823142912 X-Received: by 2002:a5d:6a04:: with SMTP id m4mr26163361wru.326.1587481295048; Tue, 21 Apr 2020 08:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:668b:: with SMTP id l11ls8084747wru.0.gmail; Tue, 21 Apr 2020 08:01:34 -0700 (PDT) X-Google-Smtp-Source: APiQypKrVxUoCypJ/wQOOw5ng9+cEwX21IGP5aNsSXIxEtGNuHnna6WaG0FmOQjJ4N3K8cEZYivs X-Received: by 2002:a5d:4f0d:: with SMTP id c13mr21959540wru.49.1587481294602; Tue, 21 Apr 2020 08:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587481294; cv=none; d=google.com; s=arc-20160816; b=bMXkvTN6QpFyJIyITJx2x2gO9hIP6KEyFxq3B4lCapTq3T1Nrwha0bYJADuDv5D0q0 yIaJEi7El1UBmegCLxeUTjcpBzBj39tow0EwCtteSRqeavaIV38EJz7iEBLJI95Qnub3 nieVfy+axHE2y1WlT4bBl+nSlTeT/Gx3KkPQzHExKabllKGhNmSMqDEBwZVMtLOgqHLi zOnRj4suI9U/VP6Eu+21lW1G3X2di8vXeErI/Dt2BfxBE2OrjJO4LFr0URPTRW6rzapd p7Gh2TJO5qhPepDK2W3dSn73b+vep+D9VQ3P4nnl/LunfEEX/LT/+6fWVH/mTiaj9WAx MeTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=pptTKrhRY+NXRfhXVKTn3t5iCroc5S6aYGCJYMsMHh8=; b=szQosTQ8N4fWRZHkrh+lKdYIKNn31tebKQaNaayfTkiY89lKKncP4i8GCTqa2QaMoE YQTOXgsWN1FcbjO0qbfJnYbLHtTAMGdB4VwjBARzo99E+wjjz87dkH0EOcZ489/6WNK4 IRt4nN/nFctArjCjzerjougXzWdpHEx04cbWYsJ3fpONALjymIB1DBOo1kuqML8sIIhG Q87hwub7cagpGgm7gSJkXHT3Vna4hOcAGaSSrC//sX052qMGaorweFomY5Mrf5wThsic eTT0VGkJ4Cio0RLTAdvDFiXhjeLUVfsNWLreuyRUxKp22KeM+MFaKXStWZyA1J6V8stJ u9Vg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id a5si191296wrg.4.2020.04.21.08.01.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2020 08:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 03LF1YGZ003443 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 Apr 2020 17:01:34 +0200 Received: from md2dvrtc.ad001.siemens.net ([167.87.9.56]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 03LF1YLD032756; Tue, 21 Apr 2020 17:01:34 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v2] classes/image-postproc: Add image version Date: Tue, 21 Apr 2020 17:01:34 +0200 Message-Id: <20200421150134.30325-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: +3e/77n6cNMA From: Quirin Gylstorff Add the image version as additional identifier to /etc/os-release. This allows in a update scenario an easier identification of the the currently used image. Signed-off-by: Quirin Gylstorff --- 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}" } ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id" -- 2.20.1