[PATCH] Allow overriding environment specific SPDX variables

Openembedded Core Discussions
 help / color / mirror / Atom feed

* [PATCH] Allow overriding environment specific SPDX variables
@ 2017-05-03 10:39 niko.mauno
  2017-05-03 11:01 ` ✗ patchtest: failure for " Patchwork
  2017-05-03 15:09 ` [PATCH] " Leonardo Sandoval
  0 siblings, 2 replies; 6+ messages in thread
From: niko.mauno @ 2017-05-03 10:39 UTC (permalink / raw)
  To: openembedded-core

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 | 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"
 
 ## 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* ✗ patchtest: failure for Allow overriding environment specific SPDX variables
  2017-05-03 10:39 [PATCH] Allow overriding environment specific SPDX variables niko.mauno
@ 2017-05-03 11:01 ` Patchwork
  2017-05-03 15:09 ` [PATCH] " Leonardo Sandoval
  1 sibling, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-05-03 11:01 UTC (permalink / raw)
  To: niko.mauno; +Cc: openembedded-core

== Series Details ==

Series: Allow overriding environment specific SPDX variables
Revision: 1
URL   : https://patchwork.openembedded.org/series/6584/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:

* Patch            Allow overriding environment specific SPDX variables
 Issue             Shortlog does not follow expected format [test_shortlog_format] 
  Suggested fix    Commit shortlog (first line of commit message) should follow the format "<target>: <summary>"

If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Allow overriding environment specific SPDX variables
  2017-05-03 10:39 [PATCH] Allow overriding environment specific SPDX variables niko.mauno
  2017-05-03 11:01 ` ✗ patchtest: failure for " Patchwork
@ 2017-05-03 15:09 ` Leonardo Sandoval
  2017-05-03 15:30   ` niko.mauno
  1 sibling, 1 reply; 6+ messages in thread
From: Leonardo Sandoval @ 2017-05-03 15:09 UTC (permalink / raw)
  To: niko.mauno; +Cc: openembedded-core

On Wed, 2017-05-03 at 10:39 +0000, niko.mauno@vaisala.com 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 <niko.mauno@vaisala.com>
> ---
>  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

>  
>  ## 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




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Allow overriding environment specific SPDX variables
  2017-05-03 15:09 ` [PATCH] " Leonardo Sandoval
@ 2017-05-03 15:30   ` niko.mauno
  2017-05-03 15:42     ` Leonardo Sandoval
  0 siblings, 1 reply; 6+ messages in thread
From: niko.mauno @ 2017-05-03 15:30 UTC (permalink / raw)
  To: leonardo.sandoval.gonzalez; +Cc: openembedded-core



On 03.05.2017 18:09, Leonardo Sandoval wrote:
> On Wed, 2017-05-03 at 10:39 +0000, niko.mauno@vaisala.com 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 <niko.mauno@vaisala.com>
>> ---
>>  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
>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Allow overriding environment specific SPDX variables
  2017-05-03 15:30   ` niko.mauno
@ 2017-05-03 15:42     ` Leonardo Sandoval
  2017-05-05 11:30       ` niko.mauno
  0 siblings, 1 reply; 6+ messages in thread
From: Leonardo Sandoval @ 2017-05-03 15:42 UTC (permalink / raw)
  To: niko.mauno; +Cc: openembedded-core

On Wed, 2017-05-03 at 15:30 +0000, niko.mauno@vaisala.com wrote:
> 
> On 03.05.2017 18:09, Leonardo Sandoval wrote:
> > On Wed, 2017-05-03 at 10:39 +0000, niko.mauno@vaisala.com 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 <niko.mauno@vaisala.com>
> >> ---
> >>  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?

a single series with two patches would make more sense in my opinion
because these are two logical changes in the same area.

> >
> > 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
> >
> >




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Allow overriding environment specific SPDX variables
  2017-05-03 15:42     ` Leonardo Sandoval
@ 2017-05-05 11:30       ` niko.mauno
  0 siblings, 0 replies; 6+ messages in thread
From: niko.mauno @ 2017-05-05 11:30 UTC (permalink / raw)
  To: leonardo.sandoval.gonzalez; +Cc: openembedded-core



On 03.05.2017 18:42, Leonardo Sandoval wrote:
> On Wed, 2017-05-03 at 15:30 +0000, niko.mauno@vaisala.com wrote:
>>
>> On 03.05.2017 18:09, Leonardo Sandoval wrote:
>>> On Wed, 2017-05-03 at 10:39 +0000, niko.mauno@vaisala.com 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 <niko.mauno@vaisala.com>
>>>> ---
>>>>  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?
> 
> a single series with two patches would make more sense in my opinion
> because these are two logical changes in the same area.
> 

Thank you, implemented in http://lists.openembedded.org/pipermail/openembedded-core/2017-May/136342.html

-Niko

>>>
>>> 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
>>>
>>>
> 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-05-05 11:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-03 10:39 [PATCH] Allow overriding environment specific SPDX variables niko.mauno
2017-05-03 11:01 ` ✗ patchtest: failure for " Patchwork
2017-05-03 15:09 ` [PATCH] " Leonardo Sandoval
2017-05-03 15:30   ` niko.mauno
2017-05-03 15:42     ` Leonardo Sandoval
2017-05-05 11:30       ` niko.mauno

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox