diff mbox series

[1/2] Revert "wic-img: Forward warnings from wic to bitbake"

Message ID 20210215104357.18632-2-florian.bezdeka@siemens.com
State Superseded, archived
Headers show
Series Revert wic Y2038 series | expand

Commit Message

Florian Bezdeka Feb. 15, 2021, 12:44 a.m. UTC 
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 mbox series

Patch

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