1) Define new command line to get spdx file. 2) Define some mandatory fields for spdx 0.2
Signed-off-by: Lei Maohui <[email protected]> --- meta/conf/licenses.conf | 77 +++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 57 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 629916b..1d37616 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -122,68 +122,31 @@ SPDXLICENSEMAP[SGIv1] = "SGI-1" #COPY_LIC_DIRS = "1" ## SPDX temporary directory -SPDX_TEMP_DIR = "${WORKDIR}/spdx_temp" -SPDX_MANIFEST_DIR = "/home/yocto/fossology_scans" +SPDX_TEMP_DIR ?= "${WORKDIR}/spdx_temp" +SPDX_MANIFEST_DIR ?= "/home/yocto/fossology_scans" ## SPDX Format info -SPDX_VERSION = "SPDX-1.1" +SPDX_VERSION = "SPDX-1.2" DATA_LICENSE = "CC0-1.0" +## If your fossylogy server is from 2.4.0 to 2.6.1,the LICENSELISTVERSION is 1.19 +## Reference to http://www.fossology.org/projects/fossology/wiki/Release_Notes +LICENSELISTVERSION = "1.19" +CREATOR_TOOL = "yocto+fossology-spdx" + +# FOSSologySPDX instance server. +FOSS_SERVER ?= "http://127.0.0.1/repo/ --noproxy 127.0.0.1" + +# The following commnd is suit for the FOSSologySPDX instance server in localhost. +# options: +# 1) noCopyright: true/false. Only when this option is set to "true", copyright information is scanned. +# 2) jsonOutput: true/false. Only when this option is set to "true", scanning result is output in JSON format. +# Skipping this option equals setting to "false". +# 3) fullSPDXFlag: true/false. Only when this option is set to "true", low definition of full SPDX contents are output. +# This option should be set as "true" when user want to generate SPDX file from command line. -## Fossology scan information -# You can set option to control if the copyright information will be skipped -# during the identification process. -# -# It is defined as [FOSS_COPYRIGHT] in ./meta/conf/licenses.conf. -# FOSS_COPYRIGHT = "true" -# NO copyright will be processed. That means only license information will be -# identified and output to SPDX file -# FOSS_COPYRIGHT = "false" -# Copyright will be identified and output to SPDX file along with license -# information. The process will take more time than not processing copyright -# information. -# - -FOSS_NO_COPYRIGHT = "true" - -# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is -# used to control if FOSSology server need recursively unpack tar.gz file which -# is sent from do_spdx task. -# -# FOSS_RECURSIVE_UNPACK = "false": -# FOSSology server does NOT recursively unpack. In the current release, this -# is the default choice because recursively unpack will not necessarily break -# down original compressed files. -# FOSS_RECURSIVE_UNPACK = "true": -# FOSSology server recursively unpack components. -# - -FOSS_RECURSIVE_UNPACK = "false" - -# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to -# control what kind of SPDX output to get from the FOSSology server. -# -# FOSS_FULL_SPDX = "true": -# Tell FOSSology server to return full SPDX output, like if the program was -# run from the command line. This is needed in order to get license refs for -# the full package rather than individual files only. -# -# FOSS_FULL_SPDX = "false": -# Tell FOSSology to only process license information for files. All package -# license tags in the report will be "NOASSERTION" -# - -FOSS_FULL_SPDX = "true" - -# FOSSologySPDX instance server. http://localhost/repo is the default -# installation location for FOSSology. -# # For more information on FOSSologySPDX commandline: -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API -# - -FOSS_BASE_URL = "http://localhost/repo/?mod=spdx_license_once"; -FOSS_SERVER = "${FOSS_BASE_URL}&fullSPDXFlag=${FOSS_FULL_SPDX}&noCopyright=${FOSS_NO_COPYRIGHT}&recursiveUnpack=${FOSS_RECURSIVE_UNPACK}" +# # https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API -FOSS_WGET_FLAGS = "-qO - --no-check-certificate --timeout=0" +FOSS_CURL_FLAGS ?= "-F "mod=spdx_license_once" -F "noCopyright=false" -F "jsonOutput=false" -F "fullSPDXFlag=true"" -- 1.8.4.2 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
