diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-25 16:04:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-26 12:08:18 +0100 |
commit | c2bbcd415891d604d2429c5901881b1d0ab38d32 (patch) | |
tree | c6132f17e9e64def4abaa19d4b1d9f410251ce4d /meta/classes | |
parent | 544c53bd75162778c54ab731d5bdd25832530d0e (diff) | |
download | poky-c2bbcd415891d604d2429c5901881b1d0ab38d32.tar.gz |
staging: Fix autoconf-native rebuild failure
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.
(From OE-Core rev: b9535f513366536b13d0522058f517d2e04451b5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/staging.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 65a6cd5120..25f77c7735 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -620,7 +620,7 @@ python staging_taskhandler() { | |||
620 | for task in bbtasks: | 620 | for task in bbtasks: |
621 | deps = d.getVarFlag(task, "depends") | 621 | deps = d.getVarFlag(task, "depends") |
622 | if task == "do_configure" or (deps and "populate_sysroot" in deps): | 622 | if task == "do_configure" or (deps and "populate_sysroot" in deps): |
623 | d.appendVarFlag(task, "prefuncs", " extend_recipe_sysroot") | 623 | d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") |
624 | } | 624 | } |
625 | staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" | 625 | staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" |
626 | addhandler staging_taskhandler | 626 | addhandler staging_taskhandler |