qemu-helper-native/systemtap-native: Ensure sysroots are populated with dependencies

As Alex Kanavin found, dependencies aren't always populated, particularly
with the hash equivalence server enabled locally:

'bitbake core-image-minimal' with gtk+ disabled.
can confirm with: $ tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -display gtk
qemu-system-x86_64: Display 'gtk' is not available.
Enable gtk in local.conf with: PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"
'bitbake core-image-minimal', without deleting tmp/
$ tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -display gtk
qemu-system-x86_64: Display 'gtk' is not available.

This change ensures the dependencies are correctly handled as the full
sysroot is always depended upon even if things come from sstate.

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

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index f832561daf85357fe87c251c2428654ae97c0a62..6dcddd6f2e6c2294cead8272272206f2c94d6665 100644 (file)
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -97,3 +97,4 @@ python do_addto_recipe_sysroot () {
     bb.build.exec_func("extend_recipe_sysroot", d)
 }
 addtask addto_recipe_sysroot after do_populate_sysroot
+do_addto_recipe_sysroot[deptask] = "do_populate_sysroot"

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index d5b6f6af8bbfb139978e66bea87e97c757deb9f5..3a4f572552ea685c4147f7dbd261be2cac9d5811 100644 (file)
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -186,6 +186,7 @@ python do_addto_recipe_sysroot () {
     bb.build.exec_func("extend_recipe_sysroot", d)
 }
 addtask addto_recipe_sysroot after do_populate_sysroot
+do_addto_recipe_sysroot[deptask] = "do_populate_sysroot"
 
 inherit nopackages