ref-manual: INCOMPATIBLE_LICENSE: use new license wildcards

Message ID 20220311084041.21992-1-ceggers@arri.de
State New
Headers show
Series ref-manual: INCOMPATIBLE_LICENSE: use new license wildcards | expand

Commit Message

Christian Eggers March 11, 2022, 8:40 a.m. UTC
This has recently been changed in expand_wildcard_licenses().
(file: OECORE/meta/classes/license.bbclass).

Signed-off-by: Christian Eggers <ceggers@arri.de>
---
 documentation/ref-manual/images.rst    | 2 +-
 documentation/ref-manual/variables.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Opdenacker March 11, 2022, 9:38 a.m. UTC | #1
Hi Christian,

On 3/11/22 09:40, Christian Eggers wrote:
> This has recently been changed in expand_wildcard_licenses().
> (file: OECORE/meta/classes/license.bbclass).
>
> Signed-off-by: Christian Eggers <ceggers@arri.de>
> ---
>  documentation/ref-manual/images.rst    | 2 +-
>  documentation/ref-manual/variables.rst | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/documentation/ref-manual/images.rst b/documentation/ref-manual/images.rst
> index 0e3351bb7b51..31fb567687d3 100644
> --- a/documentation/ref-manual/images.rst
> +++ b/documentation/ref-manual/images.rst
> @@ -21,7 +21,7 @@ image you want.
>     image::
>  
>             1. Comment out the EXTRA_IMAGE_FEATURES line
> -           2. Set INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0"
> +           2. Set INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*"
>  
>  
>  From within the ``poky`` Git repository, you can use the following
> diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
> index 005456f0c437..925f439dc439 100644
> --- a/documentation/ref-manual/variables.rst
> +++ b/documentation/ref-manual/variables.rst
> @@ -3438,7 +3438,7 @@ system and gives an overview of their function and contents.
>           This functionality is only regularly tested using the following
>           setting::
>  
> -                 INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0"
> +                 INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*"
>  
>  
>           Although you can use other settings, you might be required to


Good catch, thanks for the patch!
Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
... and merged into "master-next".

Thanks again
Michael.

Patch

diff --git a/documentation/ref-manual/images.rst b/documentation/ref-manual/images.rst
index 0e3351bb7b51..31fb567687d3 100644
--- a/documentation/ref-manual/images.rst
+++ b/documentation/ref-manual/images.rst
@@ -21,7 +21,7 @@  image you want.
    image::
 
            1. Comment out the EXTRA_IMAGE_FEATURES line
-           2. Set INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0"
+           2. Set INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*"
 
 
 From within the ``poky`` Git repository, you can use the following
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 005456f0c437..925f439dc439 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -3438,7 +3438,7 @@  system and gives an overview of their function and contents.
          This functionality is only regularly tested using the following
          setting::
 
-                 INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0"
+                 INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*"
 
 
          Although you can use other settings, you might be required to