[PATCH v3 0/2] licenses.conf: less environment-specific variables

[PATCH v3 0/2] licenses.conf: less environment-specific variables

[niko.mauno]

Change certain SPDX variables to be less environment specific by default.

Niko Mauno (2):
  licenses.conf: stop relying on specific user's home directory
  licenses.conf: Allow overriding environment specific SPDX variables

 meta/conf/licenses.conf | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

-- 
2.1.4

[PATCH v3 1/2] licenses.conf: stop relying on specific user's home dir

[niko.mauno]

Relocate SPDX_MANIFEST_DIR to a location which doesn't rely on specific user's
home directory, which may not exist on may systems.

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
 meta/conf/licenses.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 2d6a707..2e3dce3 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 = "${SPDX_TEMP_DIR}/fossology_scans"
 
 ## SPDX Format info
 SPDX_VERSION = "SPDX-1.1"
-- 
2.1.4

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

[niko.mauno]

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 <niko.mauno@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