diff options
| author | Amarnath Valluri <amarnath.valluri@intel.com> | 2017-06-14 14:30:43 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:15 +0100 |
| commit | d8232565dcceb51936dac3149ee1a0c4ab986153 (patch) | |
| tree | 49ea1c2151089da2bd78a4ec078b58d73b77e61e | |
| parent | 178e983cf745fe32b199e0cbfe9777270124b186 (diff) | |
| download | poky-d8232565dcceb51936dac3149ee1a0c4ab986153.tar.gz | |
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>
| -rw-r--r-- | 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 8757303678..4887317a9a 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass | |||
| @@ -50,7 +50,7 @@ SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}" | |||
| 50 | # Path mangling needed by the cross packaging | 50 | # Path mangling needed by the cross packaging |
| 51 | # Note that we use := here to ensure that libdir and includedir are | 51 | # Note that we use := here to ensure that libdir and includedir are |
| 52 | # target paths. | 52 | # target paths. |
| 53 | target_base_prefix := "${base_prefix}" | 53 | target_base_prefix := "${root_prefix}" |
| 54 | target_prefix := "${prefix}" | 54 | target_prefix := "${prefix}" |
| 55 | target_exec_prefix := "${exec_prefix}" | 55 | target_exec_prefix := "${exec_prefix}" |
| 56 | target_base_libdir = "${target_base_prefix}/${baselib}" | 56 | target_base_libdir = "${target_base_prefix}/${baselib}" |