[OE-core] [PATCH v4 2/2] licenses.conf: Allow overriding env-specific SPDX vars

[niko.mauno at vaisala.com]

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.

Signed-off-by: Niko Mauno <niko.mauno at vaisala.com>
---
 meta/conf/licenses.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 2e3dce3..c96b7de 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -125,7 +125,7 @@ SPDXLICENSEMAP[SGIv1] = "SGI-1"
 SPDX_TEMP_DIR = "${WORKDIR}/spdx_temp"
 
 ## Output directory for generated SPDX files
-SPDX_MANIFEST_DIR = "${SPDX_TEMP_DIR}/fossology_scans"
+SPDX_MANIFEST_DIR ?= "${SPDX_TEMP_DIR}/fossology_scans"
 
 ## SPDX Format info
 SPDX_VERSION = "SPDX-1.1"
@@ -144,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
@@ -158,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.
@@ -173,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.
@@ -182,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