MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove True option to getVar calls

Browse Source 
getVar() now defaults to expanding by default.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Paul Barker 2017-01-01 22:21:20 +00:00 committed by Bruce Ashfield
parent b0a72cd343
commit e64f378b93
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/go-osarchmap.bbclass
View File

@ -1,19 +1,19 @@
BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS', True), d)}" BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS'), d)}"
BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH', True), d)}" BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH'), d)}"
BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}" BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}"
HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS', True), d)}" HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS'), d)}"
HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH', True), d)}" HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH'), d)}"
HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH', True), d.getVar('TUNE_FEATURES', True), d)}" HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}" HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}"
TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS', True), d)}" TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS'), d)}"
TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH', True), d)}" TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH'), d)}"
TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH', True), d.getVar('TUNE_FEATURES', True), d)}" TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}"
GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}"
python() { python() {
if d.getVar('TARGET_GOARCH') == 'INVALID': if d.getVar('TARGET_GOARCH') == 'INVALID':
raise bb.parse.SkipPackage('Cannot map `%s` to a go architecture' % d.getVar('TARGET_ARCH', True)) raise bb.parse.SkipPackage('Cannot map `%s` to a go architecture' % d.getVar('TARGET_ARCH'))
} }
def go_map_arch(a, d): def go_map_arch(a, d):

2
recipes-devtools/go-cross/go-cross.inc
View File

@ -17,7 +17,7 @@ export GOROOT_FINAL = "${libdir}/go"
export CGO_ENABLED = "1" export CGO_ENABLED = "1"
export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
CC = "${@d.getVar('BUILD_CC', True).strip()}" CC = "${@d.getVar('BUILD_CC').strip()}"
do_configure[noexec] = "1" do_configure[noexec] = "1"

2
recipes-extended/libvirt/libvirt-python.inc
View File

@ -32,7 +32,7 @@ LIBVIRT_INSTALL_ARGS = "--root=${D} \
--install-data=${datadir}" --install-data=${datadir}"
python __anonymous () { python __anonymous () {
pkgconfig = d.getVar('PACKAGECONFIG', True) pkgconfig = d.getVar('PACKAGECONFIG')
if ('python') in pkgconfig.split(): if ('python') in pkgconfig.split():
d.setVar('LIBVIRT_PYTHON_ENABLE', '1') d.setVar('LIBVIRT_PYTHON_ENABLE', '1')
else: else:

2
recipes-extended/xen/xen-arch.inc
View File

@ -6,7 +6,7 @@ valid_xen_archs = " \
def map_xen_arch(a, d): def map_xen_arch(a, d):
import re import re
valid_archs = d.getVar('valid_xen_archs', True).split() valid_archs = d.getVar('valid_xen_archs').split()
if re.match("i.86", a): return "x86_32" if re.match("i.86", a): return "x86_32"
elif re.match("x86.64", a): return "x86_64" elif re.match("x86.64", a): return "x86_64"

10
recipes-extended/xen/xen.inc
View File

@ -739,12 +739,12 @@ export STAGING_INCDIR
export STAGING_LIBDIR export STAGING_LIBDIR
# specify xen hypervisor to build/target # specify xen hypervisor to build/target
export XEN_TARGET_ARCH = "${@map_xen_arch(d.getVar('TARGET_ARCH', True), d)}" export XEN_TARGET_ARCH = "${@map_xen_arch(d.getVar('TARGET_ARCH'), d)}"
export XEN_COMPILE_ARCH = "${@map_xen_arch(d.getVar('BUILD_ARCH', True), d)}" export XEN_COMPILE_ARCH = "${@map_xen_arch(d.getVar('BUILD_ARCH'), d)}"
python () { python () {
if d.getVar('XEN_TARGET_ARCH', True) == 'INVALID': if d.getVar('XEN_TARGET_ARCH') == 'INVALID':
raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH', True)) raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH'))
} }
# Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well # Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well
@ -804,7 +804,7 @@ EXTRA_OEMAKE += "GIT=/bin/false"
# check for XSM in package config to allow XSM_ENABLE to be set # check for XSM in package config to allow XSM_ENABLE to be set
python () { python () {
pkgconfig = d.getVar('PACKAGECONFIG', True) pkgconfig = d.getVar('PACKAGECONFIG')
if ('xsm') in pkgconfig.split(): if ('xsm') in pkgconfig.split():
d.setVar('XSM_ENABLED', '1') d.setVar('XSM_ENABLED', '1')
else: else: