summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt/classes/sdk-sources.bbclass
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-11-20 13:43:51 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-11-21 11:43:18 +0000
commitc5a5bce25764de55420664b6896fd76ba5d18f45 (patch)
tree37946f9fcb4cf9dc9f09e0f693cb2b95a1c1f775 /meta-boot2qt/classes/sdk-sources.bbclass
parent41105c273d58293be70f23d8e0ac24f41042d3f0 (diff)
downloadmeta-boot2qt-c5a5bce25764de55420664b6896fd76ba5d18f45.tar.gz
Remove default expansion parameter from getVarv5.12.0-rc
getVar defaults to expanding the variable, the second True parameter is unnecessary. Change-Id: Iafaf179c67ffedaba2946c078c1810a80198cf5e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt/classes/sdk-sources.bbclass')
-rw-r--r--meta-boot2qt/classes/sdk-sources.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-boot2qt/classes/sdk-sources.bbclass b/meta-boot2qt/classes/sdk-sources.bbclass
index b12f371..10454b4 100644
--- a/meta-boot2qt/classes/sdk-sources.bbclass
+++ b/meta-boot2qt/classes/sdk-sources.bbclass
@@ -28,11 +28,11 @@
28############################################################################ 28############################################################################
29 29
30python do_fetch () { 30python do_fetch () {
31 src_uri = (d.getVar('SRC_URI', True) or "").split() 31 src_uri = (d.getVar('SRC_URI') or "").split()
32 if len(src_uri) == 0: 32 if len(src_uri) == 0:
33 return 33 return
34 34
35 sdk_path = d.getVar('QT_SDK_PATH', True) or "" 35 sdk_path = d.getVar('QT_SDK_PATH') or ""
36 if len(sdk_path) != 0: 36 if len(sdk_path) != 0:
37 uris = list(src_uri); 37 uris = list(src_uri);
38 for url in uris: 38 for url in uris:
@@ -53,13 +53,13 @@ python do_fetch () {
53 53
54python do_unpack () { 54python do_unpack () {
55 sdk_uds = []; 55 sdk_uds = [];
56 src_uri = (d.getVar('SRC_URI', True) or "").split() 56 src_uri = (d.getVar('SRC_URI') or "").split()
57 if len(src_uri) == 0: 57 if len(src_uri) == 0:
58 return 58 return
59 59
60 rootdir = d.getVar('WORKDIR', True) 60 rootdir = d.getVar('WORKDIR')
61 61
62 sdk_path = d.getVar('QT_SDK_PATH', True) or "" 62 sdk_path = d.getVar('QT_SDK_PATH') or ""
63 if len(sdk_path) != 0: 63 if len(sdk_path) != 0:
64 uris = list(src_uri); 64 uris = list(src_uri);
65 for url in uris: 65 for url in uris:
@@ -81,8 +81,8 @@ python do_unpack () {
81 81
82def unpack_local_uri(ud, d): 82def unpack_local_uri(ud, d):
83 import subprocess 83 import subprocess
84 rootdir = d.getVar('WORKDIR', True) 84 rootdir = d.getVar('WORKDIR')
85 sdk_path = d.getVar('QT_SDK_PATH', True) 85 sdk_path = d.getVar('QT_SDK_PATH')
86 86
87 destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git")) 87 destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git"))
88 srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri")) 88 srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri"))