Skip to content

Conversation

@swick
Copy link
Contributor

@swick swick commented Sep 1, 2025

builder-module: Support recording the LICENSE information of modules

We want to be able to record the licensing information about the modules
that we build in /app/share/licenses/$MODULE_NAME.

The changes here do two things:

1. Every module that gets build is searched for a bunch of common names
   for licensing files and every match is copied to the target dir.
2. The new `license-files` key can be used to specify the license files
   of a module which must be found for the stage to succeed.

@bbhtt
Copy link
Contributor

bbhtt commented Sep 1, 2025

Would be nice to have the doc bits as well.

@swick swick force-pushed the wip/license-files branch from 4c446d2 to d9e6fbb Compare September 1, 2025 19:33
@swick
Copy link
Contributor Author

swick commented Sep 1, 2025

Addressed the feedback.

@swick
Copy link
Contributor Author

swick commented Sep 1, 2025

The CI failure looks like an infra issue but I can't re-run the jobs.

@bbhtt
Copy link
Contributor

bbhtt commented Sep 1, 2025

Retriggered them, I can test it a bit tomorrow. Seems ok.

@bbhtt
Copy link
Contributor

bbhtt commented Sep 2, 2025

I think @AdrianVovk was interested too, in case you want to have a look.

bbhtt added a commit to flathub/org.flatpak.Builder that referenced this pull request Sep 2, 2025
@bbhtt
Copy link
Contributor

bbhtt commented Sep 2, 2025

Seems to work otherwise from my tests.

We want to be able to record the licensing information about the modules
that we build in /app/share/licenses/$MODULE_NAME.

The changes here do two things:

1. Every module that gets build is searched for a bunch of common names
   for licensing files and every match is copied to the target dir.
2. The new `license-files` key can be used to specify the license files
   of a module which must be found for the stage to succeed.
This tests the automatic detection of licensing files and also the
explicit `license-files` key.
@swick swick force-pushed the wip/license-files branch from d9e6fbb to 2cf6452 Compare September 2, 2025 10:05
@bbhtt
Copy link
Contributor

bbhtt commented Sep 2, 2025

Looks good from my side, thanks.

@alatiera
Copy link
Contributor

alatiera commented Sep 2, 2025

Looks good to me as well, nothing jumps out

@bbhtt
Copy link
Contributor

bbhtt commented Sep 2, 2025

If there aren't any comments, we should merge this. Then I can deploy it to Flathub where it will get some widespread testing. Once that is done, we can probably tag a new release (with accumulated fixes from that if any).

Copy link

@AdrianVovk AdrianVovk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM too!

@bbhtt bbhtt merged commit a0a5467 into flatpak:main Sep 3, 2025
5 checks passed
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.

4 participants