From patchwork Wed Dec 15 07:25:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1183 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 15 Dec 2021 18:26:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1BFHQ7o0009581 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Dec 2021 18:26:07 +0100 Received: by mail-lj1-f191.google.com with SMTP id a7-20020a05651c210700b00219132ab503sf7307943ljq.12 for ; Wed, 15 Dec 2021 09:26:07 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1639589161; cv=pass; d=google.com; s=arc-20160816; b=U9lvRPzq508BIUYfOFNf4dkmIWEpo0j1IFfEEb16oehRhS8Z8HpGLOKsxiHLaeRyzp hfNFcatmxHHG+oO0DaU5tEADeKkCAYvuAmo4HEALlrBIguxqpCW0SNyuuYOZqyzTg4J+ 3yQWrk05L+t/i4I1KWNXc9+ZpkyMquIfkBHKjUYQ/a+KhzqaGDjAnduJD8kwjgyqYxFW xrlzmJgrqAV1Cd8Hicia1RVx92jQfiU7xBaOi/BCtTiUIMTGmqYzS1VLG5nsr92/mQrY kboCzr7PejyWsc/cxMUTtr+pTOHv110aZWkxMWaA3TKta4+QtENrGcHobbL+XE5PetYX FGTw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=7PYFdPw9ABsksT/1Dp2KCdRzE2/EtCm54xYGuBmcmMc=; b=MoYi6IceE/4gwdJ2h0ok00caG2jDRoCfrwjrpFTEbGLMcwIex5nDJuhNaRQEl05aHz MbWLlRAUgL9ePaJ1wEGgGVM4yscH2eJYE+CFi7ZI5BrefzljHjNnIv4S8UkKVqbVigyx A0WQe+j2PDyhEqlwsD2KjmMYCzvj1TBvnKdviWkHL97ikZGBtlUzEFi6VgTUy/wVvPWR aukULn7O0V5anKo5Bhl84m6AlrCe10QnsqWxLhSHMicQBxHnPigfixt1odog1coB3X43 sjSIcvaLZptxijXr2aCAKxDN4+nVTezlmvBsDcq+g8hvwAIRSsxfj3qTma+KyV89r0cD bGsQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pLjFeGWK; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=7PYFdPw9ABsksT/1Dp2KCdRzE2/EtCm54xYGuBmcmMc=; b=YD+9slYmAvly3pdqPYtU6HKsRP7kX4SI0p4Z22fyJZEfES0PoSLlzaPhHJLr8sbMDD 9PTnGdbRpg6OEXz1lmKP2F6+qZ9gNCn6ttMp/B+OU9P3f1YmKy/q5XCfs1kvWzC90J2R UUm+5X19Jq1xvJGzdJrceZB9wIql9GlLPaJ3myTUjbn/mZ2m25QAkzgq7iOX5YTtlKWd KL/R/mdoD+VA3119mz01miKSxYtk4qAtcpQ2SBgrULlpdjSKGWog1ovvvDq2GQmjNLxS zdOq2F4G/72yIBSl1/VXXGgbybfc4F3QiSextzS7BqdSyaF5YqubuFfh3Qo1TxUrIBvw +XYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=7PYFdPw9ABsksT/1Dp2KCdRzE2/EtCm54xYGuBmcmMc=; b=ATteW7yLAaeaO1kUrSu4vxX1cRVz8yi6KcRd9SsdG3vEXiFzfTA228o8qGpK5lRHEY Hkqp6nY+7+FhZugKU5MumTkAWtlLLNWJlH8e5vOqK0mxszVTFFUXkBF/0k7GevXRdpQv fLKAun+WB3+cSabdYA/Ll07knTKxe7Yb2QN4o5IHaPl+CfPpFZp2aT3qam/2L7L9QDTP xgShojOwuqlfXk7yW8YgjXEOJQGUK1OTppiRYxHlJcor78aRfuqF7BmkaIFsY6HrFgtz 5oW04NPJU4d7R88lIU1QbTVKeH5/R+H5b4Ivq/1TqxkinGxj0nc/aNMECtxp0Vk5LJSm G0KA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532EuLuXSQDu9U4dvgEH1seqm5jMNNECjZisKiZnxQyEyRq9JPKF 7YdjSUmOCHLgjIpgs4EAkLA= X-Google-Smtp-Source: ABdhPJyRl4eyj14FKREEsLg6sPvw0rV+JKboMMCgJBCAAdu6QfAtIzBRsK9g0y36Mqm+ma/IJC7s/w== X-Received: by 2002:a05:6512:1506:: with SMTP id bq6mr11029813lfb.444.1639589161825; Wed, 15 Dec 2021 09:26:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls610225lfv.1.gmail; Wed, 15 Dec 2021 09:26:00 -0800 (PST) X-Received: by 2002:a05:6512:1289:: with SMTP id u9mr10676465lfs.273.1639589160726; Wed, 15 Dec 2021 09:26:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589160; cv=pass; d=google.com; s=arc-20160816; b=Nc+4nqJ9nS7D0HqdtBMp1H9uz/s8erHpap/n9jBDuc3H8KJ1eO9o4wZOeR+rcz3iXO GPHfHRFaDOnfblhDEgIEt0iAk95d7YYD9SsLSR0fH9T2E6qLWD5iGB2zkad2gmeLwZp1 s25cWX7lqjHRuwmL2iO59Tge8LqFUEa9XByVlThb70v9/ouR2RY+/hYfj0p6KHYWwBRJ 6NpoxFy+xnZAD+/dHtYG7+s9k71sBVc00XLgc/av7XL9ZNdyq0bOvsSlM8kiTbjvR6It yT1NtT0YvdNqzc/9BQuiG4IQBHLpw/hwTCMRy5g8NCoX4uZjRVr7TpcqosuOwx0jSOO9 tw5Q== 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=sod0JhJlhG4bl00GWN7LMMEks7XsezhhxDgRHQYiXYo=; b=tiGWsVL5uoQe6KkiBBGPa+AIBoAizNCf01N0ge1uN8rYEpRVcgwinDco4Oj6nZJJWq Gr8p2XRAmXAFg9wnTWApbzC9928z7Sn+WZ10pyv4L0MkokY0CegVdRJKDGex+4dQoY64 wWT46UvpaH8Nc83xAlAIIt7lGEI5xaeA5lGWlXM6EbfbO7iJKbcIsBpzVL8G7uASHlM+ cr7z3Gp45F+j7HIxKVEVqL4zJV5XJcjQKEsRzJn85XxfwvDYZELptAk+BFNMWeeM2z9H vgeTdSZPzeRrZXt7xRIvQ5ZUyuYdr/+N9ek6U71ubmSKjsMmuO6EphfVsOlRxDKOiL8D bwlQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pLjFeGWK; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30042.outbound.protection.outlook.com. [40.107.3.42]) by gmr-mx.google.com with ESMTPS id k26si114855lfe.10.2021.12.15.09.26.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:00 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) client-ip=40.107.3.42; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RbJOiTpVLHP/A2/ZGsbFWh0+9leRpdnfFscDZFycTdsKuK3G7MJo27ynz6HSkWDnvVpWxTl/HRnB5Ezjw58nCCIcLX24ldWVKT29bpa2I+kNrjZMBvjJjB7xhsY+wQ3BPgJJFz+Syux941/JZgHJoEmGaqFHdY033D9YOy7vlqyMJFz3WK30TiTKUw9h37B5U0AaZa92q1KkHQrutTESo72evB+jIpZwoaOGdIh6bFJfOVV1s/RVYfy4eKOFnb4d78S5N9ZBDwOYe8AXhnoVPbNZu5Fk/6Vv0whkLV3/hxP3m4l0bu/OIYPvMguzndvI8N0ioLFuroKR3hgX+D3q0A== 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=sod0JhJlhG4bl00GWN7LMMEks7XsezhhxDgRHQYiXYo=; b=OEyfc7u6uDbdvpkutF2G1hKvIAHf+wMdNIpVQZwmSJMiJZd31uZEZMZUxMc7GmVd8+HMXRrO6owAEZKCFQdF63Z/kxaE9aRfXds4LymOCX/10771+WP7oVG0oGp41JoCdfZ4Vas0DCOE+5Ywhgo5MQk2GZ15QjcwhOMyvklFWJudKy+7SqyfEBYlmsBWUtTAzgoGfEggzPRwG/HJlXeXBhBbm+XN0WR0H9WZMwcb8HvOIxMSSTNhnFp4qx4eIMNerzAxDED2Mf+46QskqSE9+27I9XlHquobqEhgLBjweqeJKzCzpdIa8JU9pkwQne2vnuFFUAk/v3Gogi0baWfmZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0051.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::20) by DB9PR10MB5163.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:327::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Wed, 15 Dec 2021 17:25:59 +0000 Received: from HE1EUR01FT012.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::b) by SV0P279CA0051.outlook.office365.com (2603:10a6:f10:13::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Wed, 15 Dec 2021 17:25:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT012.mail.protection.outlook.com (10.152.0.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:25:59 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:25:58 +0100 Received: from localhost.localdomain (139.22.39.210) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:25:58 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 1/5] classes: make sure container extension can run multiple times Date: Wed, 15 Dec 2021 18:25:46 +0100 Message-ID: <20211215172550.27153-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ad18fea-4279-4c16-66fc-08d9bfeff5c9 X-MS-TrafficTypeDiagnostic: DB9PR10MB5163:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ClCg7pmZrc4O6uDpOubh9lxhyE0f8DNPf0DoHl4aY0Nett0NnFdxSC3WYP344MduIGBR019FzAOmMeOY86SsCb0OrXRVORtJtxA9IYO1rrAH/NL+BXi6RXsmyKs7adcHXqxZkCxbV0tenq0AKKmc1Wkih1mhIGuqThKnEmaGw/lId5pqkxECjcenHWSP6nyvaYcjKItfE6/XV7yYJ4ipc0i2BSOEHE7YpIRkSXeegOlWQV7w1PoV0Aso9LBV+TXwCRWq3ow2M9VYk6g5VU7EKOzJVri3kT8jDii+ZC14eFCc30nctk5XECz9arkeNVIiM/OeZoxF9TsT6GYQnBpP4oE60lV88n+XmeDu6//o0Qw22zg/h+kFZ67cHV6UdeMGx9dqPwx6KE82tIdrbpkVrNRkHXIrRqMAAvEuEFsG5jhp+V+aW6miSUfsU79l9UN6x+X4G2XQnnBJYQchM2v0ZBhCmdY+/nz1lXUaIwun16gLjlIN+gsWMZGNt+IiIPZHSZ0SxnlYkXdB/ZTSvCeC7cFOYoth7lEneQpTcEU7/Uy8c5cC2AU1YGLa684WTn3a2qN0ScU4/W8+IZaKx5sGyP3gIXMQ2iLukK2A0u4IjdABdBK7rakI4MoMFrv3kgtMtt0Bq+7//gGMLejiCOcJKwU/RYaD95Qwzk9/Mo7hcY+UKAnmnQ8uLyDG5fDX6yotZYQWdJIxLh+KPQj5NFwgeKKSyd+bKcbkpmfF0KG8nZ7gw/eNaSX3vF3e/KtLchrVmNS48z6WACnBZeoYSztdxA== X-Forefront-Antispam-Report: CIP:194.138.21.70; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:hybrid.siemens.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(40470700001)(36756003)(1076003)(508600001)(4326008)(6666004)(7596003)(2616005)(82310400004)(44832011)(83380400001)(336012)(8676002)(36860700001)(40460700001)(86362001)(8936002)(16526019)(47076005)(2906002)(26005)(82960400001)(186003)(107886003)(356005)(70206006)(70586007)(7636003)(956004)(6916009)(5660300002)(316002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:25:59.0404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ad18fea-4279-4c16-66fc-08d9bfeff5c9 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.70]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT012.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5163 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pLjFeGWK; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX If the container extension fails somewhere in the middle, it could leave things behind resulting in issues when trying to run only that one task again. So make sure to remove stuff as root and remove another possibly existing directory. Signed-off-by: Henning Schild --- meta/classes/image-container-extension.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index e26604a04f06..6537fc693265 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -18,7 +18,7 @@ containerize_rootfs() { # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" - rm -rf "${oci_img_dir}" + sudo rm -rf "${oci_img_dir}" "${oci_img_dir}_unpacked" sudo umoci init --layout "${oci_img_dir}" sudo umoci new --image "${oci_img_dir}:${empty_tag}" sudo umoci config --image "${oci_img_dir}:${empty_tag}" \