Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

utils: Refactoring #5416

Merged
merged 8 commits into from
Jul 3, 2023
Merged

utils: Refactoring #5416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3989f1e
common: Move declaration of get_compat_arch_reverse back to -utils
smcv May 15, 2023
649902a
common: Move flatpak_abs_usrmerged_dirs to FlatpakExports
smcv May 16, 2023
3cb612b
common: Move flatpak_is_app_runtime_or_appstream_ref to ref-utils
smcv May 15, 2023
962226e
common: Remove unused functions
smcv May 15, 2023
8fcbe07
common: Stop including utils-http in utils
smcv May 17, 2023
babbae2
common: Explicitly include context's own header
smcv May 15, 2023
3721b84
common: Move metadata to its own header
smcv May 15, 2023
8175b9b
common: Break circular dependency between context and dir/run
smcv May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
common: Move flatpak_abs_usrmerged_dirs to FlatpakExports 
This will help to break circular dependencies between FlatpakExports
and flatpak-run.

Signed-off-by: Simon McVittie <[email protected]>
  • Loading branch information
@smcv @alexlarsson
smcv authored and alexlarsson committed Jul 3, 2023
commit 649902a577bc71182813e9236c232b76587f02b5
2 changes: 2 additions & 0 deletions common/flatpak-exports-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,6 @@ void flatpak_exports_take_host_fd (FlatpakExports *exports,
void flatpak_exports_set_test_flags (FlatpakExports *exports,
FlatpakExportsTestFlags flags);

extern const char * const *flatpak_abs_usrmerged_dirs;

#endif /* __FLATPAK_EXPORTS_H__ */
11 changes: 11 additions & 0 deletions common/flatpak-exports.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@
#include "flatpak-systemd-dbus-generated.h"
#include "flatpak-error.h"

static const char * const abs_usrmerged_dirs[] =
{
"/bin",
"/lib",
"/lib32",
"/lib64",
"/sbin",
NULL
};
const char * const *flatpak_abs_usrmerged_dirs = abs_usrmerged_dirs;

/* We don't want to export paths pointing into these, because they are readonly
(so we can't create mountpoints there) and don't match what's on the host anyway.
flatpak_abs_usrmerged_dirs get the same treatment without having to be listed
Expand Down
2 changes: 0 additions & 2 deletions common/flatpak-run-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,4 @@ gboolean flatpak_run_app (FlatpakDecomposed *app_ref,
GCancellable *cancellable,
GError **error);

extern const char * const *flatpak_abs_usrmerged_dirs;

#endif /* __FLATPAK_RUN_H__ */
11 changes: 0 additions & 11 deletions common/flatpak-run.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,6 @@

#define DEFAULT_SHELL "/bin/sh"

const char * const abs_usrmerged_dirs[] =
{
"/bin",
"/lib",
"/lib32",
"/lib64",
"/sbin",
NULL
};
const char * const *flatpak_abs_usrmerged_dirs = abs_usrmerged_dirs;

static int
flatpak_extension_compare_by_path (gconstpointer _a,
gconstpointer _b)
Expand Down