From patchwork Wed Jul 28 07:22:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 611 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:08:01 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F808S019083 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:08:01 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:08:00 +0200 Resent-Message-ID: <20210809150800.GS28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 28 Jul 2021 17:22:20 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 16SFMKv6032317 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Jul 2021 17:22:20 +0200 Received: by mail-lf1-f64.google.com with SMTP id br20-20020a0565124014b02903a914ebbb21sf1190969lfb.20 for ; Wed, 28 Jul 2021 08:22:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627485734; cv=pass; d=google.com; s=arc-20160816; b=FLuW5Hi3rj2ZHWaxZygYvmXGfJKhjVLBkTj4x6H5F7tulx5c67WDtigi0fy3qYeCxv XwUs6WvS5YcVATEKgpttNf2dTsTY8v3xzsFI8XVe0HVoIviNOkVHVPsHMMxS4SGisZNd 3mc/4RCLCny5iTOAKvuj/BmE5V83oakdVCW2uvF7M8VnaUWm8V1e60/9NNdt5lw2vNNw 8AkW4I70SpDiZclLHY4+wasbFnWrP4mUDh/Wzz6hvq5KGqOITHM4DoUClkD8Qonvnu0A aEWPiEt4j1jldnxN8IJBV5V1qM3t7cCEs2/8REmiF14VC3KPiFrwQxYuYMA9ziuTHye0 BgVw== ARC-Message-Signature: i=2; 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=31tiU2yNnQmOb2MWzfGlatTO3gssULOy1dCXiS3Jve8=; b=dPKgH94FO3vy1XTPHZZR/arA23MUrbp3q5pGrVGzgwF+wAKl0LJ0jAkGO+ikHYj4R7 deMu0bb4VyBGZAl2dnNNy5qbtb+M/3TFEI/1qY4S4tCdHSnFhQkCt4Lc4fzpIrPY9vtm 9DwuPtGH+wQCnqqu8vAlQzhZBOC5NKCZynzDqlX+Bnk8oFJHeNCiEh6/9vgOof5Em2jp J32eqwMOXY1LOVZWC040S13TXBsvF6sflw0I4rABHrRtNYAjyxoVbkQS2tvrNNMbb6pO Hp3B+GulDxkKxFVn5P2I2rqkBTkm3+4Uc/zOzq4gr6PwZOG0mSkF/ZiWeXZVIDaRBrwA S+BQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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=20161025; 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=31tiU2yNnQmOb2MWzfGlatTO3gssULOy1dCXiS3Jve8=; b=p21ekXkxhLdT9ty6uh8xYE8Q1zI+4y78h62MQQktCJgzK5XwWoQbM1GJGnavHQeSEy PU+6aeA3gPQmablhFhULnQtxYCPgYSkZTkio+f4S4urgvRiXefF9fpnyVYHGC9h14Cz4 tKaxBxE87hATDt4vO+Yj5jd/6/CiEeSyH1SXgZiveHoQSVDnbgyOdKDJ+PoUSBofOl0y ajjWMy5rcoohxjEGMnPTCiakFerGJD0qv83Aajn0UgvvoV4MKgUPULKWbnrK3lLTFqaA 353ABtoKDVOGvgqK1eLEBI9gmJdQrE9sQuN/icg+YfaEdDgExIQ03qzgSb3wR1NOIkGi M8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=31tiU2yNnQmOb2MWzfGlatTO3gssULOy1dCXiS3Jve8=; b=KfKCTjFOUDR0Q5jdV/f1boGpFW6mgO0blZhY8dh2+BVBax90L0LgFXDbnHRIJOItPW C1V3uTBnQIR1U3H0OX6LgVFiG+k8xjtnzsHe3Rq8EFDKnzzCMczTxfeyyteX1lx88fqm AwnbGfPQoVcNa3ZodkGnNngV/Xz/DzSaMDDY4VawckAf+RY3Kefo3BzH7CYF3b0x8tuj yE94NGxKukDtsRR6MBObVzQZ1L/dnirw/jHWz4WwJOZCwp3TKCQDUhdQmF6WuoXlEFva /+8C6c3dqUIpAcGxxQThT/w9F46t/tQ4YnHFAYiJ+thSjkFBQjUPcOuuR1K3itiYYtra 2wTA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532H2aq/T2rb3LBZRsBIjdN9nNHhGb+mV+USuEm8N+0MocikfzMh 2dR+p5VXKs0yv3CkwQTRCWI= X-Google-Smtp-Source: ABdhPJyj7lfmzcSR8clZJuXgp4IR/zHBp4oaFepJyEkWWXsbzESkqAogWfh8widRtgYCzuXaXiG3+g== X-Received: by 2002:ac2:560d:: with SMTP id v13mr105557lfd.518.1627485734649; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls2100657lfi.2.gmail; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) X-Received: by 2002:ac2:47eb:: with SMTP id b11mr111503lfp.544.1627485733699; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627485733; cv=none; d=google.com; s=arc-20160816; b=ILWJh9S4x/OSDz7RD3Fhkzk7vxqBx+tptcC5NeyEjYMWpF+Qe3iHaMhS9D2CC+E3SK hO9IH8RxUDMUX+YYSvitdsDRSmmFCNnRhdx1XMyOA4qwXpUDCGxrU1LrR1/RfzENfFpZ 2rYzvSPlDjjuAzS83hQLRMSgA4MVP+e/yrNDWqVdndsdozuJswzYPgksrjDnMEaqw2lA V4ufTrQBt+u3wQGRYp/o5c31dcwlGtnQaQBB3HNEC0qNUAf/Zr6WmpXEaLNud0A3Gq7+ 2Jhd93lGmIbwpkjRREFb9VuuLeCv3IfD+e+50+OMDuQY1URxq3vGysJkd9SBzhEDDh/Y fJhg== 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:date:subject:cc:to:from; bh=uU6qVCY1GUJohBTxY7mKLoLK2DMKQcgBBOkkj1Q22z0=; b=VA+vwPaj5tIc8eunHYlvvtE4o6frmB3V2rpvtuJM8jxVA/bgehWEpHtKd3EyYpi8E+ /tIxJJI06I8NDgwJoN+9L9ee/YdLW+D+I5BmzzC8EP/Pd06QrhP0hkXCelFg3PgAz4kk XUSGCe50BjR0KhV4+TY6SWYsrbE7e4c24CZHKKfvy+0bGriU8FqndUeR5NhxzmZGSGL1 tTXhp9CSpt+eVWaIE709dF6H1epEHPYHoDZAsWAaUiylMUgDR7kiXRpIWFZ9muupuOq7 iFAunoGZmHjmH2zjiyRLsOXm02j55MdxGMiEotNqA2ABG2HPCQMfrMzX2Q9oeRaCzAQt lW+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id r190si13823lff.0.2021.07.28.08.22.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 08:22:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 16SFMCeH032363 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Jul 2021 17:22:13 +0200 Received: from localhost.localdomain ([139.22.37.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16SFMC2H022883; Wed, 28 Jul 2021 17:22:12 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH 1/4] classes: make sure container extension can run multiple times Date: Wed, 28 Jul 2021 17:22:07 +0200 Message-Id: <20210728152210.7089-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728152210.7089-1-henning.schild@siemens.com> References: <20210728152210.7089-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY 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}" \