From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6815578895823142912 X-Received: by 2002:a2e:870f:: with SMTP id m15mr381549lji.16.1586876140105; Tue, 14 Apr 2020 07:55:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b4c6:: with SMTP id r6ls750689ljm.0.gmail; Tue, 14 Apr 2020 07:55:39 -0700 (PDT) X-Google-Smtp-Source: APiQypJAv+wLxtSL87ezWxpT9f8Yc+eAFf+2Etpq3MrRpdp+O6Yl8KIRzl1fvqovlMJ90bKZ+9/x X-Received: by 2002:a2e:3507:: with SMTP id z7mr357864ljz.111.1586876139275; Tue, 14 Apr 2020 07:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586876139; cv=none; d=google.com; s=arc-20160816; b=TDBVFF3rlaVGgd5888YCirEc1ItGcm2vKJzYaawESn+uoKVfMa1Jqm7kUdJaDfc2CC 5IZUc1oOY80dfoOi3GwGre4dplrtBGTURnmmEJ3oGDTtZaP4P9Hu8+qpo7N9xvGmvBgb CAltcpqIf7ssLyfaRb7y6Fy9Yszq48QQPxxd3/QxzoZgA04OBWhHTWgo7NsVqyUqEPqB GTeW5S//dH1ztYgXrRI+4zmqp5MH0GDHsPCQGE09pKPAHOtnexl/WLoBiMbapVggi8tt LgyHqX6GtOwX5Q2lKKRiOgRgGtoHaNy/fxQmyxlc8IntrZnmxg9rNPFvCJ5jOeXs6l8p 6SSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=tjzLVnZRthj3Se5M0Co5qEqb3gAIvtvAwjtxZsX/SjI=; b=sBEooQwWGyzpc4lGQvZlf8QyJV1GEpixCTvdhZ97FBI3SnotdxlqA522BivNOCJ94f SUph9NHfxrnbSKumHN8z3R9TCR+GUki8TWxuoasZ+tCxfxDjoolhyeDTkeQF4lYgZz/f Nd0ws3pWfPE/NfPFYcWbNxAYS0zpNtwqrKwpMzF5EFtOpIrNwRZuxMMf5FQWdy/hm3pP mUq+/BL4L/1xT6XadDWZRaoz7oOTkRztHpzC5ofXf8S91XJJLxt8SGHR3hqA7KwEal4E k58eRJrvaQ4ZW0nVdNAHRR9jBsCwXRK6ss8V1gOLikyHYkEsoeIP2JMin2vqS76B6fnM Bi8w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@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 a12si15465ljm.2.2020.04.14.07.55.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 07:55:39 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 03EEtcP0003823 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Apr 2020 16:55:38 +0200 Received: from [139.22.142.2] ([139.22.142.2]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03EEtbHO026681; Tue, 14 Apr 2020 16:55:37 +0200 Subject: Re: [PATCH] classes/image_postprocessing: Add variant version to os_release To: "[ext] Q. Gylstorff" , isar-users@googlegroups.com References: <20200414144658.433-1-Quirin.Gylstorff@siemens.com> From: Jan Kiszka Message-ID: Date: Tue, 14 Apr 2020 16:55:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200414144658.433-1-Quirin.Gylstorff@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: kuI8ykcWK+YE On 14.04.20 16:46, [ext] Q. Gylstorff wrote: > From: Quirin Gylstorff > > 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 > --- > 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