Skip to content

More Flatpak preparation

Simon McVittie requested to merge wip/flatpak-prep into master

Based on !248 (merged); it could probably be rebased to not be, but we'll want !248 (merged) for Flatpak anyway.

Best reviewed commit-by-commit. The first few commits are fairly trivial, so I might merge those if you're happy with them but not with the last.

  • bwrap: Fix a misleading debug message

    We use FlatpakBwrap for any argv array, not just bwrap(1), so we might be replacing the current process with any executable.

  • utils: Improve debug messages

    If we're looking for something in a sysroot, we should say which sysroot.

  • pv_runtime_set_search_paths: Fix indentation

  • runtime: Make sure Debian-based runtimes will look in /lib/terminfo

    If we are using a non-Debian-based runtime's terminfo, in particular if we're in Flatpak, then it won't normally search /lib/terminfo. This is problematic for PRESSURE_VESSEL_SHELL, because ncurses-base puts the xterm-256color terminfo in /lib/terminfo.

  • pressure-vessel: Treat LD_AUDIT the same as LD_PRELOAD

    The Flathub Steam app loads a LD_AUDIT module to ignore bundled libraries in games where they cause problems. We want to treat that essentially the same as LD_PRELOAD, at least until we take on its functionality.

    While we're changing this, also change the misleading name of the option. It was called --host-ld-preload, but it actually took the LD_PRELOAD module from the current execution environment, not the host.

Merge request reports