From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a2e:7c03:: with SMTP id x3mr223087ljc.281.1627485734714; 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-Google-Smtp-Source: ABdhPJzdYmQveoAAStXCF7Q2CuwSruA0RJL47Z71Av0qmxMODPUboSb6jT2u30tPlgXq6Tig5P77 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: MPIeFvDbgJHt 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