diff options
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 18879c82fe..c8d9a31074 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -102,7 +102,7 @@ ABIEXTENSION ??= "" | |||
102 | TARGET_ARCH = "${TUNE_ARCH}" | 102 | TARGET_ARCH = "${TUNE_ARCH}" |
103 | TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" | 103 | TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" |
104 | TARGET_VENDOR = "-oe" | 104 | TARGET_VENDOR = "-oe" |
105 | TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS', 1), ''][d.getVar('TARGET_OS', 1) == ('' or 'custom')]}" | 105 | TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS', True), ''][d.getVar('TARGET_OS', True) == ('' or 'custom')]}" |
106 | TARGET_PREFIX = "${TARGET_SYS}-" | 106 | TARGET_PREFIX = "${TARGET_SYS}-" |
107 | TARGET_CC_ARCH = "${TUNE_CCARGS}" | 107 | TARGET_CC_ARCH = "${TUNE_CCARGS}" |
108 | TARGET_LD_ARCH = "${TUNE_LDARGS}" | 108 | TARGET_LD_ARCH = "${TUNE_LDARGS}" |
@@ -111,7 +111,7 @@ TARGET_AS_ARCH = "${TUNE_ASARGS}" | |||
111 | SDK_ARCH = "${BUILD_ARCH}" | 111 | SDK_ARCH = "${BUILD_ARCH}" |
112 | SDK_OS = "${BUILD_OS}" | 112 | SDK_OS = "${BUILD_OS}" |
113 | SDK_VENDOR = "-oesdk" | 113 | SDK_VENDOR = "-oesdk" |
114 | SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', 1), ''][d.getVar('SDK_OS', 1) == ('' or 'custom')]}" | 114 | SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}" |
115 | SDK_PREFIX = "${SDK_SYS}-" | 115 | SDK_PREFIX = "${SDK_SYS}-" |
116 | SDK_CC_ARCH = "${BUILD_CC_ARCH}" | 116 | SDK_CC_ARCH = "${BUILD_CC_ARCH}" |
117 | SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-nativesdk" | 117 | SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-nativesdk" |
@@ -119,7 +119,7 @@ SDK_LD_ARCH = "${BUILD_LD_ARCH}" | |||
119 | SDK_AS_ARCH = "${BUILD_AS_ARCH}" | 119 | SDK_AS_ARCH = "${BUILD_AS_ARCH}" |
120 | 120 | ||
121 | PACKAGE_ARCH = "${TUNE_PKGARCH}" | 121 | PACKAGE_ARCH = "${TUNE_PKGARCH}" |
122 | MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', 1), d.getVar('MACHINE', 1)][bool(d.getVar('MACHINE', 1))].replace('-', '_')}" | 122 | MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', True), d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')}" |
123 | PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}" | 123 | PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}" |
124 | PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" | 124 | PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" |
125 | # MACHINE_ARCH shouldn't be included here as a variable dependency | 125 | # MACHINE_ARCH shouldn't be included here as a variable dependency |
@@ -300,14 +300,14 @@ FILES_${PN}-locale = "${datadir}/locale" | |||
300 | FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}" | 300 | FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}" |
301 | # FILESPATH is set in base.bbclass | 301 | # FILESPATH is set in base.bbclass |
302 | #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" | 302 | #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" |
303 | FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" | 303 | FILESDIR = "${@bb.which(d.getVar('FILESPATH', True), '.')}" |
304 | 304 | ||
305 | ################################################################## | 305 | ################################################################## |
306 | # General work and output directories for the build system. | 306 | # General work and output directories for the build system. |
307 | ################################################################## | 307 | ################################################################## |
308 | 308 | ||
309 | TMPDIR ?= "${TOPDIR}/tmp" | 309 | TMPDIR ?= "${TOPDIR}/tmp" |
310 | CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE', 1))][bool(d.getVar('MACHINE', 1))]}${@['', '/' + str(d.getVar('SDKMACHINE', 1))][bool(d.getVar('SDKMACHINE', 1))]}" | 310 | CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE', True))][bool(d.getVar('MACHINE', True))]}${@['', '/' + str(d.getVar('SDKMACHINE', True))][bool(d.getVar('SDKMACHINE', True))]}" |
311 | # The persistent cache should be shared by all builds | 311 | # The persistent cache should be shared by all builds |
312 | PERSISTENT_DIR = "${TMPDIR}/cache" | 312 | PERSISTENT_DIR = "${TMPDIR}/cache" |
313 | LOG_DIR = "${TMPDIR}/log" | 313 | LOG_DIR = "${TMPDIR}/log" |
@@ -408,7 +408,7 @@ export PATH | |||
408 | # Build utility info. | 408 | # Build utility info. |
409 | ################################################################## | 409 | ################################################################## |
410 | 410 | ||
411 | CCACHE = "${@bb.which(d.getVar('PATH', 1), 'ccache') and 'ccache '}" | 411 | CCACHE = "${@bb.which(d.getVar('PATH', True), 'ccache') and 'ccache '}" |
412 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" | 412 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" |
413 | 413 | ||
414 | export CCACHE_DIR = "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}" | 414 | export CCACHE_DIR = "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}" |