mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
@@ -99,7 +99,7 @@ ABIEXTENSION ??= ""
|
||||
TARGET_ARCH = "${TUNE_ARCH}"
|
||||
TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}"
|
||||
TARGET_VENDOR = "-oe"
|
||||
TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
|
||||
TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS', 1), ''][d.getVar('TARGET_OS', 1) == ('' or 'custom')]}"
|
||||
TARGET_PREFIX = "${TARGET_SYS}-"
|
||||
TARGET_CC_ARCH = "${TUNE_CCARGS}"
|
||||
TARGET_LD_ARCH = "${TUNE_LDARGS}"
|
||||
@@ -108,7 +108,7 @@ TARGET_AS_ARCH = "${TUNE_ASARGS}"
|
||||
SDK_ARCH = "${BUILD_ARCH}"
|
||||
SDK_OS = "${BUILD_OS}"
|
||||
SDK_VENDOR = "-oesdk"
|
||||
SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
|
||||
SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', 1), ''][d.getVar('SDK_OS', 1) == ('' or 'custom')]}"
|
||||
SDK_PREFIX = "${SDK_SYS}-"
|
||||
SDK_CC_ARCH = "${BUILD_CC_ARCH}"
|
||||
SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-nativesdk"
|
||||
@@ -116,7 +116,7 @@ SDK_LD_ARCH = "${BUILD_LD_ARCH}"
|
||||
SDK_AS_ARCH = "${BUILD_AS_ARCH}"
|
||||
|
||||
PACKAGE_ARCH = "${TUNE_PKGARCH}"
|
||||
MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
|
||||
MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', 1), d.getVar('MACHINE', 1)][bool(d.getVar('MACHINE', 1))].replace('-', '_')}"
|
||||
PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}"
|
||||
PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
|
||||
# MACHINE_ARCH shouldn't be included here as a variable dependency
|
||||
@@ -167,33 +167,33 @@ ASSUME_PROVIDED = "\
|
||||
# Package default variables.
|
||||
##################################################################
|
||||
|
||||
PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
|
||||
PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
|
||||
PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
|
||||
PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}"
|
||||
PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}"
|
||||
PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}"
|
||||
PF = "${PN}-${EXTENDPE}${PV}-${PR}"
|
||||
EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}"
|
||||
EXTENDPE = "${@['','${PE\x7d_'][d.getVar('PE',1) > 0]}"
|
||||
P = "${PN}-${PV}"
|
||||
|
||||
EXTENDPRAUTO = "${@['.${PRAUTO\x7d',''][bb.data.getVar('PRAUTO',d,1) is None]}"
|
||||
EXTENDPRAUTO = "${@['.${PRAUTO\x7d',''][d.getVar('PRAUTO',1) is None]}"
|
||||
PRAUTOINX = "${PF}"
|
||||
|
||||
PKGV ?= "${PV}"
|
||||
PKGR ?= "${PR}${EXTENDPRAUTO}"
|
||||
PKGE ?= "${@['','${PE\x7d'][bb.data.getVar('PE',d,1) > 0]}"
|
||||
EXTENDPKGEVER = "${@['','${PKGE\x7d:'][bb.data.getVar('PKGE',d,1).strip() != '']}"
|
||||
PKGE ?= "${@['','${PE\x7d'][d.getVar('PE',1) > 0]}"
|
||||
EXTENDPKGEVER = "${@['','${PKGE\x7d:'][d.getVar('PKGE',1).strip() != '']}"
|
||||
EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}"
|
||||
|
||||
# Base package name
|
||||
# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
|
||||
# otherwise it is the same as PN and P
|
||||
SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian"
|
||||
BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}"
|
||||
BPN = "${@base_prune_suffix(d.getVar('PN', True), d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}"
|
||||
BP = "${BPN}-${PV}"
|
||||
|
||||
#
|
||||
# network based PR service
|
||||
#
|
||||
USE_PR_SERV = "${@[1,0][(bb.data.getVar('PRSERV_HOST',d,1) is None) or (bb.data.getVar('PRSERV_PORT',d,1) is None)]}"
|
||||
USE_PR_SERV = "${@[1,0][(d.getVar('PRSERV_HOST',1) is None) or (d.getVar('PRSERV_PORT',1) is None)]}"
|
||||
|
||||
# Package info.
|
||||
|
||||
@@ -288,7 +288,7 @@ DOTDEBUG-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir
|
||||
|
||||
DEBUGFILEDIRECTORY-dbg = "/usr/lib/debug /usr/src/debug"
|
||||
|
||||
FILES_${PN}-dbg = "${@bb.data.getVar(['DOTDEBUG-dbg', 'DEBUGFILEDIRECTORY-dbg'][bb.data.getVar('PACKAGE_DEBUG_SPLIT_STYLE', d, 1) == 'debug-file-directory'], d, 1)}"
|
||||
FILES_${PN}-dbg = "${@bb.data.getVar(['DOTDEBUG-dbg', 'DEBUGFILEDIRECTORY-dbg'][d.getVar('PACKAGE_DEBUG_SPLIT_STYLE', 1) == 'debug-file-directory'], d, 1)}"
|
||||
|
||||
SECTION_${PN}-dbg = "devel"
|
||||
ALLOW_EMPTY_${PN}-dbg = "1"
|
||||
@@ -298,17 +298,17 @@ FILES_${PN}-locale = "${datadir}/locale"
|
||||
|
||||
# File manifest
|
||||
|
||||
FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
|
||||
FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}"
|
||||
# FILESPATH is set in base.bbclass
|
||||
#FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
|
||||
FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
|
||||
FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}"
|
||||
|
||||
##################################################################
|
||||
# General work and output directories for the build system.
|
||||
##################################################################
|
||||
|
||||
TMPDIR ?= "${TOPDIR}/tmp"
|
||||
CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"
|
||||
CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE', 1))][bool(d.getVar('MACHINE', 1))]}${@['', '/' + str(d.getVar('SDKMACHINE', 1))][bool(d.getVar('SDKMACHINE', 1))]}"
|
||||
# The persistent cache should be shared by all builds
|
||||
PERSISTENT_DIR = "${TMPDIR}/cache"
|
||||
LOG_DIR = "${TMPDIR}/log"
|
||||
@@ -403,7 +403,7 @@ export PATH
|
||||
# Build utility info.
|
||||
##################################################################
|
||||
|
||||
CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}"
|
||||
CCACHE = "${@bb.which(d.getVar('PATH', 1), 'ccache') and 'ccache '}"
|
||||
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
|
||||
|
||||
export CCACHE_DIR = "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}"
|
||||
@@ -505,7 +505,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types"
|
||||
# Disabled until the option works properly -feliminate-dwarf2-dups
|
||||
FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
|
||||
DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
|
||||
SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
|
||||
SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}"
|
||||
BUILD_OPTIMIZATION = "-O2 -pipe"
|
||||
|
||||
##################################################################
|
||||
|
||||
Reference in New Issue
Block a user