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:15 +0100
commit178e983cf745fe32b199e0cbfe9777270124b186 (patch)
tree6fc986f308c230deb73738365d6fceace465a25c
parent53abb9fba87af85e58a01c3032d7d6f77e40c012 (diff)
downloadpoky-178e983cf745fe32b199e0cbfe9777270124b186.tar.gz
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} (From OE-Core rev: 700848c6ebd03bf3105d09a41d758883ab875618) 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 = ""
17export prefix = "/usr" 17export prefix = "/usr"
18export exec_prefix = "${prefix}" 18export exec_prefix = "${prefix}"
19 19
20root_prefix = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}', '${base_prefix}', d)}"
21
20# Base paths 22# Base paths
21export base_bindir = "${base_prefix}/bin" 23export base_bindir = "${root_prefix}/bin"
22export base_sbindir = "${base_prefix}/sbin" 24export base_sbindir = "${root_prefix}/sbin"
23export base_libdir = "${base_prefix}/${baselib}" 25export base_libdir = "${root_prefix}/${baselib}"
24export nonarch_base_libdir = "${base_prefix}/lib" 26export nonarch_base_libdir = "${root_prefix}/lib"
25 27
26# Architecture independent paths 28# Architecture independent paths
27export sysconfdir = "${base_prefix}/etc" 29export sysconfdir = "${base_prefix}/etc"