From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a05:600c:2306:: with SMTP id 6mr5836310wmo.115.1628179793368; Thu, 05 Aug 2021 09:09:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:db90:: with SMTP id u16ls801937wri.2.gmail; Thu, 05 Aug 2021 09:09:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRliBeVXkrb0N18DO2y+26PSIDPlCqHZQlacF/4Lm2xvi5rY6SVf1zlQmS36QEnpkZNsbc X-Received: by 2002:adf:eb4a:: with SMTP id u10mr6009880wrn.11.1628179792390; Thu, 05 Aug 2021 09:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628179792; cv=none; d=google.com; s=arc-20160816; b=NB3oVcJB7Y0iuSvkD+GptGk9kVTv2I/JIdm+vbZHgI3ffOXEryocTdF/MujQJlk/ov 1Q9bVv0FCX1oUMGBnOwwxJUrtR/9d65Mv+ieh5TWCCMVmTUGQR4iJ4lBJXO/LQ7fYzGx LuXX48jjvUitav7313KJTtE7v5+QnMBHGK0Ao0OTgguR6D9srkvvGHvHX+sFNciOtCIR oDybAghlQZ+jJ8YUIXMZ6MQ1ydeWAHT6o/IVeuyiKz051pWUenMlAppZPowparnQqRC4 zYJ5zIpvNzXNXX1PV1P1qdhlMEkKp7eBV4s4URh6qaM7akFh9c6q8XiH1w33Wvexs0U9 8SLg== 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=Ggh2S7L/6hHHVfMoP6avFtrfjz9vA0TYUG7k5sMv3sfhdsBZ/vXaszIeBoGGzpFt6z aJuLoFMVfWx5AHn427ziHdT9Oxpha97P9wAiDXnY5Hr+HbSa5xpgLdyNydMEAtmHLSoE rXZb+giEQB8IMkyDzbSe/lqqXzT3/Ds0Ry9yblwhdskqE+F2YzpnCR+N7KFMVfw23eZR T8SE9Ea3Jc0e8JdKyvr9Fb6/AVzLfqPCadDi8inbC8EiLRorrnkbSN8vvx1t1J/nhoF5 060nRRFV2BjzrT66hldE0srEQINQxnLwuqmNQGoSwDZuyK3VLG0hgmdMyaOakwfJ8gP5 Pykw== 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 Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m33si223229wms.0.2021.08.05.09.09.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Aug 2021 09:09:52 -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; 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 Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 175G9pre003330 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 5 Aug 2021 18:09:51 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 175G9pQR002372; Thu, 5 Aug 2021 18:09:51 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v5 1/5] classes: make sure container extension can run multiple times Date: Thu, 5 Aug 2021 18:09:45 +0200 Message-Id: <20210805160949.14790-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210805160949.14790-1-henning.schild@siemens.com> References: <20210805160949.14790-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: d1EDQyLWArv7 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}" \ -- 2.31.1