Patchwork image.bbclass: Add EXTRA_IMAGEDEPENDS to the do_build task, not do_rootfs

login
register
mail settings
Submitter Richard Purdie
Date June 29, 2012, 3:50 p.m.
Message ID <1340985035.23146.171.camel@ted>
Download mbox | patch
Permalink /patch/30871/
State Accepted
Commit fa13e83ec3f91dce866ac212e91b62db24b6486d
Headers show

Comments

Richard Purdie - June 29, 2012, 3:50 p.m.
From 1e4d50a269791129ea5ec357b90ebb53be0131e8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 13 Jun 2012 10:38:16 +0000
Subject: 

EXTRA_IMAGEDEPENDS is used to ensure things like qemu-native are built and
these are not strictly dependencies of the do_rootfs task. This patch
moves them to the do_build task allowing bitbake a little more flexibility
about when things need to get built by.

I noticed this when qemu-native failed to build and a rootfs was not generated
which is not the intended behaviour.

Also update the syntax to use appendVarFlag instead of get/setVarFlag

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0772363..7e4bb69 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -81,11 +81,13 @@  IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)
 inherit image-${IMAGE_TYPE_vmdk}
 
 python () {
-    deps = d.getVarFlag('do_rootfs', 'depends') or ""
-    deps += imagetypes_getdepends(d)
+    deps = " " + imagetypes_getdepends(d)
+    d.appendVarFlag('do_rootfs', 'depends', deps)
+
+    deps = ""
     for dep in (d.getVar('EXTRA_IMAGEDEPENDS', True) or "").split():
         deps += " %s:do_populate_sysroot" % dep
-    d.setVarFlag('do_rootfs', 'depends', deps)
+    d.appendVarFlag('do_build', 'depends', deps)
 
     # If we don't do this we try and run the mapping hooks while parsing which is slow
     # bitbake should really provide something to let us know this...