From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6815578895823142912 X-Received: by 2002:a2e:8884:: with SMTP id k4mr14432791lji.267.1587495434884; Tue, 21 Apr 2020 11:57:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a550:: with SMTP id e16ls3162676ljn.6.gmail; Tue, 21 Apr 2020 11:57:14 -0700 (PDT) X-Google-Smtp-Source: APiQypI/hFWbngtluW+lDa4RZTvhK42bAwwPPQOordNRDuCpW9bPQdDqDAMGp3LMC8ERETB2z7Mh X-Received: by 2002:a2e:731a:: with SMTP id o26mr7979114ljc.189.1587495434233; Tue, 21 Apr 2020 11:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587495434; cv=none; d=google.com; s=arc-20160816; b=xTLYKOersmCA2naZSYaytAWzpr8RUfo8z0TxojKCQernm86o+OWu724zil/Ck4oIe5 KxKJcDmjNrMqmrgljvej5WKBU+sUkNVe+DZLyJemTHweBeiWJyRJOgBnvZG/aBZrwgQ/ Z7nnEs0izsNjdd4w0gRVXrljwirrKeLpOE4Wy9RdNIZvRJgfUtpdtvJ0DcYBxYkU9ScZ 5aQfipcntN88+mtSl5LBAT/aTGUfmKVIk3VCNpEgY02WM2BnifYsgRyaea4yF5njorqa 51fFzJGLutud0ihmUPrmAzzmBJkJ4ZgUsk5cwNm70bgawidc5D80XwfJinzcwnJmEZSK WEVQ== 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:subject:cc:to:from:date; bh=TbsFpUXum+QvUjlS77RH7QD6ZjQPYpadh9lYPmgllV0=; b=J6tJCNd9FCz9yg7gItlBhB4n1tbpFTWV/sEsJp2uKaBJqzWqJ59zzyMFF9jXQLFS+4 zHcD4Ia/cmp/p0KQDDGc/JogsKmVSN/KY+qY+SvbimMTQT5DnaL2QNDi5QJObWm8yp7N 1kMAyKGh4bPTFgU/k37/bT+XVIJXNz8m1tCsx4K708IjfrMNEtzXtc+LaXl4vTijAgP5 CqCb0jFyGCT1kyaWg7IcY1mRo9W03gxLO5kIGtj7ij9yzOJHU3VFRfu23qdt+tAyPnNI lPJRywBf75YqGrhZAreggNfPZdPp76Gq9Jt6WiGUNBWp4FzRe7D+VxjYGj14lD55RdFb srCg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id f25si217380lfc.3.2020.04.21.11.57.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2020 11:57:14 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03LIvDwP001851 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 Apr 2020 20:57:13 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.53.234]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03LIvCJG001917; Tue, 21 Apr 2020 20:57:12 +0200 Date: Tue, 21 Apr 2020 20:57:10 +0200 From: Henning Schild To: "[ext] Q. Gylstorff" Cc: isar-users@googlegroups.com Subject: Re: [PATCH v2] classes/image-postproc: Add image version Message-ID: <20200421205710.6ed85a24@md1za8fc.ad001.siemens.net> In-Reply-To: <20200421204939.0ddaa020@md1za8fc.ad001.siemens.net> References: <20200421150134.30325-1-Quirin.Gylstorff@siemens.com> <20200421204939.0ddaa020@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: Q2iSYFu4dgx3 On Tue, 21 Apr 2020 20:49:39 +0200 "[ext] Henning Schild" wrote: > On Tue, 21 Apr 2020 17:01:34 +0200 > "[ext] Q. Gylstorff" wrote: > > > 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' > > Looking at > https://www.freedesktop.org/software/systemd/man/os-release.html > > VARIANT_VERSION does not show up in the list of > "The following OS identifications parameters may be set using > os-release" > > So i would conclude we may not use it. I would suggest either finding > a variable that we may use and debian does not use yet. > > Or the layer with the requirement looks at BUILD_ID and sets a custom > ISAR_RELEASE_CMD to inject their clue. > Here is an example where people decided to include the date of a build > > ISAR_RELEASE_CMD = "echo $(git -C ${LAYERDIR_isar-XXX} describe --long > --dirty --always) $(date --utc --rfc-3339=seconds)" In fact the string one would want to match is probably the full BUILD_ID, if you append your own stuff and do substring matching you might be looking at multiple BUILD_IDs that all claim to be the same "version" because you are not bumping the version with every commit. Henning > Henning > > > + 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" >