summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorTobias Olausson <tobias.olausson@pelagicore.com>2014-10-20 16:09:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:36:15 +0100
commitf348071efd9419de3fa7f4e4ad78dfa5f8445412 (patch)
tree7210e42b132f8cfd8df9a89dde184629a7b3fb81 /meta/conf
parent8882eaaf97821fd96a72dc1382517689912d357b (diff)
downloadpoky-f348071efd9419de3fa7f4e4ad78dfa5f8445412.tar.gz
spdx.bbclass: improved stability, fixed SPDX compliance issues. Changes are reflected in licenses.conf.
The previous version could crash on dead links in the rootfs, or if the manifest directory did not exist. The generated files were also not compliant with the SPDX specification, for example file entries did not always start with the FileName tag, time stamps were incorrectly formatted etc. Stability issues are addressed by added checks, originally written by Johan Thelin <johan.thelin@pelagicore.com>, who never upstreamed them. I've also added an option for getting full SPDX output from FOSSology, i.e. not only for all files, but for the package as well, including license references. License refs are required in order to process the output by SPDXTools. For that reason, this option defaults to true. (From OE-Core rev: 5d3a4f4f57e4d8581fd88a14324f94e93104a690) Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/licenses.conf24
1 files changed, 21 insertions, 3 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index fe96066e4e..629916b6a5 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -143,7 +143,7 @@ DATA_LICENSE = "CC0-1.0"
143# information. 143# information.
144# 144#
145 145
146FOSS_COPYRIGHT = "true" 146FOSS_NO_COPYRIGHT = "true"
147 147
148# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is 148# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is
149# used to control if FOSSology server need recursively unpack tar.gz file which 149# used to control if FOSSology server need recursively unpack tar.gz file which
@@ -159,12 +159,30 @@ FOSS_COPYRIGHT = "true"
159 159
160FOSS_RECURSIVE_UNPACK = "false" 160FOSS_RECURSIVE_UNPACK = "false"
161 161
162# FOSSologySPDX instance server. 162# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to
163# control what kind of SPDX output to get from the FOSSology server.
164#
165# FOSS_FULL_SPDX = "true":
166# Tell FOSSology server to return full SPDX output, like if the program was
167# run from the command line. This is needed in order to get license refs for
168# the full package rather than individual files only.
169#
170# FOSS_FULL_SPDX = "false":
171# Tell FOSSology to only process license information for files. All package
172# license tags in the report will be "NOASSERTION"
173#
174
175FOSS_FULL_SPDX = "true"
176
177# FOSSologySPDX instance server. http://localhost/repo is the default
178# installation location for FOSSology.
179#
163# For more information on FOSSologySPDX commandline: 180# For more information on FOSSologySPDX commandline:
164# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API 181# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API
165# 182#
166 183
167FOSS_SERVER = "http://localhost//?mod=spdx_license_once&noCopyright=${FOSS_COPYRIGHT}&recursiveUnpack=${FOSS_RECURSIVE_UNPACK}" 184FOSS_BASE_URL = "http://localhost/repo/?mod=spdx_license_once"
185FOSS_SERVER = "${FOSS_BASE_URL}&fullSPDXFlag=${FOSS_FULL_SPDX}&noCopyright=${FOSS_NO_COPYRIGHT}&recursiveUnpack=${FOSS_RECURSIVE_UNPACK}"
168 186
169FOSS_WGET_FLAGS = "-qO - --no-check-certificate --timeout=0" 187FOSS_WGET_FLAGS = "-qO - --no-check-certificate --timeout=0"
170 188