From: Adriaan Schmidt <adriaan.schmidt@siemens.com>
To: isar-users@googlegroups.com
Cc: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Subject: [PATCH v4 02/10] images: create deploy dir
Date: Tue, 26 Oct 2021 14:28:03 +0200 [thread overview]
Message-ID: <20211026122811.2654125-3-adriaan.schmidt@siemens.com> (raw)
In-Reply-To: <20211026122811.2654125-1-adriaan.schmidt@siemens.com>
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 <adriaan.schmidt@siemens.com>
---
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
next prev parent reply other threads:[~2021-10-26 12:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 12:28 [PATCH v4 00/10] Add sstate-cache Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 01/10] oe imports in central location Adriaan Schmidt
2021-10-26 12:48 ` Henning Schild
2021-10-26 12:28 ` Adriaan Schmidt [this message]
2021-10-26 12:28 ` [PATCH v4 03/10] rootfs: recursively depend on packages Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 04/10] base: remove unneeded "before do_build" task dependencies Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 05/10] dpkg: add explicit dependency to isar-apt Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 06/10] meta: add sstate feature from oe Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 07/10] sstate: configure Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 08/10] sstate: add caching to isar-bootstrap Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 09/10] sstate: add caching to rootfs Adriaan Schmidt
2021-10-26 12:28 ` [PATCH v4 10/10] sstate: add caching to debian packages Adriaan Schmidt
2021-10-26 12:37 ` [PATCH v4 00/10] Add sstate-cache Schmidt, Adriaan
2021-10-26 13:43 ` Henning Schild
2021-10-28 15:23 ` Anton Mikanovich
2021-10-28 18:06 ` Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211026122811.2654125-3-adriaan.schmidt@siemens.com \
--to=adriaan.schmidt@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox