]> code.ossystems Code Review - openembedded-core.git/commitdiff
staging: Fix autoconf-native rebuild failure
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 25 Oct 2021 15:04:29 +0000 (16:04 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 26 Oct 2021 11:08:06 +0000 (12:08 +0100)
When rebuilds are triggered, autoconf-native can fail with:

| DEBUG: Executing shell function update_gnu_config
| install: cannot stat '[BUILDPATH]tmp/work/x86_64-linux/autoconf-native/2.71-r0/recipe-sysroot-native/usr/share/gnu-config/config.guess': No such file or directory

which is due to update_gnu_config running before extend_recipe_sysroot.
This only happens rarely since usually the prepare_recipe_sysroot
function would already have set things up and only in the invalidated
task hash cases does this rebuild in this way from configure only.

Fix the code to prepend this function instead of appending which
resolves the ordering issue.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/staging.bbclass

index 65a6cd5120ba69ead4b95161c1c4e595f7b731b6..25f77c77350fc6f7660277a3e98942fcac5344ac 100644 (file)
@@ -620,7 +620,7 @@ python staging_taskhandler() {
     for task in bbtasks:
         deps = d.getVarFlag(task, "depends")
         if task == "do_configure" or (deps and "populate_sysroot" in deps):
-            d.appendVarFlag(task, "prefuncs", " extend_recipe_sysroot")
+            d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ")
 }
 staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess"
 addhandler staging_taskhandler