From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7073124415948455936 X-Received: by 2002:a2e:9cc9:0:b0:246:204a:6673 with SMTP id g9-20020a2e9cc9000000b00246204a6673mr2308421ljj.71.1646899646962; Thu, 10 Mar 2022 00:07:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1a13:b0:246:6680:f7ba with SMTP id by19-20020a05651c1a1300b002466680f7bals918934ljb.10.gmail; Thu, 10 Mar 2022 00:07:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRG354KFqcRvDGjborvRUV2v4VcTX0HxTcVr96c22Zd9jFT9U4MkN9DkbIYR9VaBAFf1e2 X-Received: by 2002:a2e:9aca:0:b0:248:5a5:91cb with SMTP id p10-20020a2e9aca000000b0024805a591cbmr2149197ljj.33.1646899645986; Thu, 10 Mar 2022 00:07:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646899645; cv=pass; d=google.com; s=arc-20160816; b=m+wf+bekzeyslXxTshNa63NVhinlb69whXEQNbhrkNOoFVTevgaqjEEr108Xsg2DIA omKJ1fzO9lVMo7ShhlZzEtqGC9OM3GlOwcEpRDbrWhOPPJpZxCfUEUE6UMr1SeiyMrds Bju8LmjH9lrnvaA7sju1Me325JxkduTfhVA4D4MtnqDWo9iqbHj0VS1ioy4anHkbNXW7 3sY8AN4fGqY0MdeWpyIIf+qQ5o39L2DgapHnz7+OGwMDRKdFvSG0w9tYGSDTUuQdLS3Z OPpNst3YekbUUkTflXjVDfIOF1XZcJZ0/e2jHzepopZ/KRylYcOXBQ8BWW1NoP9id94d xs5w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=cEdeBau4ugz5f3R3S6Vrk8Z5v3S3XmeHko2eKgBolVg=; b=p2UaLAnMxMgybcDhUa04GNl91NSYZN8sLX3vs6VtokHcvmbawiaNnBTFp6Tu6WCh9v uGgFFFc3tZL4J7zdvAmiLPXXQ4lV6cLWi9J2ZAFbTeAwd1TUULvw9ly+TNgVbCZJfIJN Cxx4JY6ceeFWuyTQEP4iwVQJJ7YL4RpXmPjeNUKwdonKeGIUnv6h+NChXGSdOM2qo9zw +44HuhVgqg6VjP1f6+06JoJvf+eJuln9EwI6aFod9XXHp/w4naAWZBQ9/vP4tHmRJs0M /RYVbci2nyugy00mwGviNEpLQeo3EDsQKSgOQ3FKfDlrtG34ztlmu6iLqh1R/4xDA8pP U4WA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LU4szjE8; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe07::60a 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 EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on060a.outbound.protection.outlook.com. [2a01:111:f400:fe07::60a]) by gmr-mx.google.com with ESMTPS id p16-20020a2e9ad0000000b00247f6f7df5esi306650ljj.7.2022.03.10.00.07.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Mar 2022 00:07:25 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe07::60a as permitted sender) client-ip=2a01:111:f400:fe07::60a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LU4szjE8; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe07::60a as permitted sender) smtp.mailfrom=henning.schild@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=Y3JSTQ91W5ZSs0j29uv64GDYB/aStQZ/mcZHkOEZ9Fr38Tf7nuLeXMvX8gPZNbyCBqUV6N5MSPxOnrocRlR8bSVnJINh4QQT5QSV5BswJvuJqI0zyPTUHdMy9CIr19vhT0CM7c8xnMConvxDE1VNJiOf9IATaJv2Kdjpl5PdORuprew0qUpw6GrEU8UGRxLJgdeKxBLiiMm6ekBuhJ5qgwhniaveUf0HZtY8nztIz9eRboq7ii4kKPAARBn5XLBLTJmNpGG7AcsAn6GA2JHL3jIJZNB7n5B3ymT8zywiwK6KwjHM/zRR/ExD68nhKp8wCu4iZw9eHAdFwHN8TJZdBA== 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=cEdeBau4ugz5f3R3S6Vrk8Z5v3S3XmeHko2eKgBolVg=; b=JMeLlPYW2MbIiFXrBvpvR/NGQ2edj/JlRKlYL1o8TkUeDcsYQm+eTZoM4aQrd0cg6PlJco/SgCTkXsh8pW1kqy9JBE1vO8/qdrT4x755M9HrqsSFaTIKX6uySUDRWI8NqbPxofaNg+yRSE2DQlHIjU8Wqm8VJOLGIK0O1BoIqLziOZJOARpLVVamWKoBu2DR4Suc1oADgQ+69U/cKAR5DCijumhD0AYxobumh2PM8CZ+8xnRjMnf411IBznL0JELgHNeCxRC0Xv7JMO93bXzz0qBmjnJ00oHFsC+bYufq1RjVXUhl08nwF/ZSYqeQQ/+d7qja3vJUC4Qn0wK8LoKxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=cEdeBau4ugz5f3R3S6Vrk8Z5v3S3XmeHko2eKgBolVg=; b=LU4szjE8vYM/x3TMPd/q0lHRTxG32xW+GrLKAK0AmzcvVE90vNMYdGBxagYj0zdm1vo61oKU9afRY0KFdMjyA0kP1aVDFt74Lw210QDblAc+V+NkzT+iEfW/sq+hL2Nehv/qlhguiae3ZvnpSBE8FJuNvwk36g3/K0jqVLl1pUrXwJCKzche11uCIums5/YTJgK8yEotB8osLUQe/rnK/UeuugdiVlQM6pJjNQxFkfreP8LAeIMAehpsEo/4vNRU56fDveYLpc8vkcqCBArfI5spGlxu5Zf5fwhFnWEF0+AtOEBI3cKWr6cH/vQd/nlrA2tsKXu1isYr9MQe9rkQUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) by AM7PR10MB3173.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.17; Thu, 10 Mar 2022 08:07:24 +0000 Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551]) by AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551%7]) with mapi id 15.20.5061.022; Thu, 10 Mar 2022 08:07:24 +0000 Date: Thu, 10 Mar 2022 09:07:21 +0100 From: Henning Schild To: Felix Moessbauer Cc: Subject: Re: [PATCH 1/1] Ensure generation of /etc/os-release is idempotent Message-ID: <20220310090721.1ecc4cab@md1za8fc.ad001.siemens.net> In-Reply-To: <20220309153444.1885926-2-felix.moessbauer@siemens.com> References: <20220309153444.1885926-1-felix.moessbauer@siemens.com> <20220309153444.1885926-2-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR06CA0322.eurprd06.prod.outlook.com (2603:10a6:20b:45b::6) To AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6384030-6c8a-40d7-6b59-08da026d0295 X-MS-TrafficTypeDiagnostic: AM7PR10MB3173: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: PfWmhIR5uVsZvmahORqNopJ8itciPocCPkxMG9DAVN6539INDOf7JwW6l7pn8DxwQxsABL/wz5sxVfer2yVNaRtLKjaN+zFA4nEGoKcDyNschCxMMI/X44ybE3DiIh4bzvCLqFst+tJNDVTm3xHWgZ5lbsq6kFDvsR/9fSf2Q5fMGf9h5N8OM5LBANXtwYiI9ueh2ZmCz1kUboEt/Gu+sTPzPh5hTIEmMqD2zFx1lpPz4/3YqeCQ2zBt+rEho4lx+QRG3cu/d0fmazB939fp6PkOWkHdfd7ifjYWa4zUPwiVimtT2hOFgh8hLKl7JQZXg0Sn8aiwGz9JMRDzlBkKQ4clTURIC8sy8hrz6egb1UzMTvhdVKnXsbCbkyDn9zvpDI630BmtiBkk5lTxfepCExhB/A/rbZTU4zwp+sNlDkR1ugJARqbmJak5OMtCVAlMagb7cFXwjE+YFNlwd+TD/xuDcW50BshAFPKPCT3eN1UMsJtNyLmrRK086+K6kFFbQtzxJP3Vzl9EAoHtGk7N083AL64QY/B2nvTiTOkSPss0tMa990mWgyp/CSHO9G18xByS+74jIS7fmt2uGvOFu/YgAI/OrZCvo719DDy/sykb6tVa8+7ENVD+IiNEbDXxWht+yTC2eNlqt8m7bbezDA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(508600001)(82960400001)(66556008)(66476007)(6636002)(316002)(66946007)(6506007)(6486002)(9686003)(83380400001)(186003)(1076003)(86362001)(4326008)(44832011)(6666004)(6862004)(8676002)(8936002)(6512007)(2906002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Zbj7KP3ejuzp+T+XUhZKqnmt6+Hf0s+i7Z2iFUXjkKu5X7XCr4f8fBWxJ622?= =?us-ascii?Q?R/mlMejtgk+jhUpyeox0E67QJPRw5So0FLrcpQ3fvmr1V7GpNf4qDXFfxeax?= =?us-ascii?Q?VIquIX94wifBwjZEZSZ1p6zEjtrMOGHVnTGRabDLOTNnjm3X6sXgkd6rSDaq?= =?us-ascii?Q?uvhXJpT5cdQrf7W9OwTCFU4FX8dWEKX2Oa4iHYIuLdaO+9naVzkW67SMjh6h?= =?us-ascii?Q?9/P2BFnQbsnAzX7ZWCMEWCkxq/PYULUOnb0oRQmV538UuEHJIaQQhHVBM105?= =?us-ascii?Q?jKCgIk5zAQPW0m9CSYGxldHAnRrKr/bD4So0FhANpQ+dIxaWm8C6Se4umtG+?= =?us-ascii?Q?FhmOhy8KrRXKiIBJA/ZNAaqtUBwRK3XHjYKxRmsIJOM2pmauTWJX4nSOCfgI?= =?us-ascii?Q?wC182bm6+qSf5MT0UijU9UOIiXKOD6x4HMytT/AnxhVSsJmSTV8Lh5bklDjS?= =?us-ascii?Q?nXw8WFsIg0BSK9zc4Y1453KNDwtf3R6vTPUZevEWIXCUePtEuVAMDjK8QGOZ?= =?us-ascii?Q?fFA3h5TQ3qZIuz3DRU7sBdTkMzlyqoo5OkdUwlYTqK94Ax3d+22CPO7moJEo?= =?us-ascii?Q?7Gib7m+nQqyPNeLyoKwP1TKaaqSd2GdijcDgnmkNZz9r0MBPqsDk58FGfKOm?= =?us-ascii?Q?2x4nfK9eye0PLMnyRf3hjvHYzik7CYI3kDobH7Ez2WU5ujAT15fIeL/A67qq?= =?us-ascii?Q?us3xnOyembuNpAFPdlnhPgrpEbE3DoopKqA3msrtXvXxV+7lr7RIZFN9dQu+?= =?us-ascii?Q?B5ajPwY7BfcejEOa1VeSjBwFZiZmHvda2wDtId3lIKqt8N6MMU3BXhHwTp1Q?= =?us-ascii?Q?bxrZGkUkWpWnayl9/pObp+yRxujlh6W9fVArfm4aE7BSqOmE7TZdvHproIWW?= =?us-ascii?Q?cHWEzASkEvf3UgHcLbhhao+AJjDjchVEdiN6R4VQYwg4WfLCO+QSVUPoJt9Q?= =?us-ascii?Q?sd6+wuCilU9L9GslVLzuOGqA0Eh3FITKNTEy6ycj5NtUuXcc979d2g//RkEF?= =?us-ascii?Q?kbkWWj6ZHcNXG4TexUaS2V3uXvMq52Jl20p4s0fttiDRDsdHYgNjtDEIFp3n?= =?us-ascii?Q?A5VtViSwRD2aPwTSgNzB1FSygtR4q0Ha5o8ZFc3orJ0wwYwCYBPiORJ/NFD1?= =?us-ascii?Q?23GdI2HflVgFyThgsMa5yljwHQj1oO8xVolq/kE+ppJ6OWdOdj1NDzi1RHRd?= =?us-ascii?Q?ivc6DAM062XVvJLDTMdWaDBK7ttQOAJMtmsKRfsIkD/XcXZjtyeyHoeQBihZ?= =?us-ascii?Q?NoAxWhGkc3O/bVJOxt2+jcltceZDVUva/jVpHwsOKCrXo9UMieEOUidBDAos?= =?us-ascii?Q?J1lIory0qrG2TpHoi52s/uuZU8usAs5hrsGFFRBRJw0SslSMhvwlIyGm2HIO?= =?us-ascii?Q?pfDcj4PVKhLrMMXchqMfGSGJlY5sqyAtJsEbpXCNdcPxYlqBlQuhYMT4Xauc?= =?us-ascii?Q?aEi12zjIIXXXQvtBmbZoJq0Ec87RXKv8sWW9xF5X/78ZBvg84LOredA29Os1?= =?us-ascii?Q?hSJKC5NrtPNzd2XQRCbJhC/A0tIijf3qjE9t9gLo/k8TGVaU22gOQZ2KRH7J?= =?us-ascii?Q?o6+oVGT/NU3MP0IXpjohy/m5J66t7HQndL6ETJuHhs/kNhZ3gZgydSREU/5Q?= =?us-ascii?Q?Cbcf8Aqh1Zpy0a7QwvTFfstjRJCc1I+spHOgqn/Qbp8B88DXYYzDts78TAes?= =?us-ascii?Q?suwI5skHu4NQ4jkTzwmJA9QeeMTJWh42e2urrbiw6zw5vbXR7LOHJ1K6oSPN?= =?us-ascii?Q?6Zc0zU6EJPsmz/1Nd+VTwCg/XHTAeJc=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6384030-6c8a-40d7-6b59-08da026d0295 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 08:07:24.5790 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 31K2P/o50OgAZzvXt9kSD+epvFczlC3YxG7zG8QBlyfWcZYI3SYcNmcNJJb2c+L8DgPZ0lfO5TgSMGuwmF7u9MJ+tCXHIYCQL54fi+SwOlk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3173 X-TUID: rUNJ45Q9mI8w ACK Am Wed, 9 Mar 2022 16:34:44 +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 > 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