diff options
Diffstat (limited to 'poky/meta/classes/staging.bbclass')
| -rw-r--r-- | poky/meta/classes/staging.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass index 84e13bab5..062b2817c 100644 --- a/poky/meta/classes/staging.bbclass +++ b/poky/meta/classes/staging.bbclass @@ -198,6 +198,10 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): if manifest.endswith("-initial.populate_sysroot"): # skip glibc-initial and libgcc-initial due to file overlap continue + if not native and (manifest.endswith("-native.populate_sysroot") or "nativesdk-" in manifest): + continue + if native and not (manifest.endswith("-native.populate_sysroot") or manifest.endswith("-cross.populate_sysroot") or "-cross-" in manifest): + continue tmanifest = targetdir + "/" + os.path.basename(manifest) if os.path.exists(tmanifest): continue @@ -573,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) } |
