mirror of
https://github.com/flatpak/flatpak.git
synced 2026-01-26 14:13:26 +00:00
build-bundle: Add the runtime repo to OCI image metadata
At the moment the --runtime-repo flags of flatpak build-bundle export is ignored when building an OCI image. So an Flatpak OCI registry which wants to supports a .flatpakref file has no information about the runtime repo. With this PR the runtime repo gets added as the org.flatpak.runtime-repo label to the OCI image. This is currently only metadata to be used by repositories and not used by flatpak during install.
This commit is contained in:
parent
e807ca3539
commit
1e52cc62e8
@ -390,6 +390,7 @@ generate_labels (FlatpakOciDescriptor *layer_desc,
|
||||
const char *name,
|
||||
const char *ref,
|
||||
const char *commit_checksum,
|
||||
const char *runtime_repo,
|
||||
GVariant *commit_data,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
@ -433,6 +434,11 @@ generate_labels (FlatpakOciDescriptor *layer_desc,
|
||||
g_strdup_printf ("%" G_GUINT64_FORMAT, layer_desc->size));
|
||||
|
||||
|
||||
if (runtime_repo)
|
||||
g_hash_table_replace (labels,
|
||||
g_strdup ("org.flatpak.runtime-repo"),
|
||||
g_strdup (runtime_repo));
|
||||
|
||||
if (!get_bundle_appstream_data (root, ref, name, keyfile, FALSE,
|
||||
&xml_data, cancellable, error))
|
||||
return FALSE;
|
||||
@ -523,7 +529,7 @@ build_oci (OstreeRepo *repo,
|
||||
error))
|
||||
return FALSE;
|
||||
|
||||
flatpak_labels = generate_labels (layer_desc, repo, root, name, flatpak_decomposed_get_ref (ref), commit_checksum, commit_data, cancellable, error);
|
||||
flatpak_labels = generate_labels (layer_desc, repo, root, name, flatpak_decomposed_get_ref (ref), commit_checksum, opt_runtime_repo, commit_data, cancellable, error);
|
||||
if (flatpak_labels == NULL)
|
||||
return FALSE;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user