summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-04-02 20:38:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-03 14:50:13 +0100
commit6334737a782cc81c28e168ed24e566d35752a5a2 (patch)
tree12bfefce4e5aef5dca5a8621ff46d734ea9c97d8 /meta/classes/base.bbclass
parentb53a83c2a39b3375c4de962314dd77effc9727c4 (diff)
downloadpoky-6334737a782cc81c28e168ed24e566d35752a5a2.tar.gz
base.bbclass, staging.bbclass: Move prepare_recipe_sysroot task dependency
Move prepare_recipe_sysroot's task dependency on populate_sysroot from base.bbclass (where it was specified in the middle of do_configure's definition) to staging.bbclass (where the rest of do_prepare_recipe_sysroot is defined). This was a left-over from when recipe specific sysroots were introduced in commit 809746f5 and the task dependency on populate_sysroot was moved from do_configure to do_prepare_recipe_sysroot. (From OE-Core rev: fe6d020dd609fbde7e4413cef9bbdd4e3962c82c) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 8ece51fe42..d0b82d747d 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -310,7 +310,6 @@ CLEANBROKEN = "0"
310 310
311addtask configure after do_patch 311addtask configure after do_patch
312do_configure[dirs] = "${B}" 312do_configure[dirs] = "${B}"
313do_prepare_recipe_sysroot[deptask] = "do_populate_sysroot"
314base_do_configure() { 313base_do_configure() {
315 if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then 314 if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then
316 if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then 315 if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then