[oe-commits] [openembedded-core] 01/07: staging: Fix staging_populate_sysroot_dir native corruption

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d294320f1eb78b91e081b7b3d6323e696f886eea
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Feb 23 13:41:22 2019 +0000

    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 <richard.purdie at linuxfoundation.org>
---
 meta/classes/staging.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 84e13ba..c9bcd74 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.