diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2017-01-01 22:21:20 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-01-03 10:28:33 -0500 |
commit | e64f378b93e6fed8f5e8a019e1c4a82bdad4fe0c (patch) | |
tree | 79cbcd4bfe6b2db3e8baf0a0a9c2d224296e7692 /classes | |
parent | b0a72cd343c9bdb38d01f6dbf0c5ac3d55c769dd (diff) | |
download | meta-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>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/go-osarchmap.bbclass | 18 |
1 files changed, 9 insertions, 9 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 @@ | |||
1 | BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS', True), d)}" | 1 | BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS'), d)}" |
2 | BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH', True), d)}" | 2 | BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH'), d)}" |
3 | BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}" | 3 | BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}" |
4 | HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS', True), d)}" | 4 | HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS'), d)}" |
5 | HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH', True), d)}" | 5 | HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH'), d)}" |
6 | HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH', True), d.getVar('TUNE_FEATURES', True), d)}" | 6 | HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}" |
7 | HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}" | 7 | HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}" |
8 | TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS', True), d)}" | 8 | TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS'), d)}" |
9 | TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH', True), d)}" | 9 | TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH'), d)}" |
10 | TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH', True), d.getVar('TUNE_FEATURES', True), d)}" | 10 | TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}" |
11 | TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" | 11 | TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" |
12 | GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" | 12 | GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" |
13 | 13 | ||
14 | python() { | 14 | python() { |
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 | ||
19 | def go_map_arch(a, d): | 19 | def go_map_arch(a, d): |