diff options
Diffstat (limited to 'meta/classes/spdx.bbclass')
| -rw-r--r-- | meta/classes/spdx.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 89394d3a96..c5f544d2a4 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass | |||
| @@ -26,20 +26,20 @@ python do_spdx () { | |||
| 26 | import json, shutil | 26 | import json, shutil |
| 27 | 27 | ||
| 28 | info = {} | 28 | info = {} |
| 29 | info['workdir'] = d.getVar('WORKDIR', True) | 29 | info['workdir'] = d.getVar('WORKDIR') |
| 30 | info['sourcedir'] = d.getVar('SPDX_S', True) | 30 | info['sourcedir'] = d.getVar('SPDX_S') |
| 31 | info['pn'] = d.getVar('PN', True) | 31 | info['pn'] = d.getVar('PN') |
| 32 | info['pv'] = d.getVar('PV', True) | 32 | info['pv'] = d.getVar('PV') |
| 33 | info['spdx_version'] = d.getVar('SPDX_VERSION', True) | 33 | info['spdx_version'] = d.getVar('SPDX_VERSION') |
| 34 | info['data_license'] = d.getVar('DATA_LICENSE', True) | 34 | info['data_license'] = d.getVar('DATA_LICENSE') |
| 35 | 35 | ||
| 36 | sstatedir = d.getVar('SPDXSSTATEDIR', True) | 36 | sstatedir = d.getVar('SPDXSSTATEDIR') |
| 37 | sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + ".spdx") | 37 | sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + ".spdx") |
| 38 | 38 | ||
| 39 | manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) | 39 | manifest_dir = d.getVar('SPDX_MANIFEST_DIR') |
| 40 | info['outfile'] = os.path.join(manifest_dir, info['pn'] + ".spdx" ) | 40 | info['outfile'] = os.path.join(manifest_dir, info['pn'] + ".spdx" ) |
| 41 | 41 | ||
| 42 | info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) | 42 | info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR') |
| 43 | info['tar_file'] = os.path.join(info['workdir'], info['pn'] + ".tar.gz" ) | 43 | info['tar_file'] = os.path.join(info['workdir'], info['pn'] + ".tar.gz" ) |
| 44 | 44 | ||
| 45 | # Make sure important dirs exist | 45 | # Make sure important dirs exist |
| @@ -74,9 +74,9 @@ python do_spdx () { | |||
| 74 | foss_license_info = cached_spdx['Licenses'] | 74 | foss_license_info = cached_spdx['Licenses'] |
| 75 | else: | 75 | else: |
| 76 | ## setup fossology command | 76 | ## setup fossology command |
| 77 | foss_server = d.getVar('FOSS_SERVER', True) | 77 | foss_server = d.getVar('FOSS_SERVER') |
| 78 | foss_flags = d.getVar('FOSS_WGET_FLAGS', True) | 78 | foss_flags = d.getVar('FOSS_WGET_FLAGS') |
| 79 | foss_full_spdx = d.getVar('FOSS_FULL_SPDX', True) == "true" or False | 79 | foss_full_spdx = d.getVar('FOSS_FULL_SPDX') == "true" or False |
| 80 | foss_command = "wget %s --post-file=%s %s"\ | 80 | foss_command = "wget %s --post-file=%s %s"\ |
| 81 | % (foss_flags, info['tar_file'], foss_server) | 81 | % (foss_flags, info['tar_file'], foss_server) |
| 82 | 82 | ||
