[oe-commits] [openembedded-core] 43/47: cross.bbclass: merged /usr support

[git at git.openembedded.org]

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

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

commit 3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd
Author: Amarnath Valluri <amarnath.valluri at intel.com>
AuthorDate: 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.
    
    Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/cross.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}"

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