From 57f32836060bba0eaa6b36f53146dd6fd07b77ed Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 23 Feb 2019 13:41:22 +0000 Subject: staging: Fix staging_populate_sysroot_dir native corruption bitbake gdk-pixbuf gdk-pixbuf-native bitbake build-sysroots -c build_target_sysroot can lead to tracebacks as gdk-pixbuf-native is being installed into the target sysroot. The issue is that the x86_64 (common BUILD_ARCH) sysroot components directory can contain a mix of native and target artefacts. Differentiate by the "-native" in the recipe names. Should also trim down the size of the sysroot used in eSDK. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/staging.bbclass') 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): 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 -- cgit 1.2.3-korg