mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-13 20:52:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: Set FLATPAK_DEST to the mountpoint we're building into

Browse Source
This commit is contained in:
Alexander Larsson
2017-02-02 09:18:29 +01:00
parent 7eeda3b7b3
commit 402ff9d738
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
g_auto(GStrv) runtime_ref_parts = NULL;
FlatpakRunFlags run_flags;
const char *group = NULL;
const char *dest = NULL;
gboolean is_app = FALSE;
gboolean is_extension = FALSE;
gboolean is_app_extension = FALSE;
@@ -297,6 +298,17 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
"--bind", flatpak_file_get_path_cached (res_files), extension_point,
NULL);
if (extension_point)
dest = extension_point;
else if (is_app)
dest = g_strdup ("/app");
else
dest = g_strdup ("/usr");
add_args (argv_array,
"--setenv", "FLATPAK_DEST", dest,
NULL);
/* After setup_base to avoid conflicts with /var symlinks */
add_args (argv_array,
"--bind", flatpak_file_get_path_cached (var), "/var",