summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-16 23:09:44 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:24:36 +0100
commitaf85ce4b4e675feb5796f87137c86d70c2f15b9a (patch)
treef19dbb9bcf1eec671b26685458f7cc47ebb3721e /meta/conf/bitbake.conf
parent046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff)
downloadpoky-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the different classes. The layout variables were only useful for the native/cross classes and caused more confusion than they solved. They didn't scale to the sdk class. It now clear a small set of native/cross variables fulfil the needs. This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes sense since we're installing binaries into the locations we're compiling them for. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r--meta/conf/bitbake.conf118
1 files changed, 52 insertions, 66 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a0e62578ec..f5031f0b01 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -1,65 +1,51 @@
1################################################################## 1##################################################################
2# Standard target filesystem layout.
3##################################################################
4
5# Path prefixes
6layout_prefix = "/usr"
7layout_exec_prefix = "/usr"
8layout_base_prefix = ""
9
10# Base paths
11layout_base_bindir = "${layout_base_prefix}/bin"
12layout_base_sbindir = "${layout_base_prefix}/sbin"
13layout_base_libdir = "${layout_base_prefix}/lib"
14
15# Architecture independent paths
16layout_sysconfdir = "${layout_base_prefix}/etc"
17layout_localstatedir = "${layout_base_prefix}/var"
18layout_servicedir = "${layout_base_prefix}/srv"
19layout_sharedstatedir = "${layout_prefix}/com"
20layout_datadir = "${layout_prefix}/share"
21layout_infodir = "${layout_datadir}/info"
22layout_mandir = "${layout_datadir}/man"
23layout_docdir = "${layout_datadir}/doc"
24
25# Architecture dependent paths
26layout_bindir = "${layout_exec_prefix}/bin"
27layout_sbindir = "${layout_exec_prefix}/sbin"
28layout_libdir = "${layout_exec_prefix}/lib"
29layout_includedir = "${layout_exec_prefix}/include"
30layout_libexecdir = "${layout_exec_prefix}/libexec"
31
32##################################################################
33# Standard target filesystem paths. 2# Standard target filesystem paths.
34################################################################## 3##################################################################
35 4
36# Path prefixes 5# Path prefixes
37export base_prefix = "" 6export base_prefix = ""
38export prefix = "${layout_prefix}" 7export prefix = "/usr"
39export exec_prefix = "${layout_exec_prefix}" 8export exec_prefix = "/usr"
40 9
41# Base paths 10# Base paths
42export base_bindir = "${layout_base_bindir}" 11export base_bindir = "${base_prefix}/bin"
43export base_sbindir = "${layout_base_sbindir}" 12export base_sbindir = "${base_prefix}/sbin"
44export base_libdir = "${layout_base_libdir}" 13export base_libdir = "${base_prefix}/lib"
45 14
46# Architecture independent paths 15# Architecture independent paths
47export datadir = "${layout_datadir}" 16export datadir = "${prefix}/share"
48export sysconfdir = "${layout_sysconfdir}" 17export sysconfdir = "${base_prefix}/etc"
49export sharedstatedir = "${layout_sharedstatedir}" 18export servicedir = "${base_prefix}/srv"
50export localstatedir = "${layout_localstatedir}" 19export sharedstatedir = "${base_prefix}/com"
51export infodir = "${layout_infodir}" 20export localstatedir = "${base_prefix}/var"
52export mandir = "${layout_mandir}" 21export infodir = "${datadir}/info"
53export docdir = "${layout_docdir}" 22export mandir = "${datadir}/man"
54export servicedir = "${layout_servicedir}" 23export docdir = "${datadir}/doc"
55 24
56# Architecture dependent paths 25# Architecture dependent paths
57export bindir = "${layout_bindir}" 26export bindir = "${exec_prefix}/bin"
58export sbindir = "${layout_sbindir}" 27export sbindir = "${exec_prefix}/sbin"
59export libexecdir = "${layout_libexecdir}" 28export libexecdir = "${exec_prefix}/libexec"
60export libdir = "${layout_libdir}" 29export libdir = "${exec_prefix}/lib"
61export includedir = "${layout_includedir}" 30export includedir = "${exec_prefix}/include"
62export oldincludedir = "${layout_includedir}" 31export oldincludedir = "${exec_prefix}/include"
32
33base_bindir_native = "/bin"
34base_sbindir_native = "/sbin"
35sysconfdir_native = "/etc"
36prefix_native = "/usr"
37bindir_native = "${prefix_native}/bin"
38sbindir_native = "${prefix_native}/sbin"
39includedir_native = "${prefix_native}/include"
40libdir_native = "${prefix_native}/lib"
41datadir_native = "${prefix_native}/share"
42bindir_cross = "/bin"
43
44#
45# Cross recipes need to know about the target layout
46# := is used carefully here
47#
48target_datadir := "${datadir}"
63 49
64################################################################## 50##################################################################
65# Architecture-dependent build variables. 51# Architecture-dependent build variables.
@@ -263,21 +249,21 @@ B = "${S}"
263STAGING_DIR = "${TMPDIR}/staging" 249STAGING_DIR = "${TMPDIR}/staging"
264 250
265STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 251STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
266STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" 252STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
267STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}" 253STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_cross}/${MULTIMACH_HOST_SYS}"
268STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" 254STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
269STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" 255STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
270STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" 256STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
271STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" 257STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
272 258
273# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine 259# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
274# specific packages - hack around it for now. 260# specific packages - hack around it for now.
275STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}" 261STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
276STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" 262STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
277STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" 263STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
278STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" 264STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
279STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" 265STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
280STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" 266STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
281STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" 267STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
282STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 268STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
283STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 269STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
@@ -367,7 +353,7 @@ EXTRA_IMAGEDEPENDS = ""
367 353
368CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}" 354CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
369CROSS_DATADIR = "${CROSS_DIR}/share" 355CROSS_DATADIR = "${CROSS_DIR}/share"
370PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:${STAGING_DIR_NATIVE}${layout_base_bindir}:" 356PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
371export PATH 357export PATH
372 358
373################################################################## 359##################################################################
@@ -418,7 +404,7 @@ export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
418BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}" 404BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
419export CPPFLAGS = "${TARGET_CPPFLAGS}" 405export CPPFLAGS = "${TARGET_CPPFLAGS}"
420export TARGET_CPPFLAGS = "" 406export TARGET_CPPFLAGS = ""
421#export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 407#export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
422 408
423export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" 409export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
424BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}" 410BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
@@ -439,8 +425,8 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
439 425
440export LDFLAGS = "${TARGET_LDFLAGS}" 426export LDFLAGS = "${TARGET_LDFLAGS}"
441export TARGET_LDFLAGS = "-Wl,-O1" 427export TARGET_LDFLAGS = "-Wl,-O1"
442#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ 428#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
443# -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ 429# -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
444# -Wl,-O1" 430# -Wl,-O1"
445 431
446# Which flags to leave by strip-flags() in bin/build/oebuild.sh ? 432# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
@@ -575,7 +561,7 @@ SLOT = "0"
575 561
576# Other 562# Other
577 563
578export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig" 564export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig"
579export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" 565export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
580export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 566export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
581export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 567export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"