summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-05 20:28:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-06 14:41:28 +0000
commited884c585f90dfc352041c258802cf90d73914f2 (patch)
tree13057704cfac006745c24dfa108c5f9a12b3a18a
parent067476fc55a94956db27ec2a8d9bd1fd6ce74280 (diff)
downloadpoky-master.tar.gz
poky-master.tar.bz2
poky-master.zip
qemu-helper-native/systemtap-native: Ensure sysroots are populated with dependenciesHEADmaster
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. (From OE-Core rev: d40853b10dd9f01d6a8dd4edcb941cfa8a544922) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cross.bbclass1
-rw-r--r--meta/classes/native.bbclass1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index f832561daf..6dcddd6f2e 100644
--- 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 d5b6f6af8b..3a4f572552 100644
--- 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