[oe-commits] [openembedded-core] 48/76: qemuboot.bbclass: do not hook into do_rootfs

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit c8260447ed115bc5be7df9b25e449a7744d9f2df
Author: Patrick Ohly <patrick.ohly at intel.com>
AuthorDate: Thu Nov 24 10:51:13 2016 +0100

    qemuboot.bbclass: do not hook into do_rootfs
    
    Writing qemuboot.conf in write_qemuboot_conf() does not modify the
    rootfs and thus conceptually shouldn't be executed as part of rootfs
    creation.
    
    Running it as separate task is cleaner and fixes the problem of
    missing qemuboot.conf files for meta-swupd virtual images; those
    images replace do_rootfs and ROOTFS_POSTPROCESS_COMMANDs don't run at
    all.
    
    The task gets added such that it runs roughly at the same time as
    before. Probably it doesn't actually need to depend on do_rootfs, but
    this way we don't write a useless qemuboot.conf in cases where
    do_rootfs fails.
    
    Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/qemuboot.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 39df3ad..8b1d4d0 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -42,7 +42,7 @@ QB_DEFAULT_FSTYPE ?= "ext4"
 QB_OPT_APPEND ?= "-show-cursor"
 
 # Create qemuboot.conf
-ROOTFS_POSTPROCESS_COMMAND += "write_qemuboot_conf; "
+addtask do_write_qemuboot_conf after do_rootfs before do_image
 
 def qemuboot_vars(d):
     build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
@@ -51,8 +51,8 @@ def qemuboot_vars(d):
                 'STAGING_DIR_HOST']
     return build_vars + [k for k in d.keys() if k.startswith('QB_')]
 
-write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
-python write_qemuboot_conf() {
+do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
+python do_write_qemuboot_conf() {
     import configparser
 
     qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('DEPLOY_DIR_IMAGE', True), d.getVar('IMAGE_NAME', True))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.