From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a05:6638:d08:: with SMTP id q8mr3741758jaj.38.1636613259697; Wed, 10 Nov 2021 22:47:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6602:2f0b:: with SMTP id q11ls304797iow.6.gmail; Wed, 10 Nov 2021 22:47:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIyb20+/zWjk0gc2z/yBb/GhiKn3FU/EJluQeinho5K1e8FqwnPRfcleCdpKnULMn5BMZH X-Received: by 2002:a6b:f816:: with SMTP id o22mr3505608ioh.106.1636613259352; Wed, 10 Nov 2021 22:47:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636613259; cv=none; d=google.com; s=arc-20160816; b=xjYYKVHok9lETlwGY52JgDp1I3EpD2kHwP6PwR1Y8eKwA1rAUlVOQ7gVDpGdQk24vr QzgbyWC4NiTr5U0r1/9L8eh2iI0TKdpoy6sNTAv+gkKPV5aOBvgvbxBjpkWo5mMgNywU 7JX0uQMJebxU/wnmkR6/rwQpXnkNqse8z7w+LZbbpsiG+krrMe8fnSlkix/9mOAmZbUl dJa1KCeFuVpEm+Uj5Hpfxpz61OroWy3T1f+TEilLZdpOIi0wldzTvimkYlCiQtNG1BNb 1LN/Sszuwo1BLxICsGUrL3vT+Kn/mbvf7WVW6FocS74eSxZHSHHutGUak9WQN5PrcaC3 LlfQ== 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=EHR6m7IwanmrNV28rjkjsGUy/ojNXe+i5o4CKu5rhY4MjHL5yDHOzhtBxdEeqjExIe Yei2GyZ2DblIMFd40EHYJ5ZTHo7zfR2TUrtKV8lrsCYuBry9Bto2mO2wXPUibLlF/ox7 AW2SXHzMNtk4ytb7PuzZ97WPC7DRakXht7syWg1wN7IEOWI0O9cOERoy5zzKMbBlSNZ9 zC37hvnraCkEYVa21JbnyImw6Rrl9lipNJdl7Il6L1r58KkQJmjOo0ZKiIO44UxBgY9R WMjIxbeIQsQnyKHM1+MpGCoDlVcbATy30sGK2XllbV3ZymHMs9NY9cSOSfXvG9vDsIlG 6AXg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id f19si130933iox.3.2021.11.10.22.47.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Nov 2021 22:47:39 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1AB6lbtK001642 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 11 Nov 2021 07:47:37 +0100 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 1AB6lbcV012388; Thu, 11 Nov 2021 07:47:37 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v6 02/13] images: create deploy dir Date: Thu, 11 Nov 2021 07:47:17 +0100 Message-Id: <20211111064728.2375760-3-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111064728.2375760-1-adriaan.schmidt@siemens.com> References: <20211111064728.2375760-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: EcHKz3pahr0a 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