[OE-core] [PATCH] qemu-helper-native/systemtap-native: Ensure sysroots are populated with dependencies

[Richard Purdie]

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 at linuxfoundation.org>
---
 meta/classes/native.bbclass                           | 2 +-
 meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb  | 2 +-
 meta/recipes-kernel/systemtap/systemtap-native_git.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index d5b6f6af8bb..2cc6ad60b34 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -185,7 +185,7 @@ native_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
 python do_addto_recipe_sysroot () {
     bb.build.exec_func("extend_recipe_sysroot", d)
 }
-addtask addto_recipe_sysroot after do_populate_sysroot
+addtask addto_recipe_sysroot after do_populate_sysroot do_prepare_recipe_sysroot
 
 inherit nopackages
 
diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
index 372eebd8864..ab4eb2d2268 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
@@ -21,4 +21,4 @@ do_install() {
 }
 
 DEPENDS += "qemu-system-native"
-addtask addto_recipe_sysroot after do_populate_sysroot before do_build
+addtask addto_recipe_sysroot after do_populate_sysroot do_prepare_recipe_sysroot before do_build
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_git.bb
index 19cc1cf0f0a..b00f66e25dd 100644
--- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-native_git.bb
@@ -3,4 +3,4 @@ require systemtap_git.bb
 
 inherit native
 
-addtask addto_recipe_sysroot after do_populate_sysroot before do_build
+addtask addto_recipe_sysroot after do_prepare_recipe_sysroot do_populate_sysroot before do_build
-- 
2.20.1