Basic build of Bubblewrap with Meson. #133
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch?
|
|
bot, add author to whitelist |
cgwalters
requested changes
Jan 10, 2017
| @@ -0,0 +1,98 @@ | |||
| /* config.h.in. Generated from configure.ac by autoheader. */ | |||
There was a problem hiding this comment.
Ugh. Why do we need to carry this?
There was a problem hiding this comment.
This is the simplest way of getting a build going is to do this. Meson does not actually need a config.h.in, if you don't have one it will just serialise out values set in the configuration object. Which one to use depends on how the project maintainers want to set things up.
| #mesondefine HAVE_MEMORY_H | ||
|
|
||
| /* Define if SELinux is available */ | ||
| #mesondefine HAVE_SELINUX |
There was a problem hiding this comment.
Specifically having things like this seems pretty broken. It should be detected at build time, no?
There was a problem hiding this comment.
That is what it's for. If you do cdata.set('HAVE_SELINUX', 1) then that will get replaced by
#define HAVE_SELINUX 1
If it is not set, then it will be replaced with
/* undef HAVE_SELINUX */
As mentioned above I don't have an SELinux machine to test this with so I left it out.
|
Is this a PoC or are you planning to use it? I'm OK merging this if it'll be used. |
|
This is a PoC. |
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 17, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 17, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 17, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 17, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 23, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 23, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 28, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Jun 28, 2021
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Feb 5, 2022
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. One feature that is deliberately missing is an equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 that still require a setuid bwrap, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this in the packaging rather than the upstream build system. Loosely based on previous work by Jussi Pakkanen (see containers#133). Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Feb 18, 2022
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. Loosely based on previous work by Jussi Pakkanen (see containers#133). Differences between the Autotools and Meson builds: The Meson build requires a version of libcap that has pkg-config metadata (introduced in libcap 2.23, in 2013). The Meson build has no equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 and RHEL <= 7 that require a setuid bwrap executable, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this via packaging rather than the upstream build system. The Meson build supports being used as a subproject, and there is CI for this. It automatically disables shell completions and man pages, moves the bubblewrap executable to ${libexecdir}, and renames the bubblewrap executable according to a program_prefix option that the caller must specify (for example, Flatpak would use -Dprogram_prefix=flatpak- to get /usr/libexec/flatpak-bwrap). See the tests/use-as-subproject/ directory for an example. Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Feb 18, 2022
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. Loosely based on previous work by Jussi Pakkanen (see containers#133). Differences between the Autotools and Meson builds: The Meson build requires a version of libcap that has pkg-config metadata (introduced in libcap 2.23, in 2013). The Meson build has no equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 and RHEL <= 7 that require a setuid bwrap executable, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this via packaging rather than the upstream build system. The Meson build supports being used as a subproject, and there is CI for this. It automatically disables shell completions and man pages, moves the bubblewrap executable to ${libexecdir}, and renames the bubblewrap executable according to a program_prefix option that the caller must specify (for example, Flatpak would use -Dprogram_prefix=flatpak- to get /usr/libexec/flatpak-bwrap). See the tests/use-as-subproject/ directory for an example. Signed-off-by: Simon McVittie <smcv@collabora.com>
smcv
added a commit
to smcv/bubblewrap
that referenced
this pull request
Feb 18, 2022
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. Verified to be backwards-compatible as far as Meson 0.49.0 (Debian 9 backports). Loosely based on previous work by Jussi Pakkanen (see containers#133). Differences between the Autotools and Meson builds: The Meson build requires a version of libcap that has pkg-config metadata (introduced in libcap 2.23, in 2013). The Meson build has no equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 and RHEL <= 7 that require a setuid bwrap executable, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this via packaging rather than the upstream build system. The Meson build supports being used as a subproject, and there is CI for this. It automatically disables shell completions and man pages, moves the bubblewrap executable to ${libexecdir}, and renames the bubblewrap executable according to a program_prefix option that the caller must specify (for example, Flatpak would use -Dprogram_prefix=flatpak- to get /usr/libexec/flatpak-bwrap). See the tests/use-as-subproject/ directory for an example. Signed-off-by: Simon McVittie <smcv@collabora.com>
|
I guess this PR can be closed given that #432 is merged. |
Yes, thanks for the reminder. |
brandsimon
pushed a commit
to brandsimon/bubblewrap
that referenced
this pull request
Mar 19, 2023
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. Verified to be backwards-compatible as far as Meson 0.49.0 (Debian 9 backports). Loosely based on previous work by Jussi Pakkanen (see containers#133). Differences between the Autotools and Meson builds: The Meson build requires a version of libcap that has pkg-config metadata (introduced in libcap 2.23, in 2013). The Meson build has no equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 and RHEL <= 7 that require a setuid bwrap executable, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this via packaging rather than the upstream build system. The Meson build supports being used as a subproject, and there is CI for this. It automatically disables shell completions and man pages, moves the bubblewrap executable to ${libexecdir}, and renames the bubblewrap executable according to a program_prefix option that the caller must specify (for example, Flatpak would use -Dprogram_prefix=flatpak- to get /usr/libexec/flatpak-bwrap). See the tests/use-as-subproject/ directory for an example. Signed-off-by: Simon McVittie <smcv@collabora.com>
CrackerCat
pushed a commit
to CrackerCat/bubblewrap
that referenced
this pull request
Jul 31, 2024
This allows bwrap to be built as a subproject in larger Meson projects. When built as a subproject, we install into the --libexecdir and require a program prefix to be specified: for example, Flatpak would use program_prefix=flatpak- to get /usr/libexec/flatpak-bwrap. Verified to be backwards-compatible as far as Meson 0.49.0 (Debian 9 backports). Loosely based on previous work by Jussi Pakkanen (see containers#133). Differences between the Autotools and Meson builds: The Meson build requires a version of libcap that has pkg-config metadata (introduced in libcap 2.23, in 2013). The Meson build has no equivalent of --with-priv-mode=setuid. On distributions like Debian <= 10 and RHEL <= 7 that require a setuid bwrap executable, the sysadmin or distribution packaging will need to set the correct permissions on the bwrap executable; Debian already did this via packaging rather than the upstream build system. The Meson build supports being used as a subproject, and there is CI for this. It automatically disables shell completions and man pages, moves the bubblewrap executable to ${libexecdir}, and renames the bubblewrap executable according to a program_prefix option that the caller must specify (for example, Flatpak would use -Dprogram_prefix=flatpak- to get /usr/libexec/flatpak-bwrap). See the tests/use-as-subproject/ directory for an example. Signed-off-by: Simon McVittie <smcv@collabora.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Builds and installs Bubblewrap, the man page and the Bash completion file.
I could not properly comprehend how the setuid binary thing should work so I left that alone. FWICT it should just be a case of a custom install script or a custom target.
Selinux mode not tested because I don't have an selinux machine but It Should Work (TM).
The werror flags are not added. Maybe a better combination would be
warning_level=2+ werror? Anyway it is just a question of adding those toadd_project_arguments.