summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-06-14 14:30:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:09 +0100
commit3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd (patch)
tree4fad69afe49589d0cea2be114b62836b36769692
parent700848c6ebd03bf3105d09a41d758883ab875618 (diff)
downloadopenembedded-core-contrib-3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd.tar.gz
openembedded-core-contrib-3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd.tar.bz2
openembedded-core-contrib-3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd.zip
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@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cross.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 8757303678..4887317a9a 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}"