From 700848c6ebd03bf3105d09a41d758883ab875618 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Wed, 14 Jun 2017 16:05:55 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 10 ++++++---- 1 file 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" -- cgit 1.2.3-korg