[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6623/8267] cross.bbclass: merged /usr support

[Emmanuele Bassi <ebassi src gnome org>]

commit d8232565dcceb51936dac3149ee1a0c4ab986153
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Wed Jun 14 14:30:43 2017 +0300

    cross.bbclass: merged /usr support
    
    Use ${root_prefix} instead of ${base_prefix} while setting
    ${target_base_prefix}, otherwise we might loose the root prefix configuration
    change in case of 'usrmerge' distro feature is enabled.
    
    (From OE-Core rev: 3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd)
    
    Signed-off-by: Amarnath Valluri <amarnath valluri intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/cross.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 8757303..4887317 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -50,7 +50,7 @@ SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}"
 # Path mangling needed by the cross packaging
 # Note that we use := here to ensure that libdir and includedir are
 # target paths.
-target_base_prefix := "${base_prefix}"
+target_base_prefix := "${root_prefix}"
 target_prefix := "${prefix}"
 target_exec_prefix := "${exec_prefix}"
 target_base_libdir = "${target_base_prefix}/${baselib}"