On 03.05.2017 18:09, Leonardo Sandoval wrote: > On Wed, 2017-05-03 at 10:39 +0000, [email protected] wrote: >> Change certain variable assignments from 'hard' (=) to 'soft' (?=) so that >> suitable permutations of values for these variables can be assigned eg. in >> custom meta layers. Otherwise eg. fossology server is limited to run on same >> machine as bitbake, and generated SPDX files are placed into home directory >> path of a custom luser account. >> >> Signed-off-by: Niko Mauno <[email protected]> >> --- >> meta/conf/licenses.conf | 12 +++++++----- >> 1 file changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf >> index d210a0e..fcaec1b 100644 >> --- a/meta/conf/licenses.conf >> +++ b/meta/conf/licenses.conf >> @@ -123,7 +123,9 @@ SPDXLICENSEMAP[SGIv1] = "SGI-1" >> >> ## SPDX temporary directory >> SPDX_TEMP_DIR = "${WORKDIR}/spdx_temp" >> -SPDX_MANIFEST_DIR = "/home/yocto/fossology_scans" >> + >> +## Output directory for generated SPDX files >> +SPDX_MANIFEST_DIR ?= "/home/yocto/fossology_scans" > > not sure if this is right, but shouldn't be SPDX_MANIFEST_DIR ?= > "${SPDX_TEMP_DIR}/fossology_scans' so this way we do not rely on a > yocto's home folder? > > Leo >
That would seem like a more feasible default. Is this something that should be addressed now in this patch, or in another (later) changeset? >> >> ## SPDX Format info >> SPDX_VERSION = "SPDX-1.1" >> @@ -142,7 +144,7 @@ DATA_LICENSE = "CC0-1.0" >> # information. >> # >> >> -FOSS_NO_COPYRIGHT = "true" >> +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 >> @@ -156,7 +158,7 @@ FOSS_NO_COPYRIGHT = "true" >> # FOSSology server recursively unpack components. >> # >> >> -FOSS_RECURSIVE_UNPACK = "false" >> +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. >> @@ -171,7 +173,7 @@ FOSS_RECURSIVE_UNPACK = "false" >> # license tags in the report will be "NOASSERTION" >> # >> >> -FOSS_FULL_SPDX = "true" >> +FOSS_FULL_SPDX ?= "true" >> >> # FOSSologySPDX instance server. http://localhost/repo is the default >> # installation location for FOSSology. >> @@ -180,7 +182,7 @@ FOSS_FULL_SPDX = "true" >> # https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API >> # >> >> -FOSS_BASE_URL = "http://localhost/repo/?mod=spdx_license_once"; >> +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}" >> >> FOSS_WGET_FLAGS = "-qO - --no-check-certificate --timeout=0" >> -- >> 2.1.4 > > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
