From 3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Wed, 14 Jun 2017 14:30:43 +0300 Subject: 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 Signed-off-by: Richard Purdie --- 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 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}" -- cgit 1.2.3-korg