mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-17 22:49:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

OCI: Set arch when exporting oci bundle

Browse Source
This commit is contained in:
Alexander Larsson
2017-09-25 15:47:51 +02:00
parent 08aef072c9
commit 0b34a4ef6f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/flatpak-builtins-build-bundle.c
View File

@@ -335,6 +335,7 @@ build_oci (OstreeRepo *repo, GFile *dir,
GHashTable *annotations;
gsize metadata_size;
g_autofree char *metadata_contents = NULL;
g_auto(GStrv) ref_parts = NULL;
if (!ostree_repo_resolve_rev (repo, ref, FALSE, &commit_checksum, error))
return FALSE;
@@ -348,6 +349,10 @@ build_oci (OstreeRepo *repo, GFile *dir,
if (!ostree_repo_read_commit_detached_metadata (repo, commit_checksum, &commit_metadata, cancellable, error))
return FALSE;
ref_parts = flatpak_decompose_ref (ref, error);
if (ref_parts == NULL)
return FALSE;
dir_uri = g_file_get_uri (dir);
registry = flatpak_oci_registry_new (dir_uri, TRUE, -1, cancellable, error);
if (registry == NULL)
@@ -373,6 +378,7 @@ build_oci (OstreeRepo *repo, GFile *dir,
image = flatpak_oci_image_new ();
flatpak_oci_image_set_layer (image, uncompressed_digest);
flatpak_oci_image_set_architecture (image, flatpak_arch_to_oci_arch (ref_parts[2]));
timestamp = timestamp_to_iso8601 (ostree_commit_get_timestamp (commit_data));
flatpak_oci_image_set_created (image, timestamp);