| 1 | Source: Rasmus Thomsen <[email protected]>
|
| 2 | Upstream: No, Alpine/Musl specific hack
|
| 3 | Reason: rofiles-fuse is always broken on musl as of now, so
|
| 4 | disable it for know so users don't get (very weird) failures
|
| 5 | when building flatpaks if they forget to specify that opt.
|
| 6 | See https://github.com/flatpak/flatpak-builder/issues/329
|
| 7 | for more info.
|
| 8 | diff --git a/src/builder-main.c b/src/builder-main.c
|
| 9 | index a5f6601..f63c42f 100644
|
| 10 | |
| 11 | |
| 12 | @@ -98,7 +98,7 @@ static GOptionEntry entries[] = {
|
| 13 | { "ccache", 0, 0, G_OPTION_ARG_NONE, &opt_ccache, "Use ccache", NULL },
|
| 14 | { "disable-cache", 0, 0, G_OPTION_ARG_NONE, &opt_disable_cache, "Disable cache lookups", NULL },
|
| 15 | { "disable-tests", 0, 0, G_OPTION_ARG_NONE, &opt_disable_tests, "Don't run tests", NULL },
|
| 16 | - { "disable-rofiles-fuse", 0, 0, G_OPTION_ARG_NONE, &opt_disable_rofiles, "Disable rofiles-fuse use", NULL },
|
| 17 | + { "disable-rofiles-fuse", 0, 0, G_OPTION_ARG_NONE, &opt_disable_rofiles, "Disable rofiles-fuse use (Note: This is ALWAYS disabled on Alpine Linux due to https://github.com/flatpak/flatpak-builder/issues/329)", NULL },
|
| 18 | { "disable-download", 0, 0, G_OPTION_ARG_NONE, &opt_disable_download, "Don't download any new sources", NULL },
|
| 19 | { "disable-updates", 0, 0, G_OPTION_ARG_NONE, &opt_disable_updates, "Only download missing sources, never update to latest vcs version", NULL },
|
| 20 | { "download-only", 0, 0, G_OPTION_ARG_NONE, &opt_download_only, "Only download sources, don't build", NULL },
|
| 21 | @@ -508,7 +508,7 @@ main (int argc,
|
| 22 |
|
| 23 | build_context = builder_context_new (cwd_dir, app_dir, opt_state_dir);
|
| 24 |
|
| 25 | - builder_context_set_use_rofiles (build_context, !opt_disable_rofiles);
|
| 26 | + builder_context_set_use_rofiles (build_context, 0);
|
| 27 | builder_context_set_run_tests (build_context, !opt_disable_tests);
|
| 28 | builder_context_set_no_shallow_clone (build_context, opt_no_shallow_clone);
|
| 29 | builder_context_set_keep_build_dirs (build_context, opt_keep_build_dirs);
|