From: "florian.bezdeka@siemens.com" <florian.bezdeka@siemens.com>
To: "isar-users@googlegroups.com" <isar-users@googlegroups.com>
Cc: "amikan@ilbers.de" <amikan@ilbers.de>,
"henning.schild@siemens.com" <henning.schild@siemens.com>,
"jan.kiszka@siemens.com" <jan.kiszka@siemens.com>,
"florian.bezdeka@siemens.com" <florian.bezdeka@siemens.com>
Subject: [PATCH 1/2] Revert "wic-img: Forward warnings from wic to bitbake"
Date: Mon, 15 Feb 2021 10:44:21 +0000 [thread overview]
Message-ID: <20210215104357.18632-2-florian.bezdeka@siemens.com> (raw)
In-Reply-To: <20210215104357.18632-1-florian.bezdeka@siemens.com>
From: Florian Bezdeka <florian.bezdeka@siemens.com>
This reverts commit cf6e025ebb3a37b7d79df7c39cfa58ac25234f3c.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
meta/classes/wic-img.bbclass | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index 59dcd2b..dedd2bf 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -129,21 +129,7 @@ do_rootfs_wicenv[prefuncs] = 'set_image_size'
WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.img"
-python check_for_wic_warnings() {
- with open("{}/log.do_wic_image".format(d.getVar("T"))) as f:
- for line in f.readlines():
- if line.startswith("WARNING"):
- bb.warn(line.strip())
-}
-
-do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}"
-python do_wic_image() {
- bb.build.exec_func("generate_wic_image", d)
- bb.build.exec_func("check_for_wic_warnings", d)
-}
-addtask wic_image before do_image after do_image_tools
-
-generate_wic_image() {
+do_wic_image() {
buildchroot_do_mounts
sudo -s <<'EOSUDO'
( flock 9
@@ -200,3 +186,7 @@ EOSUDO
rm -rf ${BUILDCHROOT_DIR}/${WICTMP}
rm -rf ${IMAGE_ROOTFS}/../pseudo
}
+
+do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}"
+
+addtask wic_image before do_image after do_image_tools
--
2.29.2
next prev parent reply other threads:[~2021-02-15 10:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <AQHXA4eGCyAaaBIRYkefwrjJFwY5pw==>
2021-02-15 10:44 ` [PATCH 0/2] Revert wic Y2038 series florian.bezdeka
2021-02-15 10:44 ` florian.bezdeka [this message]
2021-02-15 10:44 ` [PATCH 2/2] Revert "wic: Warn if an ext filesystem affected by the Y2038 problem is used" florian.bezdeka
2021-03-02 19:49 ` vijaikumar....@gmail.com
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=20210215104357.18632-2-florian.bezdeka@siemens.com \
--to=florian.bezdeka@siemens.com \
--cc=amikan@ilbers.de \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.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