mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-07 06:21:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Respect extensions when building an extension

Browse Source 
When building a runtime extension we still want to allow other
extensions to be used.

This fixes https://github.com/flatpak/flatpak-builder/issues/156
This commit is contained in:
Alexander Larsson
2018-06-21 10:13:46 +02:00
committed by Alexander Larsson
parent c93601adb9
commit 8d07ee5393
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/flatpak-builtins-build.c
View File

@@ -475,10 +475,7 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
"--tmpfs", extension_tmpfs_point,
NULL);
if (extension_point)
flatpak_bwrap_add_args (bwrap,
"--bind", flatpak_file_get_path_cached (res_files), extension_point,
NULL);
/* We add the actual bind below so that we're not shadowed by other extensions or their tmpfs */
if (extension_point)
dest = extension_point;
@@ -516,10 +513,16 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
return FALSE;
}
if (!custom_usr && !(is_extension && !is_app_extension) &&
if (!custom_usr &&
!flatpak_run_add_extension_args (bwrap, runtime_metakey, runtime_ref, FALSE, &runtime_extensions, cancellable, error))
return FALSE;
/* Mount this after the above extensions so we always win */
if (extension_point)
flatpak_bwrap_add_args (bwrap,
"--bind", flatpak_file_get_path_cached (res_files), extension_point,
NULL);
if (!flatpak_run_add_app_info_args (bwrap,
app_files, NULL, app_extensions,
runtime_files, runtime_deploy_data, runtime_extensions,