summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/staging.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 84e13bab59..c9bcd745fe 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -198,6 +198,10 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d):
198 if manifest.endswith("-initial.populate_sysroot"): 198 if manifest.endswith("-initial.populate_sysroot"):
199 # skip glibc-initial and libgcc-initial due to file overlap 199 # skip glibc-initial and libgcc-initial due to file overlap
200 continue 200 continue
201 if not native and (manifest.endswith("-native.populate_sysroot") or "nativesdk-" in manifest):
202 continue
203 if native and not (manifest.endswith("-native.populate_sysroot") or manifest.endswith("-cross.populate_sysroot") or "-cross-" in manifest):
204 continue
201 tmanifest = targetdir + "/" + os.path.basename(manifest) 205 tmanifest = targetdir + "/" + os.path.basename(manifest)
202 if os.path.exists(tmanifest): 206 if os.path.exists(tmanifest):
203 continue 207 continue