From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7073124415948455936 X-Received: by 2002:a05:6512:3984:b0:447:6097:fb8f with SMTP id j4-20020a056512398400b004476097fb8fmr170150lfu.166.1646840113025; Wed, 09 Mar 2022 07:35:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc07:0:b0:247:b308:7b8c with SMTP id b7-20020a2ebc07000000b00247b3087b8cls505864ljf.0.gmail; Wed, 09 Mar 2022 07:35:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/p6i4DApegZZ/CKe50HEKdN8XQ5vok3Lox240vAyXUmW00iN0u9f3QdSP292LJJYdJILH X-Received: by 2002:a05:651c:104e:b0:247:ddf1:2f7a with SMTP id x14-20020a05651c104e00b00247ddf12f7amr7960ljm.175.1646840112038; Wed, 09 Mar 2022 07:35:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646840112; cv=pass; d=google.com; s=arc-20160816; b=iAFcEhKBHnr6Cs9o8CBclb9HCwlN6xbv9+QllMK45VEMpH0+sekH0Ry/spNlITWGYH hQiWsOKFrNlJQeVdYZV1+ECJXdRHs6lR2f3U1ivsMkRp79bbOzuduS0/4ThhL7AnBv+3 heqU9f6gA85FVXA3m0LRuYO3ptyZ8TnQ1wdt6rz0OAkAPQrmakc4FtwC6qn67k6ON3XP ONYtXRDDk0vW4Y4z+1jWjHlC4nLRSHjks4b2hq+x+Dx2nsqh+T/rXIaxQkXXdd1g4OL3 PKDJSn27kAQyq2EAiRr+1EbSTI9XFOt1y7dMQt+IO7go48lSAzT2wQuKzCTGrM6sy0Ai 9uug== ARC-Message-Signature: i=2; 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:dkim-signature; bh=ITRtYWUMOJLfO5RVTV1ZVS9tV0dG5iPdnPnxybyF+vQ=; b=kh/xQUzip5K4rBU0upkZnFs+BmoNgIwPx5nQPPa81A2PkGmUwqm6++DnMx8wwVsH9m jJAMFJ9/tZ/KQFlnhVyG9AN4lTZReaf+AT5S4tDSjoobzqpwCnxpJz5gXOA9TgToq1a/ ktwmKoBHvtrnPj/7sfHJg/9qqGzVInyGnjIZZuW+PBUvB4rs1kRgskUELSI9ZIsGXtaw Fvqb+VeKWtTyMkY36Iu/eMESmaljh1Jsz0L8YgJ/o+irWb1bX4lYUmxgqeuxoPoPooc+ hSYMd9YQUHUc8LHRKBQK8wwBvLpgUyJXBzfVegXgtOk60y6qtQnfSmPZSen0h09E4GW1 QiOw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=qNj2IOab; arc=pass (i=1); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe08::617 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0617.outbound.protection.outlook.com. [2a01:111:f400:fe08::617]) by gmr-mx.google.com with ESMTPS id y10-20020a19640a000000b004481dd0bdb7si110954lfb.10.2022.03.09.07.35.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Mar 2022 07:35:11 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe08::617 as permitted sender) client-ip=2a01:111:f400:fe08::617; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=qNj2IOab; arc=pass (i=1); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe08::617 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WCGE44l7A5zlFJSLEO0wFrBWXvhClbNXQg7f6O1FFq8cA3/iIST9vpBUGi4tzrHmdXu2A8pSxL9xADa+yCPUiZPdb2qIFxV2+q5ppazrR1HOhCQG393fzP7MChn5QVmV8yUpBX1M2ynULADwQ2AKNU2BOhZQYYcd5Ye7TEbrQgWpd+pvrmTslwpwe26Wct+VId1+e6z3RsS+fJypD9+bDcBZCck1SV55iPk1qQMfb33HirDyW3bermp0CijRwy7GKGSVaLgrEAQaSQXsydTSp4br9tVZ6i3PIVgbsHUPZfAF31TND7fa9NCuyXnxyDKqZV+t82D0Q5CONhViivqigQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ITRtYWUMOJLfO5RVTV1ZVS9tV0dG5iPdnPnxybyF+vQ=; b=mmsDWXDwB5QGJGKpDXBAG+/0YfopTbwRnV3qUoytR5whxW27asf5Y3xizJY9pXmFBDNY/GbScse9hTu1hUyE3QAXNaJmeTCvf7Q9d2j2IlMDgedz/LGE4dxxxMcrLCMG7O9Qc4gNRJUAvH7FLLOaTRBV3v5dgy2ydZrTx3POSbcNhy9h6mozK/A++0F8OxWuKy0u9COSfXXvjmjHtTMysYsZ3dVn729ZeMZ5yjY8JymBMgm80+Dzyx6tdg4S5yS96Bz2sYjcdy4SxSRR64bJkfHwXwlVM8Mwa3WfOh/jGTdclOLbRF/565ccKbVUWnfNz9/jEeHQR2JJhj1265o8Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=temperror action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ITRtYWUMOJLfO5RVTV1ZVS9tV0dG5iPdnPnxybyF+vQ=; b=qNj2IOab9hxOFCgWIgeomxgaviz/ksEJ6pMukyt6sVgLsXCTOuUxrf6k3Di3ANoikepNTzs7Fdw9XbvsS7GIasoRyoRrp5g5Sa2DXhOSuiRm+rPwBHMsx6dBfE/TAg/irR4rsvvXyJdytzcZ6IQ7DWBm8czg3RO2wMpfb/7HNBRobOu/p2s8FWgeDx+r3waXYX+7vT8CdNlJt2+mf/rEk3VwT2hFMETv7ozFvEue4o4rx6cwn7DPYX2/FRUtPpxushGX2oXTC49fHqodE/vYmoCHEwQ08XhFaOZLi+LTdbO9Xb70iSoZnFM9Guyk1JgrtB0/6LEq/8ApHPyUbbFo9g== Received: from AS9PR0301CA0060.eurprd03.prod.outlook.com (2603:10a6:20b:469::18) by AM0PR10MB1972.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:43::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 15:35:10 +0000 Received: from VE1EUR01FT055.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:469:cafe::eb) by AS9PR0301CA0060.outlook.office365.com (2603:10a6:20b:469::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Wed, 9 Mar 2022 15:35:10 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=siemens.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of siemens.com: DNS Timeout) Received: from hybrid.siemens.com (194.138.21.73) by VE1EUR01FT055.mail.protection.outlook.com (10.152.3.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Wed, 9 Mar 2022 15:35:09 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Wed, 9 Mar 2022 16:35:08 +0100 Received: from felix-dev.test (139.21.146.185) by DEMCHDC89YA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Wed, 9 Mar 2022 16:35:08 +0100 From: Felix Moessbauer To: CC: , Felix Moessbauer Subject: [PATCH 1/1] Ensure generation of /etc/os-release is idempotent Date: Wed, 9 Mar 2022 16:34:44 +0100 Message-ID: <20220309153444.1885926-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309153444.1885926-1-felix.moessbauer@siemens.com> References: <20220309153444.1885926-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: felix.moessbauer@siemens.com X-Originating-IP: [139.21.146.185] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC89YA.ad011.siemens.net (139.25.226.104) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--9.824700-8.000000 X-TMASE-MatchedRID: B6KhYplEuGcCe63QgMkVcVbmKN2foe3AXOFTT+immjZ85pjA/x1xfmJ4 2+eEOm5wQXAiEiGnHpMTz3zRCzxSYUoDGBAVRyRVr3pkKWrGJNCZT0mCrGol4F67ppG3mtjJ2gp +A6golzaeI1jwWXaeI1Me5Blkpry7rdoLblq9S5p05Kn0y9viBmgO84xrp6eengIgpj8eDcAZ1C dBJOsoY8RB0bsfrpPIx1FPlNAAmcDKkT4qm3MMWzIngNivLFDmjoxLzNlS442JbMVS79sT6p6oP 1a0mRIj X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.824700-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 5835C3439DA33458FC2D7999B5EACE0F187C69655F20CD4DC9BF3FC483C80C262000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39a86c95-141d-43c4-78fd-08da01e264eb X-MS-TrafficTypeDiagnostic: AM0PR10MB1972:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xqxTEtOi69/e4ll0GRiVUzMcl/UUmU379DWYyFxk3pMt5z2a51EDMd+O2umsY6Rhe5iQ3d4mTv6OS5smZjdji9ZoTUhFHdspO+9hVWjh2IjCaOWH50ORix7A5IuljWQ2GEqgTGXzdAYfGoYPHCEpnMKmBYQXqIqbgSvfr/Z1osana6U998SxAx1QeNzWTsJK4iw/0eksX6q0kjvXIVMcAWSwlWLMG0xFiWhEqjZMqZEhvsYtwPaEv/7xjpMyLK284TWRWxKc8VmZrW7cLMqpP+R3EXlXYIi/gp3V081Cenu4mgsxiRGGvKigmSbV/hRW8d7wCdnlNNfHnPpnHhhoCrbqhmRCIUVoalkTBeezRSlMU6da0s0TmutFSXIhi6nNamretHc2xmpoMWhfwz88BJJBD9+PZa0MA9mA3jJOuD6EDOqPlLtrAS+EuI+UmzNBb55wCyu75JU1gR9AGDPHJcEPSBTIazRcMiE/4gc8IhFNsH9Xpd19sfhpIzlpt7luBZR0VuLDfZj5ovChkXsVjvku6xHAgWy0VJF1m8zEN9uM2E7FD/1L7NQnPlrFJ2iFMtNPAkLW9IitkegGlPsEBSLUqFA1qlbCoq5g8czvFHyayurB/iOwc0v5uENhb5IF9zyaHi7EHkluiu6hxaMF+qEMB5lJwZWlhL8WGY1/g472OOXL7rP1ABnstc2IuPbQamAYfgIEKwkVBxNobucuGg== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(5660300002)(8936002)(82310400004)(81166007)(2906002)(16526019)(82960400001)(956004)(186003)(336012)(107886003)(1076003)(63350400001)(63370400001)(26005)(40460700003)(6666004)(2616005)(83380400001)(356005)(508600001)(316002)(54906003)(4326008)(70586007)(70206006)(8676002)(6916009)(36860700001)(86362001)(44832011)(47076005)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 15:35:09.3267 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39a86c95-141d-43c4-78fd-08da01e264eb X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT055.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB1972 X-TUID: GMS5o10ugNtg 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 3f00c21b..ca520273 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