From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a05:6402:7c9:: with SMTP id u9mr18100202edy.387.1627893647617; Mon, 02 Aug 2021 01:40:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:22c4:: with SMTP id dm4ls5551981edb.0.gmail; Mon, 02 Aug 2021 01:40:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSsiKMUVFkoNAUZSviFIpMEpBiGX28eTHupKCjSRoa9+TtP6sirSNmRKHve/77iT4vJsJT X-Received: by 2002:a50:9b06:: with SMTP id o6mr18442628edi.284.1627893646433; Mon, 02 Aug 2021 01:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627893646; cv=none; d=google.com; s=arc-20160816; b=sN147nV9YUyOR2BnS9VV2FiF6zxigteYk4gSM0ejGrgr+5rENdxQi71ZMHAOqscbDF 0dSbjaVN/dVKBOem1n1tsx2kpXcfycmX+cLf4Agoz6mHTYzJdc6H6a+E8iZddiM92RI6 DY9shYPCYfJiSoKiuvoDUFUvl5hB4UpQ4Axp9jelu62Z9x/6GmK22B/iw7GikJ1Xyzyh HEYjJY4dDE5DYhElPuRRJbXYalDRAyBx+LilkbMWd91SV0xm3sHHLtPom33Hph5sUgVw hkn1r2jxHseYF0hKdyLgIsbjJTfJyu6fa8lvMZ2sRkxOny2ykxGQMGcEfQ1+DehJ7m5p 5HaA== 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=OZ2sxzO2maBpGDV7w2y7sAaEt+gB1vsSWU9JgW87c+u51noHCGiHzZ1e8TeJmvT9ii upV36OE+nb8m/kZIDDlkaoj3K4bTyIAArBMYXdk739rOIoKIImYKiLS+qZHN5J4dS6jJ TOf76N0sT35C0ZZKnCGbhLWYOO7RfooiKjKWcoS8W3KpMXt9dvLaAJ7Rlmfk2Aly0YOn J0JNNI76X297B6v1Z9d+2736qta6PE4z1XHH5CBufAR6gzS7ytP1zQ1BYsIjSbXqKn/L /J/N5oR5yAKRv4brkbtHycyrOlPxBwHaCXNDtWPkS8IhARBvHUbFOECGzS1RYkhZjGQh YlOQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h14si10508edr.3.2021.08.02.01.40.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 01:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 1728ekFj014841 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 2 Aug 2021 10:40:46 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1728ejXK026449; Mon, 2 Aug 2021 10:40:45 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v2 1/4] classes: make sure container extension can run multiple times Date: Mon, 2 Aug 2021 10:40:38 +0200 Message-Id: <20210802084041.1320-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802084041.1320-1-henning.schild@siemens.com> References: <20210802084041.1320-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: CizZRtZQUrfe 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