From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7026321669488640000 X-Received: by 2002:a05:6512:3ca5:: with SMTP id h37mr12995300lfv.544.1636023932477; Thu, 04 Nov 2021 04:05:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b8cb:: with SMTP id s11ls907750ljp.8.gmail; Thu, 04 Nov 2021 04:05:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztWsRCZYRUcsbw9oh2EyrgNa4wNTW1qTujKsvPouZkdCtkrfYPyWOZrQp48qpoJLF0+EYT X-Received: by 2002:a2e:9b81:: with SMTP id z1mr53486216lji.518.1636023931350; Thu, 04 Nov 2021 04:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636023931; cv=none; d=google.com; s=arc-20160816; b=b1W0zWNN4PeYwNUn95Sxe3N11A3oeshkKQX76kq/jnllTCSLFfWaFUGho0kWYBg14n CGfagFrHXOVASqngOAOnvsayXBv/QHbuB4YrHS6UmMVBIIgstrJxewuEj/559VAUpVlC 2a6Eovm9mhuJK2VIGl3xAPDAIOsU2FcDWJhE3TM2kJ1MT6qQlDcrUO25jvmPGBvOi26y ywkC4rDc5kssqFBgU8iOPGzevUcFAPSTzynV0iYBw5jnN7RKP6Sxuju3AL/pT/UO+jOG NwfRQxcN1wf/6n5OOV4gxSf1of8PZWk1GjrGcmlcPeHYKeBr6vKvCU4yOYr93zo2GZ6F vwGw== 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=XFar9JCxZRhro1DpoSx3qMR+qe2tGjaqQhAVdtMbToI=; b=hCqPF0lh018Q8qIv7zGiDR8GIU7x4OXTi0veJkVquprQgQUNreKk9j4lrRaDBSLx+V YQDHjOYhcBOte4o0XgbTi0BGTjGB7sd5F6BFkaBZZEwr124llZoKkwDXVs7Gq16BAdPI h+qM6HYVS1ohL6yc7/Ue37F/90TPfszpYxWXfMX5vjUZPvkxs1TFq+3S7/CDqOwr0xRB 9p2oanoaGw5KkQp6cv8nT09rzMNb4z8nQgDF8EPtB0L4vI29G7XsMu1kZkEAXjyOb+gk raZ8bZNTjgF9iOspRIubyHMp/BZe5dhSHmB3388ZK7TIAmagYpcO8y1ocf9uUr1e2Dm8 5guA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=felix.moessbauer@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 t1si322774ljg.3.2021.11.04.04.05.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Nov 2021 04:05:31 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@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 felix.moessbauer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=felix.moessbauer@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 1A4B5U0T012991 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 4 Nov 2021 12:05:30 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (md1t0kac.ad001.siemens.net [139.25.68.224]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1A4B5IRJ028841; Thu, 4 Nov 2021 12:05:30 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v4 2/2] Ensure generation of /etc/os-release is idempotent Date: Thu, 4 Nov 2021 12:05:07 +0100 Message-Id: <20211104110507.2358692-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211104110507.2358692-1-felix.moessbauer@siemens.com> References: <20211104110507.2358692-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: cd0S4bMUIyM7 Prior to this patch, the generation of the os-release file was not idempotent as there was a name-glitch in VARIAN_VERSION. By that, the script did not detect an existing VARIANT_VERSION and add one additional one per invocation. Signed-off-by: Felix Moessbauer --- meta/classes/image-postproc-extension.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index 6e6b257..87749c8 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -27,7 +27,7 @@ update_etc_os_release() { 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' + sudo sed -i '/^VARIANT_VERSION=.*/d' '${IMAGE_ROOTFS}/etc/os-release' echo "VARIANT_VERSION=\"${PV}\"" | \ sudo tee -a '${IMAGE_ROOTFS}/etc/os-release' fi -- 2.30.2