From fe6d020dd609fbde7e4413cef9bbdd4e3962c82c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 2 Apr 2019 20:38:10 +0200 Subject: [PATCH] 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 1 - meta/classes/staging.bbclass | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) 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" addtask configure after do_patch do_configure[dirs] = "${B}" -do_prepare_recipe_sysroot[deptask] = "do_populate_sysroot" base_do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index c9bcd745fe..062b2817c8 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -577,6 +577,7 @@ python extend_recipe_sysroot() { } extend_recipe_sysroot[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA" +do_prepare_recipe_sysroot[deptask] = "do_populate_sysroot" python do_prepare_recipe_sysroot () { bb.build.exec_func("extend_recipe_sysroot", d) } -- 2.40.1