From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6815578895823142912 X-Received: by 2002:a17:906:7282:: with SMTP id b2mr23358376ejl.161.1587494983125; Tue, 21 Apr 2020 11:49:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:2a99:: with SMTP id l25ls9010146eje.0.gmail; Tue, 21 Apr 2020 11:49:42 -0700 (PDT) X-Google-Smtp-Source: APiQypL4OAEv3nZ0kyedEoVgpGHb9NSyJtnaVFnZquHGG5eRlh/uVZmFIdYV5sEWlPqAU4ZTBiuh X-Received: by 2002:a17:907:2098:: with SMTP id pv24mr22940937ejb.22.1587494982580; Tue, 21 Apr 2020 11:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587494982; cv=none; d=google.com; s=arc-20160816; b=trLyngxdfPZjL0QAT/081lKE18DPOLzBu7K6BRhglukxnxKILOCKK09i6yV1fMSC/R K+p3jvK7fCR60ISADFq1jnXpkx8nfIfMZ+Mo7DSZcUxiCpqPSxkb6kFZsyLEE8iO+o7N gNUf+CC8OlBd3VoXk5MDwg0yUVOFTQjLvja5y8DAYgQWk0qsWSVCgr4vc656gz+8w4HN oxwteWOuGK2i+VXFWY9q9gmupGq5ZYU2d52gMVgUbLm93Fo+98yp7QduKIXMdYYzVp3/ bb5bww2r8P0TBC/5Q0tQpfoYlwWe052gsbGc6Z0nO0itgvVkBBD5+ItvmBQg/fUqFFsK upCA== 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=toY827xu125+Hw8Qii1/i6w4kOtWO/56FlL3r+PEGQw=; b=kMA+mC1cV22X1sYNmB1jUmbzbUgcSn2Ip1KEj/szIYBqP6RuVdrVxx9gWu0z+9y/Hp Ru3zo6+xkev+zryHmeVUz3ypH+5vkYOjufhxDFp+hWksVue2iAmP+ero9W6hOAForWtr /O0qHjoOctXHWkUJVvlElrUvuAMFNnEO0+z/3739h1OlpV9cv8P0tgGx03VlVo79HRZm jpsJ7vHUBLBDwwM3ckHfShC99KIwO0VYr/SxsDxJFGQHGIB7s7/4L6Ynbhw+m+aOwaN5 UfSiuG5slFlg1VzHqLDcq/AWTfps36BVUh6FI6Qmg9MuFMLEY7s453q2WJwoNNhtGcJX Kf4g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id f24si169154edw.3.2020.04.21.11.49.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2020 11:49:42 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 03LIngUD004309 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 Apr 2020 20:49:42 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.53.234]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 03LInfMR026229; Tue, 21 Apr 2020 20:49:42 +0200 Date: Tue, 21 Apr 2020 20:49:39 +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: <20200421204939.0ddaa020@md1za8fc.ad001.siemens.net> In-Reply-To: <20200421150134.30325-1-Quirin.Gylstorff@siemens.com> References: <20200421150134.30325-1-Quirin.Gylstorff@siemens.com> 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: +X+khqc5eljR 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)" 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"