From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7026321669488640000 X-Received: by 2002:adf:f04d:: with SMTP id t13mr42484779wro.324.1635947172374; Wed, 03 Nov 2021 06:46:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:770f:: with SMTP id t15ls1008752wmi.3.gmail; Wed, 03 Nov 2021 06:46:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxc0ekeF0NPZ6/M3Y1RnMi5W/UcdOnKWgnoQ7d7/iPpvd4f/H1TjU+tH+tmrY33cxMlcNqU X-Received: by 2002:a1c:ed03:: with SMTP id l3mr15769431wmh.86.1635947171475; Wed, 03 Nov 2021 06:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635947171; cv=none; d=google.com; s=arc-20160816; b=S+rwcZCg7AXJEmooIvA25IHuJTJa9Qd24AcdqZtB6csPCa1JCAiKjHHUbAbaHjgbKp tZH3eWiulaEfVrVOP6Ohp4D/IXoxN6mhZ13tHqHJr8CXr6JsVTvKoxmxLRXybbFPdxn/ M6a4Av7kOL/OEpcVVD+pMQI0mVXr+q7CEj/DnUTaOQujaCEVVdaURniFlHIXgNwb8dwh cYPCf8pgu7tnNERSwT7vmkeQDcC4WDviIDEArCo/CE+PUG7Y6UAYIk/eC/FL5u7phQlk a/vniuxTvWHVPFg6Kpiw7vvKTpsHyAB70pNJf8QOpAsSoZtm1BQMxzXIGFmOFP3lvakn rLEw== 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=PcPhmy/pmV6J+Q+MDGG5VP0kkVCcrjB/ZbL7oSqjE5s=; b=ZOuarYA7VP2/gbNkPJTU0INMQBNTzEaOTjmIo1UGOROWM8pGVufHcA4rx4gPKW+QUW t1tXyPhpz4zUO53uUTO+B61C29wKI41SCnz4UOPd/a0XsAKQLINCtkD/fo/rqVhS3aLi gIKnNFSqKXRd6bG0vt5rD9XIXXD1/xkJQbVU7wmYSjlIIwlg4M6RBJ+Jx6IHN5eJqIGo 0KoSCX/7ycJiuwWnvAYJhwoAGjFWzlhIZWyxHU721fIvj4kGDKlT6kjcjheTA+Zzyx87 woqzaG/N3UwcbtVrIMeav3JRg5fQFTpX/dpbKpSqUYaE5DYwFQ/OjEOlg7EIq93Ncw2v av0Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id j15si230888wmq.2.2021.11.03.06.46.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Nov 2021 06:46:11 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 1A3DkBvM031503 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 3 Nov 2021 14:46:11 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.154]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1A3DkAIL010919; Wed, 3 Nov 2021 14:46:10 +0100 Date: Wed, 3 Nov 2021 14:46:10 +0100 From: Henning Schild To: Felix Moessbauer Cc: , , Gylstorff Quirin Subject: Re: [PATCH v3 2/2] Ensure generation of /etc/os-release is idempotent Message-ID: <20211103144610.77847710@md1za8fc.ad001.siemens.net> In-Reply-To: <20211103123624.3015125-3-felix.moessbauer@siemens.com> References: <20211103123624.3015125-1-felix.moessbauer@siemens.com> <20211103123624.3015125-3-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: G+Z1bHbTg5hh Am Wed, 3 Nov 2021 13:36:24 +0100 schrieb Felix Moessbauer : > 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. > Fixes: 78b24427a050 ("classes/image-postproc: Add image version") > 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