From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7026321669488640000 X-Received: by 2002:a05:6512:3b0b:: with SMTP id f11mr14639470lfv.374.1635942999490; Wed, 03 Nov 2021 05:36:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1314:: with SMTP id x20ls1221428lfu.1.gmail; Wed, 03 Nov 2021 05:36:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRZHGO+JNwFrYofZ1RXHNDE9GVB0uST4pHTmDKLMnhgooKL/r2FwZUc3TVir45G7X0ZVYV X-Received: by 2002:ac2:4bc1:: with SMTP id o1mr40145788lfq.520.1635942998451; Wed, 03 Nov 2021 05:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635942998; cv=none; d=google.com; s=arc-20160816; b=B7lLvBrcyO8KI4QDpm3050OCinbrFpIGsuoXQEnxWHTJD8/unfiQICQjO7qrfAj4on 3gZ05UFm2TV4+weq8l6gQ8yez6JfOsdAdgKIszH2hGj2bWZzgXTaIgzG6G1TRH6fMtbY Dx4t3wtP1QG3LquPHqspSwO49/BEba1nbvacQ2H1+84/w0sqw499kc/7VwrJCtRt43Tu M+Ob27OH0Clkxo1APiHjLIvm4eqpZhNZ3PNL6wJrwlM3YQ9JuJhPZDf/2a4dbbzw/nQm PEe+rvOaww0FXp3pgUxiGfp1HmHcTtm5VFZTQHy+/4yvb/TfqpkU0UP4NJlXpEuCy9Ei 0krw== 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=eyeP3iVascRyoOwke/UA9E3hhyIbDd7PZKZEr0gfzbVhW/OG2AJLoyaq+VM+wHxFAU jH/2xmX6w9dd0zdMX9iYeWaa/0O1v/H19QkacB6yBKgLQWELQ00Lls8I9m3/iG2wnq5g eRa4SI96aYu0w7rcmNTXL0dJyphZUIfBEOX2COF2Uh+fCF4D7pLBmvPy3H0PB+UQbbdJ H3UbxUAu6yUxlmgYnnGoKTAY9QUlBxK5+dIo1RbhoTdSRSVQuLLMyCnXBb9OOJb60a0M LI/XXl46nd4aweJ140aakA6PSZ0lP38J5rSxqPgF8IZWCNRSapIXRtPWKfDa3OIZKIDt M7vw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f9si45307ljj.4.2021.11.03.05.36.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Nov 2021 05:36:38 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=felix.moessbauer@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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 1A3Cablx008029 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 3 Nov 2021 13:36:37 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (md1t0kac.ad001.siemens.net [139.25.68.224]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 1A3CaXaA009791; Wed, 3 Nov 2021 13:36:37 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v3 2/2] Ensure generation of /etc/os-release is idempotent Date: Wed, 3 Nov 2021 13:36:24 +0100 Message-Id: <20211103123624.3015125-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211103123624.3015125-1-felix.moessbauer@siemens.com> References: <20211103123624.3015125-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: zNfnRzrHPr4k 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