From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185240731527675904 X-Received: by 2002:a05:6000:114d:b0:283:aa94:faf0 with SMTP id d13-20020a056000114d00b00283aa94faf0mr1206825wrx.326.1673029167132; Fri, 06 Jan 2023 10:19:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4aaf:b0:3d1:be63:3b63 with SMTP id b47-20020a05600c4aaf00b003d1be633b63ls1589880wmp.1.-pod-canary-gmail; Fri, 06 Jan 2023 10:19:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXulxFZI/EXCoQKWSZTjLOLSKc6S7v42XMZubKyGtdb+dyP7f9h266fJfAs3OUquTjJcQTGN X-Received: by 2002:a05:600c:1ca5:b0:3d1:d746:7bca with SMTP id k37-20020a05600c1ca500b003d1d7467bcamr40402002wms.4.1673029166110; Fri, 06 Jan 2023 10:19:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673029166; cv=pass; d=google.com; s=arc-20160816; b=cf9CiCNt/t4NpegruFtnDqeYquvZrIppPUjBSjiw/OBZ8sG7iAVz6lCrfdNmDWT1kO Z+08YJcBAVG72nHRw7Yt+TZ4L3XpCiuJf1OvDMIaIHg451Wr5X1OO+VM7lvTxe9CfzUz M1mrkBiIOGQ7P2xSnP6RwIGhmPFxPB71Ly+YfJtoGaLj+eK0Rf+Qtn4cnKp7h3JhgLkb ZGxJ1HRV0W7o8Tk0j9WzTSQ8J1gcs0vWD9nkn97yhUM0QWfEZRPK4caqXlTnh9ochz+i W+DtHdw8AjlW0SfkXuP0t7j04IREsIwhesGy49oM6QjFg2QwoXaTFnKALJz34BgARG50 he1Q== 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=QysMUOX1xwjiBluvHFYInQ+gZn7DWWriZtmawL+0EZs=; b=pZ7MrARwTxv8Cy0E54e3INioJc/AQQxl8a9b9BbdAE04MoJY0pCXtFBwcBS+kMOfMg oCY0r0oTIRnzJVcc7dVJWuX4gpQkaGHvaFle0llx9iKTWOWCJbtdYKpmaKJ7FxZGwwhK He9J9NO4lDQE+jHL7S/nSvaulqkh54x2y/r3Qv4F60gMzZ9jTQQc7ePKK1HAs53sdh4Y ZZ2rk6untJZsAJdw2wHZcFKAzAeekj9I9imQpWd035PCqd9opvBIYEZ7T7nJb2QD3AY+ A58eAg0SdC57w+/LZ/7++qGQmsUCk5SlUR5f+8MwZYDnz6BEnsHQX3pQicHiWnDBnVLz oFHw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNeSI1rJ; 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 40.107.20.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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2040.outbound.protection.outlook.com. [40.107.20.40]) by gmr-mx.google.com with ESMTPS id z5-20020a1c4c05000000b003cf1536d24dsi105757wmf.0.2023.01.06.10.19.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2023 10:19:26 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.20.40 as permitted sender) client-ip=40.107.20.40; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNeSI1rJ; 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 40.107.20.40 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=U5IN04FZpEX8gvLMcaqqjb4nqwkY422y6ZhysJvRiTlaMMTNXM5/HwcT2sr4gLC8a0iF9wskWDS5xoFPQqiWJyfd1hdxDwIIuQGahwKYUf23jkx4QITXP1srjkY2vGqXkRfKw6X/jaXLmz3/z31V+xJK6Bkz/9WySPMCxQgDfrhlhW0r50LDAJBrFbGf3FqIobtEb2/cOwBatEBHcbxwiXcyGxTgYaq7rhLoctuajHjTl+OP3qNSYi6UDL7wALckawJ3LBHMzzTjVBVsGbTI3hxCLxLvxJ/ngwwLaw4UMQp48Q2bxuBlvxb/iD6YbtalPacx1lig4gMWKdFDngKu+Q== 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=QysMUOX1xwjiBluvHFYInQ+gZn7DWWriZtmawL+0EZs=; b=T3tSyq6axxRPi1X/lxDk6cp3PS+wsP1wkEyM20isbEAXSPDcEIPr/Qp/1t39C9cjcKFeaavYlJ4Wq7IL//g3TrjpzmgkTgMSXiQaJIfwIFbiSUYG9+fZ58MxuqUXzhu1zw8knQwAv5tsxue0y/9/OxH42yECKD5LZRY6B65uI00mwKZ6iPbduStWsCnuKsJxRKrMWuN4peeALSNKWe54XoeQVL+ueb+5oQPCzDpEWhLYQvqOuuA6Y8T6prQ+3u5x8YVntCFV2YFd7MSK0I8JbRMCzF5cUd44iTXo5Sg0vW91ylWwSfhdJvhCaaak3xOT6V5sxAhjFN52Vdxgs2RwAg== 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=QysMUOX1xwjiBluvHFYInQ+gZn7DWWriZtmawL+0EZs=; b=YNeSI1rJkJ24CND5+Gio4MlUIEGlbsVo9hTfn94cJMXKuI5tAtMM15wcVZJbIQdRUJfdyepPGMk6Bb4KVkHP7098q85AL5kKnqJUmZOfdFgUYu48j2wjGnyfmjcYhzjuUQa5KZe7bRpUe95eFm4FtXHKRu1V+e6aKviaOTU79y21s/7G7m52YafOiq4kEyUUCncfjtEWhNBIxvLSP9MNIktdaWUzebuqLmc0OY5OuKnW6znLdCrMZphkpHEEdKW7JKFBHWcnvx0VaEPwaxzuk2yCaaM7tyRKNgbZykhn+IIdyP0asBZC5P+nNCOshFC6g01jV285cntI3+vyt4bbHA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by PAXPR10MB5382.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:286::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Fri, 6 Jan 2023 18:19:24 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5944.019; Fri, 6 Jan 2023 18:19:24 +0000 Date: Fri, 6 Jan 2023 19:19:14 +0100 From: Henning Schild To: Cc: Felix Moessbauer Subject: Re: [PATCH] image: make sure do_rootfs_finalize can run multiple times Message-ID: <20230106191914.5d03e907@md1za8fc.ad001.siemens.net> In-Reply-To: <20230105184328.25277-1-henning.schild@siemens.com> References: <20230105184328.25277-1-henning.schild@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR15CA0022.namprd15.prod.outlook.com (2603:10b6:610:51::32) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|PAXPR10MB5382:EE_ X-MS-Office365-Filtering-Correlation-Id: 5388d0d3-2387-4cba-2230-08daf01289c1 X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fXjJlVpahjO0vj2orqzK2HjRWxD2P67Ekks1gpWm5o/RAkSzl58+BX+C3D7oFIgKfUYQYA39igjzq6rWQz46C9ne9HBy01GCFVb60ejtrWznOiyLb/N0D1P4ZG07aZSs9/SfpVUrmNewdH+WC990G9zxdguZ9K70jwGF8i9IFeyiSnVFxCNOgSD016+vFzCBlJ93NWQtfZYurztCYsaB9Q6KHgWTQPWgntt39I7VAJMw1MvXZDRLSkCYa6m6cpRVuoosSjuSNiBEoEDRHzTXfAB8AEjyNjXafMRY+iy1Sfp/K2HDbYeKGQf4YYefayu3KGc5ebtPV/SJsvB+9TYfskscyZNIdHDx6b/D/0LnpsoKskBXhyABsyqPTGJONvmABrjMnHFBePrX18xJLv9nOw/Byl46CDmK5z7MuhXy7/GKcgz5DlsFFe/IwQoSzFlfh4NB+YYYi94DFTDgoZQ7kQrYMNS+Ljoy9Qbe29hfDd9cwtTB3XkFe6c2kQnabLewaqkJ3iaeRmZYonLeaLl2ArMBZvJxcUvo/4dO3vFcc1j7uEXAJlZAdv6RC8Y0UafuxNNq1PQNW5QMbkvvkcOg3kPVjkyaaZwAdhoXPPO7V/UkLgUtuGmBa5nM0MSuZlIWUIXUcba7pqMeL3xItWuiwA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(451199015)(316002)(186003)(44832011)(6506007)(9686003)(6512007)(2906002)(6486002)(478600001)(41300700001)(6666004)(107886003)(6916009)(4326008)(5660300002)(66946007)(86362001)(8936002)(83380400001)(1076003)(66476007)(66556008)(38100700002)(8676002)(82960400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HKn84GFqbL4OUycy5kYzP81EsF2cE79fnrbJIsPHga7wI7ahbGTJxKDZ7wnK?= =?us-ascii?Q?KAcD8HEh9NTxZa80hvnhAyVW3ajxK2SG22KbyWKRrDi927KBwytgF8CC/nDw?= =?us-ascii?Q?xaXJ+oJvHO0sfZDQQbxO81mFMzz8uxSDLUDqsoZmIKd3uL7tN3Ki9KRmhgt3?= =?us-ascii?Q?eVtFL9XWRkBta4xrsr0JkPHFa09s0nop8XJ4hMWW9SFv720fFuXyJdnmBBb2?= =?us-ascii?Q?lAXR3GNQKpabuzEslc/924oXrrYLvxPk+qn1uR8gXdz6qqOKJCJWV8QpkCqZ?= =?us-ascii?Q?iXmp7/LSFHFN9SHynJ+eKLzr1gevLD20B4YMyxMO2KhP/0MlAkmuesvpDl5M?= =?us-ascii?Q?0ROpJI1XwuP/o074cSroBigg5R5ZiSk5N5MXDWFCHJ+K31eQgo2JavBxO9B4?= =?us-ascii?Q?fOjzEvA7KK8k+uE6gQZGOWMv3kRb8zJVf7/PHlfviWlbJ4IQoEKVXa+XJX1a?= =?us-ascii?Q?WT81m0c3We4oUGpSqh9DmsJ7vguuNp82XQo++XjSat77onB+PvagkLixxCvF?= =?us-ascii?Q?Xr/SLjxVQIs/HK5CgRkLP1vn7Gtc8RSwI4psb9Y/5RUF1q6fPMcOwNfeoBOd?= =?us-ascii?Q?55iIafK9gKQAPcAHCDcVrST7slVcEZ7ugiGEapPD3tPCFAYI2nRLSB7vEwxk?= =?us-ascii?Q?BmAxYYPktk2wKNXmx6IkI9ADzsSUWCj6bnYzSKv6jCMNjkRklz2BrKaUM18G?= =?us-ascii?Q?O0sH+bPcFODEuU5+cMFHlRSCdFCTeVkOiZzhlkkEsojNnI+MIZHHyV+g25Cl?= =?us-ascii?Q?m34bnaVnJ7R0DK4Ydg1ugspjcHJg4Isd4RX45eunkR/3BSSHGy0eKvPjcgnr?= =?us-ascii?Q?kcCfwSU5urWB/+CaQFBWVeQSKVM2Xp9tfUgQQ74FXKU1F80lSTUQuMPxdokc?= =?us-ascii?Q?XJimDKg02wgj7t8wqdrm9IT6dtzQlJ1YyCmxJJHZq5yIJmlq9As470nJ6EsO?= =?us-ascii?Q?MkhyM+PzfEyb2kqGHKfV4/QEpd8R2PWEO54lLQusS1cgss/mn1UegpRSN0Vl?= =?us-ascii?Q?JdI0LeBUsvwnLRN/hSs90HQFsx3HLc+Pr5HL8nLy/zE3m/ydvFbaClKuF6m3?= =?us-ascii?Q?Hey0TAkS3kgzZLg/LlYiwGuDpMIzz/R5aOHCYae+R5Jr9JQmuWLmpv99+35T?= =?us-ascii?Q?jv1CP6pFfUCKd8hA2EUijQgQB7uqxYGYgmq6nSUQsnho8n0tytmW2eKKiUS0?= =?us-ascii?Q?ak03b/snADScnudX05jeqAZdMCBuZMYXc8odiZU30q4tGBMZb4BdzCoKHWFP?= =?us-ascii?Q?W0F1Ptw2RsNwm2vPjv6nPTgSTfxVRkd2vRboDn+jvidcvpWJWum2WBNkxELB?= =?us-ascii?Q?B5CTJVu4oQiA0B728qxevQykOcvjp/Z5YjjEKhp34eRowQy0zP3Db5UFmHR6?= =?us-ascii?Q?kuQaJDjWKCi86ygwvrYgBRQ8vUCDVWcl8EtAv//jkPvyHRGEUfY5Odc5O6qG?= =?us-ascii?Q?kNZ0eQuCz643mTuMU23dv5sskQcDUY7SsCqDQSa1xKv4cNEaCy5VUWqoyUB8?= =?us-ascii?Q?EBt9QIvsGNeQmOFsitXZnAn5TP5MpfF14wcAkB+6lfpatnr4QMsnES7jx3Ht?= =?us-ascii?Q?lvgAONHrXsBbndHuZlyCR+H3nYrX/qMABtvlUc4w7LysiPTJ+Cl+GTOdlMF9?= =?us-ascii?Q?ggmijU77u7mosaUw/BIUZ1eOKk+p/TEL5X2iGezdy7oIbvL9gOnUAO0r/IKV?= =?us-ascii?Q?rQ7UKA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5388d0d3-2387-4cba-2230-08daf01289c1 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2023 18:19:23.9746 (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: IuyNE4QYY6vKqkjs+csUt2v1CI2IWzBA7GYMF5JGFAPbEOwHDKejSLkMvou2AlS73qNNQK4Y9/OOYA8Yjhy6uh4zpABV9ACaBvxWi7P1eBM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5382 X-TUID: IwQHjIwSQSmZ Forget this let us take [PATCH] fix rebuild of rootfs_finalize task from Felix It was a drive by mini change, and somehow now we have three people sending patches ... this energy could be used so much better. Henning Am Thu, 5 Jan 2023 19:43:28 +0100 schrieb Henning Schild : > There have been several places that would not work twice in a row. All > the test && not covering || have been moved to if. The rm at the end > tried to remove a file that was just moved. And that mv would not > work a second time because its source would be gone. > > Signed-off-by: Henning Schild > --- > meta/classes/image.bbclass | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 629a0c1daa55..125eba192a65 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -396,13 +396,16 @@ addtask deploy before do_build after do_image > do_rootfs_finalize() { > sudo -s <<'EOSUDO' > set -e > - test -e "${ROOTFSDIR}/chroot-setup.sh" && \ > + > + if [ -e "${ROOTFSDIR}/chroot-setup.sh" ]; then > "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" > + fi > rm -f "${ROOTFSDIR}/chroot-setup.sh" > > - test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \ > + if [ ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" ]; > then find "${ROOTFSDIR}/usr/bin" \ > -maxdepth 1 -name 'qemu-*-static' -type f -delete > + fi > > mountpoint -q '${ROOTFSDIR}/isar-apt' && \ > umount -l ${ROOTFSDIR}/isar-apt && \ > @@ -424,10 +427,10 @@ do_rootfs_finalize() { > rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" > rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" > > - mv "${ROOTFSDIR}/etc/apt/sources-list" \ > - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" > - > - rm -f "${ROOTFSDIR}/etc/apt/sources-list" > + if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then > + mv "${ROOTFSDIR}/etc/apt/sources-list" \ > + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" > + fi > EOSUDO > } > addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess