summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-30 20:35:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:21 +0000
commitf35b2e29d9bfa817e64b83df11ebbbfe0f4e8e5c (patch)
tree504af54a7f43135dc32fb97a4eaf7bf143995bf8 /meta/conf
parent40f0c2d7427ca62a8f268d61691039c5f73a1d4c (diff)
downloadpoky-f35b2e29d9bfa817e64b83df11ebbbfe0f4e8e5c.tar.gz
bitbake: set default libexecdir to $prefix/libexec
The use of $libdir/$BPN as libexecdir is contrary to all other mainstream distributions (which either use $prefix/libexec or $libdir), and the GNU Coding Standards[1] which suggests $prefix/libexec and notes that any package-specific nesting should be done by the package itself. Finally, having libexecdir change between recipes makes it very difficult for different recipes to invoke binaries that have been installed into libexecdir. The File System Hierarchy[2] now recognises the use of $prefix/libexec/, giving distributions the choice of $prefix/lib or $prefix/libexec without breaking FHS. Change bitbake.conf to use $prefix/libexec for libexecdir, so that the binaries are separated from the libraries. This should avoid complications with multilib configurations. [1] https://www.gnu.org/prep/standards/html_node/Directory-Variables.html [2] http://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html [ YOCTO #6398 ] (From OE-Core rev: e7270e331560546d3805cd66ed14afcbc96b6d89) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3a1953785e..7451eb8287 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -41,7 +41,7 @@ export systemd_user_unitdir = "${nonarch_libdir}/systemd/user"
41export bindir = "${exec_prefix}/bin" 41export bindir = "${exec_prefix}/bin"
42export sbindir = "${exec_prefix}/sbin" 42export sbindir = "${exec_prefix}/sbin"
43export libdir = "${exec_prefix}/${baselib}" 43export libdir = "${exec_prefix}/${baselib}"
44export libexecdir = "${libdir}/${BPN}" 44export libexecdir = "${exec_prefix}/libexec"
45export includedir = "${exec_prefix}/include" 45export includedir = "${exec_prefix}/include"
46export oldincludedir = "${exec_prefix}/include" 46export oldincludedir = "${exec_prefix}/include"
47localedir = "${libdir}/locale" 47localedir = "${libdir}/locale"
@@ -55,7 +55,7 @@ bindir_native = "${prefix_native}/bin"
55sbindir_native = "${prefix_native}/sbin" 55sbindir_native = "${prefix_native}/sbin"
56includedir_native = "${prefix_native}/include" 56includedir_native = "${prefix_native}/include"
57libdir_native = "${prefix_native}/lib" 57libdir_native = "${prefix_native}/lib"
58libexecdir_native = "${libdir_native}/${BPN}" 58libexecdir_native = "${prefix_native}/libexec"
59base_libdir_native = "/lib" 59base_libdir_native = "/lib"
60datadir_native = "${prefix_native}/share" 60datadir_native = "${prefix_native}/share"
61bindir_cross = "/bin" 61bindir_cross = "/bin"