summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/bitbake.conf')
-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"