From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6815578895823142912 X-Received: by 2002:a19:4f48:: with SMTP id a8mr124731lfk.174.1586875621453; Tue, 14 Apr 2020 07:47:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:488:: with SMTP id v8ls499887lfq.9.gmail; Tue, 14 Apr 2020 07:47:00 -0700 (PDT) X-Google-Smtp-Source: APiQypLIgAqM7Gw5HEC6LHoYPthkSvdVGGpMHmzoPI+2hbHjnyjmepAiFxlAYJp+sJ3212XCXPmn X-Received: by 2002:ac2:551e:: with SMTP id j30mr106638lfk.179.1586875620824; Tue, 14 Apr 2020 07:47:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586875620; cv=none; d=google.com; s=arc-20160816; b=J8RXZXCXdEgnv/5DKS+HAEUMvM11aXXQJUAOLwJPKkIrnKal+q3q62AYxFVlJdfGTm FpzoTygqdP5ywr8G4hqZEqDjO5M5eAqhtXJP6ctLFZbCzJKDt1QAhxsCh9S0TrVT9YRM MNwsr+o8QRDofvD58agnbiI4RNr8pPdaNV81SXmSmhvFgcFCmDTET5DEDbe7tRAvwUru SLc89BQYel9pLW5NqxNFH424cKGmEXAomSfdfjzIDCIpYnJyQE1lt1iPPdSM9jVkq2Js J5qND1vr0I8/PxxfV9nqzVTHryih9Wm3yu35/+NZdcHrkh4cGpVhWl+97DaZTUFd7hss dO+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=etOo43uX7jOXIitCK+jl49VQbwR43k9L1E/iXTnvEs8=; b=rggR2oTg+FgBAvSIADVY2Bt0HNnqH9QDk5pFyPC9v/Jg3cX9pgYKSugJUx4gZiHFWC b/m+/ucrtUKLnf4Dg+jJOYGmL6B887pCgEYH0lpbbFuzF8DQXMihqLezByTJ/NGJkwQr ZlNnuinKQgGGZQ93IT6bhyI0GYAl2rWzzXV4iErUVjEgQZwkLrti+LoZAKmHBHFjUMe/ K8DWjoRWkWBuJudTFHXP5cZtxU4JfCup50fPzQxdCY0kWCyPARSQJpfXQamwQzJHMXjM SnngY+4QXBTLizpRqqtKHz89gCwneVgFG0WM7N7/7Ai0zSLor2QlaJQeXMSfYHx4y/iv iCEg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id w15si714220ljm.5.2020.04.14.07.46.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 07:46:59 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@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 03EEkwL7010827 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Apr 2020 16:46:59 +0200 Received: from md2dvrtc.ad001.siemens.net ([139.22.46.75]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03EEkwFS013566; Tue, 14 Apr 2020 16:46:58 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH] classes/image_postprocessing: Add variant version to os_release Date: Tue, 14 Apr 2020 16:46:58 +0200 Message-Id: <20200414144658.433-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LT9sFvH93P1J From: Quirin Gylstorff to identify the image version in a human readable way . 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