Path variable updates:

  * add base_prefix, base_bindir, base_libdir, and base_sbindir, for paths
    that are always rooted at / (for things like /sbin/ldconfig).
  * Rearrange the path bits in bitbake.conf to be a bit more comprehensible.
  * Override more path variables in cross.bbclass and native.bbclass, so that
    they can safely be overridden by the user.

BKrev: 420c0550HAHmBzqBNAmgZogIut9Srg

1 files changed, 20 insertions, 9 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7c91245379..fc62c269ef 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -2,23 +2,34 @@
 # Standard target filesystem paths.
 ##################################################################
 
+# Path prefixes
+export base_prefix = ""
 export prefix = "/usr"
 export exec_prefix = "${prefix}"
-export bindir = "${exec_prefix}/bin"
-export sbindir = "${exec_prefix}/sbin"
-export libexecdir = "${exec_prefix}/libexec"
+
+# Base paths
+export base_bindir = "${base_prefix}/bin"
+export base_sbindir = "${base_prefix}/sbin"
+export base_libdir = "${base_prefix}/lib"
+
+# Architecture independent paths
 export datadir = "${prefix}/share"
 export sysconfdir = "/etc"
 export sharedstatedir = "${prefix}/com"
 export localstatedir = "/var"
-export libdir = "${exec_prefix}/lib"
-export includedir = "${prefix}/include"
-export oldincludedir = "/usr/include"
-export infodir = "${datadir}/info"
-export mandir = "${datadir}/man"
-export docdir = "${datadir}/doc"
+export infodir = "${prefix}/info"
+export mandir = "${prefix}/man"
+export docdir = "${prefix}/doc"
 export servicedir = "/srv"
 
+# Architecture dependent paths
+export bindir = "${exec_prefix}/bin"
+export sbindir = "${exec_prefix}/sbin"
+export libexecdir = "${exec_prefix}/libexec"
+export libdir = "${exec_prefix}/lib"
+export includedir = "${exec_prefix}/include"
+export oldincludedir = "${exec_prefix}/include"
+
 ##################################################################
 # Architecture-dependent build variables.
 ##################################################################