summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2017-01-01 22:21:20 +0000
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-01-03 10:28:33 -0500
commite64f378b93e6fed8f5e8a019e1c4a82bdad4fe0c (patch)
tree79cbcd4bfe6b2db3e8baf0a0a9c2d224296e7692
parentb0a72cd343c9bdb38d01f6dbf0c5ac3d55c769dd (diff)
downloadmeta-virtualization-e64f378b93e6fed8f5e8a019e1c4a82bdad4fe0c.tar.gz
Remove True option to getVar calls
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>
-rw-r--r--classes/go-osarchmap.bbclass18
-rw-r--r--recipes-devtools/go-cross/go-cross.inc2
-rw-r--r--recipes-extended/libvirt/libvirt-python.inc2
-rw-r--r--recipes-extended/xen/xen-arch.inc2
-rw-r--r--recipes-extended/xen/xen.inc10
5 files changed, 17 insertions, 17 deletions
diff --git a/classes/go-osarchmap.bbclass b/classes/go-osarchmap.bbclass
index 303b30ba..058bf642 100644
--- a/classes/go-osarchmap.bbclass
+++ b/classes/go-osarchmap.bbclass
@@ -1,19 +1,19 @@
1BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS', True), d)}" 1BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS'), d)}"
2BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH', True), d)}" 2BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH'), d)}"
3BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}" 3BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}"
4HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS', True), d)}" 4HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS'), d)}"
5HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH', True), d)}" 5HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH'), d)}"
6HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH', True), d.getVar('TUNE_FEATURES', True), d)}" 6HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
7HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}" 7HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}"
8TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS', True), d)}" 8TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS'), d)}"
9TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH', True), d)}" 9TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH'), d)}"
10TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH', True), d.getVar('TUNE_FEATURES', True), d)}" 10TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
11TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" 11TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}"
12GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" 12GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}"
13 13
14python() { 14python() {
15 if d.getVar('TARGET_GOARCH') == 'INVALID': 15 if d.getVar('TARGET_GOARCH') == 'INVALID':
16 raise bb.parse.SkipPackage('Cannot map `%s` to a go architecture' % d.getVar('TARGET_ARCH', True)) 16 raise bb.parse.SkipPackage('Cannot map `%s` to a go architecture' % d.getVar('TARGET_ARCH'))
17} 17}
18 18
19def go_map_arch(a, d): 19def go_map_arch(a, d):
diff --git a/recipes-devtools/go-cross/go-cross.inc b/recipes-devtools/go-cross/go-cross.inc
index 31749878..0859fd00 100644
--- a/recipes-devtools/go-cross/go-cross.inc
+++ b/recipes-devtools/go-cross/go-cross.inc
@@ -17,7 +17,7 @@ export GOROOT_FINAL = "${libdir}/go"
17export CGO_ENABLED = "1" 17export CGO_ENABLED = "1"
18export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" 18export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
19export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" 19export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
20CC = "${@d.getVar('BUILD_CC', True).strip()}" 20CC = "${@d.getVar('BUILD_CC').strip()}"
21 21
22do_configure[noexec] = "1" 22do_configure[noexec] = "1"
23 23
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index bc2f1de2..15aa8044 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -32,7 +32,7 @@ LIBVIRT_INSTALL_ARGS = "--root=${D} \
32 --install-data=${datadir}" 32 --install-data=${datadir}"
33 33
34python __anonymous () { 34python __anonymous () {
35 pkgconfig = d.getVar('PACKAGECONFIG', True) 35 pkgconfig = d.getVar('PACKAGECONFIG')
36 if ('python') in pkgconfig.split(): 36 if ('python') in pkgconfig.split():
37 d.setVar('LIBVIRT_PYTHON_ENABLE', '1') 37 d.setVar('LIBVIRT_PYTHON_ENABLE', '1')
38 else: 38 else:
diff --git a/recipes-extended/xen/xen-arch.inc b/recipes-extended/xen/xen-arch.inc
index 844d47dd..fb0093e3 100644
--- a/recipes-extended/xen/xen-arch.inc
+++ b/recipes-extended/xen/xen-arch.inc
@@ -6,7 +6,7 @@ valid_xen_archs = " \
6 6
7def map_xen_arch(a, d): 7def map_xen_arch(a, d):
8 import re 8 import re
9 valid_archs = d.getVar('valid_xen_archs', True).split() 9 valid_archs = d.getVar('valid_xen_archs').split()
10 10
11 if re.match("i.86", a): return "x86_32" 11 if re.match("i.86", a): return "x86_32"
12 elif re.match("x86.64", a): return "x86_64" 12 elif re.match("x86.64", a): return "x86_64"
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 429a05a9..bc62a5a8 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -739,12 +739,12 @@ export STAGING_INCDIR
739export STAGING_LIBDIR 739export STAGING_LIBDIR
740 740
741# specify xen hypervisor to build/target 741# specify xen hypervisor to build/target
742export XEN_TARGET_ARCH = "${@map_xen_arch(d.getVar('TARGET_ARCH', True), d)}" 742export XEN_TARGET_ARCH = "${@map_xen_arch(d.getVar('TARGET_ARCH'), d)}"
743export XEN_COMPILE_ARCH = "${@map_xen_arch(d.getVar('BUILD_ARCH', True), d)}" 743export XEN_COMPILE_ARCH = "${@map_xen_arch(d.getVar('BUILD_ARCH'), d)}"
744 744
745python () { 745python () {
746 if d.getVar('XEN_TARGET_ARCH', True) == 'INVALID': 746 if d.getVar('XEN_TARGET_ARCH') == 'INVALID':
747 raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH', True)) 747 raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH'))
748} 748}
749 749
750# Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well 750# Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well
@@ -804,7 +804,7 @@ EXTRA_OEMAKE += "GIT=/bin/false"
804 804
805# check for XSM in package config to allow XSM_ENABLE to be set 805# check for XSM in package config to allow XSM_ENABLE to be set
806python () { 806python () {
807 pkgconfig = d.getVar('PACKAGECONFIG', True) 807 pkgconfig = d.getVar('PACKAGECONFIG')
808 if ('xsm') in pkgconfig.split(): 808 if ('xsm') in pkgconfig.split():
809 d.setVar('XSM_ENABLED', '1') 809 d.setVar('XSM_ENABLED', '1')
810 else: 810 else: