Skip to content

Improve or expression handling#652

Draft
masami256 wants to merge 2 commits into
miraclelinux:emlinux3from
masami256:improve-or-expression-handling
Draft

Improve or expression handling#652
masami256 wants to merge 2 commits into
miraclelinux:emlinux3from
masami256:improve-or-expression-handling

Conversation

@masami256

Copy link
Copy Markdown
Contributor

No description provided.

Added licenses for ruby-narray and libisl23 packages.

Signed-off-by: Masami Ichikawa <masami.ichikawa@miraclelinux.com>
This commit improve OR expression handling.
It allowed to define license such as "LICENSE_A OR LICENSE_B" in licenses.yml.
To do this, CycloneDX format is bit changed.
Before this commit, licenses are defined as an array of license then we use expression tag

Before:

```
            "licenses": [
                {
                    "license": {
                        "name": "BSD-3-clause"
                    }
                },
                {
                    "license": {
                        "name": "Expat"
                    }
                },

```

After:

```
            "licenses": [
                {
                    "expression": "(Ruby OR GPL-2.0-only) AND GPL-2.0-or-later"
                }
            ],
```

This expression string is same as SPDX format.

Signed-off-by: Masami Ichikawa <masami.ichikawa@miraclelinux.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant