From: Joshua Lock <[email protected]> Modify bindir, libdir and sbindir to be exec_prefix/$d, rather than base_prefix/$d, when the usrmerge DISTRO_FEATURE is enabled.
Signed-off-by: Joshua Lock <[email protected]> --- meta/conf/bitbake.conf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e421650..c5beb77 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -18,10 +18,14 @@ export prefix = "/usr" export exec_prefix = "${prefix}" # 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" +bin = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}/bin', '${base_prefix}/bin', d)}" +sbin = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}/sbin', '${base_prefix}/sbin', d)}" +lib = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}/${baselib}', '${base_prefix}/${baselib}', d)}" +nonarch_lib = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}/lib', '${base_prefix}/lib', d)}" +export base_bindir = "${bin}" +export base_sbindir = "${sbin}" +export base_libdir = "${lib}" +export nonarch_base_libdir = "${nonarch_lib}" # Architecture independent paths export sysconfdir = "${base_prefix}/etc" -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
