marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Add --bind-mount and --build-dir arguments

tingping/wmclass
Alexander Larsson 2016-01-12 10:42:04 +01:00
parent 5c578946bf
commit e1cb723c55
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/xdg-app-builtins-build.c
View File

@ -34,9 +34,13 @@
#include "xdg-app-run.h"
static gboolean opt_runtime;
static char *opt_build_dir;
static char **opt_bind_mounts;
static GOptionEntry options[] = {
{ "runtime", 'r', 0, G_OPTION_ARG_NONE, &opt_runtime, "Use non-devel runtime", NULL },
{ "bind-mount", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_bind_mounts, "Add bind mount", "DEST=SRC" },
{ "build-dir", 0, 0, G_OPTION_ARG_STRING, &opt_build_dir, "Start build in this directory", "DIR" },
{ NULL }
};
@ -155,6 +159,24 @@ xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
if (!xdg_app_run_add_extension_args (argv_array, runtime_metakey, runtime_ref, cancellable, error))
return FALSE;
for (i = 0; opt_bind_mounts != NULL && opt_bind_mounts[i] != NULL; i++)
{
if (strchr (opt_bind_mounts[i], '=') == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "Missing '=' in bind mount option '%s'", opt_bind_mounts[i]);
return FALSE;
}
g_ptr_array_add (argv_array, g_strdup ("-B"));
g_ptr_array_add (argv_array, g_strdup (opt_bind_mounts[i]));
}
if (opt_build_dir != NULL)
{
g_ptr_array_add (argv_array, g_strdup ("-P"));
g_ptr_array_add (argv_array, g_strdup (opt_build_dir));
}
g_ptr_array_add (argv_array, g_strdup ("-a"));
g_ptr_array_add (argv_array, g_file_get_path (app_files));
g_ptr_array_add (argv_array, g_strdup ("-v"));

16
doc/xdg-app-build.xml
View File

@ -78,6 +78,22 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--bind-mount=DEST=SOURCE</option></term>
<listitem><para>
Add a custom bind mount in the build namespace. Can be specified multiple times.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--build-dir=PATH</option></term>
<listitem><para>
Start the build in this directory (default is in the current directory).
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--share=SUBSYSTEM</option></term>