summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-06-14 16:05:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:09 +0100
commit700848c6ebd03bf3105d09a41d758883ab875618 (patch)
tree1b0444e741e6aa53c4f884c1be5d3ef44de7fc96
parent8766a93c2c9774e53bb7950f8407243ece4ac682 (diff)
downloadopenembedded-core-contrib-700848c6ebd03bf3105d09a41d758883ab875618.tar.gz
openembedded-core-contrib-700848c6ebd03bf3105d09a41d758883ab875618.tar.bz2
openembedded-core-contrib-700848c6ebd03bf3105d09a41d758883ab875618.zip
bitbake.conf: support for merged usr with DISTRO_FEATURE usrmerge
A new configuration variable ${root_prefix} added, which shall be used by all base_{lib,bin,sbin}dir variables. When usrmerge DISTRO_FEATURE is enabled ${root_prefix} points to ${exec_prefix} otherwise to ${base_prefix} Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f9b77cc7ca..962eb437c7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -17,11 +17,13 @@ export base_prefix = ""
export prefix = "/usr"
export exec_prefix = "${prefix}"
+root_prefix = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}', '${base_prefix}', d)}"
+
# Base paths
-export base_bindir = "${base_prefix}/bin"
-export base_sbindir = "${base_prefix}/sbin"
-export base_libdir = "${base_prefix}/${baselib}"
-export nonarch_base_libdir = "${base_prefix}/lib"
+export base_bindir = "${root_prefix}/bin"
+export base_sbindir = "${root_prefix}/sbin"
+export base_libdir = "${root_prefix}/${baselib}"
+export nonarch_base_libdir = "${root_prefix}/lib"
# Architecture independent paths
export sysconfdir = "${base_prefix}/etc"