Skip to content

Record licensing information of modules #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbhtt merged 2 commits into from
Sep 3, 2025
Merged

Record licensing information of modules #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10bc4b6
builder-module: Support recording the LICENSE information of modules
swick Sep 1, 2025
2cf6452
tests: Make sure that extracing license information works
swick Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions data/flatpak-manifest.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,14 @@
"type": "string"
}
},
"license-files": {
"description": "Array of paths to LICENSE files of the module",
"type": "array",
"items": {
"description": "LICENSE file of the module",
"type": "string"
}
},
"modules": {
"description": "An array of objects specifying the modules to be built in order. String members in the array are interpreted as the name of a separate json or yaml file that contains a module.",
"type": "array",
Expand Down
4 changes: 4 additions & 0 deletions doc/flatpak-manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,10 @@
<term><option>test-commands</option> (array of strings)</term>
<listitem><para>Array of commands to run during the tests.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>license-files</option> (array of strings)</term>
<listitem><para>Array of paths to LICENSE files of the module.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>modules</option> (array of objects or strings)</term>
<listitem><para>An array of objects specifying nested modules to be built before this one.
Expand Down
4 changes: 2 additions & 2 deletions src/builder-manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2101,7 +2101,7 @@ builder_manifest_build_shell (BuilderManifest *self,
if (found == NULL)
return flatpak_fail (error, "Can't find module %s", modulename);

if (!builder_module_build (found, NULL, context, TRUE, error))
if (!builder_module_build (found, self->id, NULL, context, TRUE, error))
return FALSE;

return TRUE;
Expand Down Expand Up @@ -2150,7 +2150,7 @@ builder_manifest_build (BuilderManifest *self,
return FALSE;
if (!builder_context_enable_rofiles (context, error))
return FALSE;
if (!builder_module_build (m, cache, context, FALSE, error))
if (!builder_module_build (m, self->id, cache, context, FALSE, error))
return FALSE;
if (!builder_context_disable_rofiles (context, error))
return FALSE;
Expand Down
Loading