diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 71 |
1 files changed, 34 insertions, 37 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8492c0d5db..523a33dd78 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -2,17 +2,14 @@ | |||
2 | # Standard target filesystem layout. | 2 | # Standard target filesystem layout. |
3 | ################################################################## | 3 | ################################################################## |
4 | 4 | ||
5 | # Note these currently match the existing staging layout but this | ||
6 | # is planned to change, see the oe-dev mailing list | ||
7 | |||
8 | # Path prefixes | 5 | # Path prefixes |
9 | layout_prefix = "" | 6 | layout_prefix = "/usr" |
10 | layout_exec_prefix = "" | 7 | layout_exec_prefix = "/usr" |
11 | layout_base_prefix = "" | 8 | layout_base_prefix = "" |
12 | 9 | ||
13 | # Base paths | 10 | # Base paths |
14 | layout_base_bindir = "${layout_base_prefix}/bin" | 11 | layout_base_bindir = "${layout_base_prefix}/bin" |
15 | layout_base_sbindir = "${layout_base_prefix}/bin" | 12 | layout_base_sbindir = "${layout_base_prefix}/sbin" |
16 | layout_base_libdir = "${layout_base_prefix}/lib" | 13 | layout_base_libdir = "${layout_base_prefix}/lib" |
17 | 14 | ||
18 | # Architecture independent paths | 15 | # Architecture independent paths |
@@ -27,7 +24,7 @@ layout_docdir = "${layout_datadir}/doc" | |||
27 | 24 | ||
28 | # Architecture dependent paths | 25 | # Architecture dependent paths |
29 | layout_bindir = "${layout_exec_prefix}/bin" | 26 | layout_bindir = "${layout_exec_prefix}/bin" |
30 | layout_sbindir = "${layout_exec_prefix}/bin" | 27 | layout_sbindir = "${layout_exec_prefix}/sbin" |
31 | layout_libdir = "${layout_exec_prefix}/lib" | 28 | layout_libdir = "${layout_exec_prefix}/lib" |
32 | layout_includedir = "${layout_exec_prefix}/include" | 29 | layout_includedir = "${layout_exec_prefix}/include" |
33 | layout_libexecdir = "${layout_exec_prefix}/libexec" | 30 | layout_libexecdir = "${layout_exec_prefix}/libexec" |
@@ -38,31 +35,31 @@ layout_libexecdir = "${layout_exec_prefix}/libexec" | |||
38 | 35 | ||
39 | # Path prefixes | 36 | # Path prefixes |
40 | export base_prefix = "" | 37 | export base_prefix = "" |
41 | export prefix = "/usr" | 38 | export prefix = "${layout_prefix}" |
42 | export exec_prefix = "${prefix}" | 39 | export exec_prefix = "${layout_exec_prefix}" |
43 | 40 | ||
44 | # Base paths | 41 | # Base paths |
45 | export base_bindir = "${base_prefix}/bin" | 42 | export base_bindir = "${layout_base_bindir}" |
46 | export base_sbindir = "${base_prefix}/sbin" | 43 | export base_sbindir = "${layout_base_sbindir}" |
47 | export base_libdir = "${base_prefix}/lib" | 44 | export base_libdir = "${layout_base_libdir}" |
48 | 45 | ||
49 | # Architecture independent paths | 46 | # Architecture independent paths |
50 | export datadir = "${prefix}/share" | 47 | export datadir = "${layout_datadir}" |
51 | export sysconfdir = "/etc" | 48 | export sysconfdir = "${layout_sysconfdir}" |
52 | export sharedstatedir = "${prefix}/com" | 49 | export sharedstatedir = "${layout_sharedstatedir}" |
53 | export localstatedir = "/var" | 50 | export localstatedir = "${layout_localstatedir}" |
54 | export infodir = "${datadir}/info" | 51 | export infodir = "${layout_infodir}" |
55 | export mandir = "${datadir}/man" | 52 | export mandir = "${layout_mandir}" |
56 | export docdir = "${datadir}/doc" | 53 | export docdir = "${layout_docdir}" |
57 | export servicedir = "/srv" | 54 | export servicedir = "${layout_servicedir}" |
58 | 55 | ||
59 | # Architecture dependent paths | 56 | # Architecture dependent paths |
60 | export bindir = "${exec_prefix}/bin" | 57 | export bindir = "${layout_bindir}" |
61 | export sbindir = "${exec_prefix}/sbin" | 58 | export sbindir = "${layout_sbindir}" |
62 | export libexecdir = "${exec_prefix}/libexec" | 59 | export libexecdir = "${layout_libexecdir}" |
63 | export libdir = "${exec_prefix}/lib" | 60 | export libdir = "${layout_libdir}" |
64 | export includedir = "${exec_prefix}/include" | 61 | export includedir = "${layout_includedir}" |
65 | export oldincludedir = "${exec_prefix}/include" | 62 | export oldincludedir = "${layout_includedir}" |
66 | 63 | ||
67 | ################################################################## | 64 | ################################################################## |
68 | # Architecture-dependent build variables. | 65 | # Architecture-dependent build variables. |
@@ -203,18 +200,18 @@ B = "${S}" | |||
203 | STAGING_DIR = "${TMPDIR}/staging" | 200 | STAGING_DIR = "${TMPDIR}/staging" |
204 | 201 | ||
205 | STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" | 202 | STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" |
206 | STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin" | 203 | STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" |
207 | STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}" | 204 | STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}" |
208 | STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib" | 205 | STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" |
209 | STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include" | 206 | STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" |
210 | STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc" | 207 | STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" |
211 | STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share" | 208 | STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" |
212 | 209 | ||
213 | STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" | 210 | STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" |
214 | STAGING_BINDIR = "${STAGING_DIR_HOST}/bin" | 211 | STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" |
215 | STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib" | 212 | STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" |
216 | STAGING_INCDIR = "${STAGING_DIR_HOST}/include" | 213 | STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" |
217 | STAGING_DATADIR = "${STAGING_DIR_HOST}/share" | 214 | STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" |
218 | STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" | 215 | STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" |
219 | STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" | 216 | STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" |
220 | STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" | 217 | STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" |
@@ -291,7 +288,7 @@ EXTRA_IMAGEDEPENDS = "" | |||
291 | 288 | ||
292 | CROSS_DIR = "${TMPDIR}/cross" | 289 | CROSS_DIR = "${TMPDIR}/cross" |
293 | CROSS_DATADIR = "${CROSS_DIR}/share" | 290 | CROSS_DATADIR = "${CROSS_DIR}/share" |
294 | export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:" | 291 | export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" |
295 | 292 | ||
296 | ################################################################## | 293 | ################################################################## |
297 | # Build utility info. | 294 | # Build utility info. |