From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7020691688572059648 X-Received: by 2002:a05:6000:184c:: with SMTP id c12mr42653017wri.127.1634632164117; Tue, 19 Oct 2021 01:29:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:508a:: with SMTP id a10ls407917wrt.1.gmail; Tue, 19 Oct 2021 01:29:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9iRAVAfPoT/QQSiR71uNmw2v67gsaEgl11+LXg6pYhxEE/wXP+5o++szL7q/wRQBd17z0 X-Received: by 2002:a05:6000:1287:: with SMTP id f7mr28586229wrx.230.1634632163170; Tue, 19 Oct 2021 01:29:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634632163; cv=none; d=google.com; s=arc-20160816; b=e0F0nhiN2puRKPLPR6Of8gccFJ85JqK35en5JqnD0tAAQxwY1PljQXYWFMTxRbH2u/ pDT9JBFjBOM+uFQaeUcoLL6tiQDZ+rdJeFLrceVKMxGPRXQjaygOLtPQ3DgzgVHxhX+R Wc5lWrDee55ULgskwQezJxVgGzGRGEZj2HajkkCFKtrkrf2gVmY0GiKwMWKCU3Xu6udY mYT9PH/kyZJKkATSt9vdEZ+1ZhhJBoi3OuwHoV3I0RJ3QL2m2+McI42AttG1TQ+J4UH4 g1RMiWCzkKwyvrpfvtGAejK/ZNns1E6TakfSFYLlTnwOZzmdCe3ofcaikzQaQJ+nrMAz in1g== 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=HeCLD7aHwPk6wwBR8q7jHydP1oogZ9aWAJgmS49HHlM=; b=KIbWhkIGQvK5bWdSj5VY/eJhTmj4G0Rpk3wC6aoDoP2wakNI/oK454QMOhmNvWOG0Y ggw/k7+algWNPoP1iIAZJkKAl8Jdu6imHxnQt21r7LAb+V6bRFYUptIFtF95wSlEZERS Yg3BgZkV5O2g3rXS/1l10jdWHRto3qx+YAdzDrRd1eDSs2q1rS38H3Ec/ccfE0Uj1dmh Yf6+z7Rq5+pRlagPMxW0PExnij8/kQyW/1B6yei+KPXBFlm5c+b+r0wUNkz4qU49o3/m mehuAM6Yhdj92hTHnwEcSuAJVJYB2LKJytj9U2Gt7bPl4hxxPMlUyZCGGmthPZj62dMV cauA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s187si100284wme.1.2021.10.19.01.29.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Oct 2021 01:29:23 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=adriaan.schmidt@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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 19J8TMFA030667 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Oct 2021 10:29:22 +0200 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 19J8TMY9002966; Tue, 19 Oct 2021 10:29:22 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 02/10] images: create deploy dir Date: Tue, 19 Oct 2021 10:29:05 +0200 Message-Id: <20211019082913.199818-3-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019082913.199818-1-adriaan.schmidt@siemens.com> References: <20211019082913.199818-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 4vzxZlItcci5 I ran into several cases where the image deploy dir was not created when results of previous tasks were taken from cache. This makes the dependency explicit. Signed-off-by: Adriaan Schmidt --- meta/classes/container-img.bbclass | 1 + meta/classes/cpiogz-img.bbclass | 1 + meta/classes/ext4-img.bbclass | 1 + meta/classes/fit-img.bbclass | 1 + meta/classes/targz-img.bbclass | 1 + meta/classes/ubi-img.bbclass | 1 + meta/classes/ubifs-img.bbclass | 1 + meta/classes/wic-img.bbclass | 1 + 8 files changed, 8 insertions(+) diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 79ef3e8..8fef52a 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -6,6 +6,7 @@ # This class provides the task 'containerize_rootfs' # to create container images containing the target rootfs. +do_container_image[dirs] = "${DEPLOY_DIR_IMAGE}" do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_container_image[vardeps] += "CONTAINER_FORMATS" do_container_image(){ diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass index 940e2fb..2a49456 100644 --- a/meta/classes/cpiogz-img.bbclass +++ b/meta/classes/cpiogz-img.bbclass @@ -19,3 +19,4 @@ do_cpiogz_image() { } addtask cpiogz_image before do_image after do_image_tools +do_cpiogz_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 334dc64..5085afc 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -21,3 +21,4 @@ do_ext4_image() { addtask ext4_image before do_image after do_image_tools do_ext4_image[prefuncs] = 'set_image_size' +do_ext4_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index 82b96d8..1ad0c5b 100644 --- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -26,3 +26,4 @@ do_fit_image() { sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}' } addtask fit_image before do_image after do_image_tools do_transform_template +do_fit_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass index af12ae1..bf94af0 100644 --- a/meta/classes/targz-img.bbclass +++ b/meta/classes/targz-img.bbclass @@ -12,3 +12,4 @@ do_targz_image() { } addtask targz_image before do_image after do_image_tools +do_targz_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index c69ac4d..efaf058 100644 --- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -29,3 +29,4 @@ do_ubi_image() { sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBI_IMAGE_FILE}' } addtask ubi_image before do_image after do_image_tools do_transform_template +do_ubi_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass index 5d48c1d..229eb3e 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -29,3 +29,4 @@ do_ubifs_image() { } addtask ubifs_image before do_image after do_image_tools +do_ubifs_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index caad1b1..399f7ee 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -137,6 +137,7 @@ python check_for_wic_warnings() { } do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}" +do_wic_image[dirs] = "${DEPLOY_DIR_IMAGE}" python do_wic_image() { cmds = ['wic_do_mounts', 'generate_wic_image', 'check_for_wic_warnings'] weights = [5, 90, 5] -- 2.30.2