Revert "remove make deb and use make deb-apparmor to build packages" #5547
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
This reverts commit 8229944. The idea is to later enable building the .deb package with AppArmor by default with `make deb` and to then remove `make deb-apparmor` (though note that some ci changes might also be needed in tandem[1]). This could potentially allow building a .deb package for all firejail versions (including past and future ones) with just `make deb`. Also, note that other options can be added/removed to the default `deb` target (besides AppArmor-related ones), so ideally there would be only a single `deb` target with all the desired options applied. So instead of releasing a version without `make deb` and then potentially adding it back and removing `make deb-apparmor`, just leave the targets as is (considering the current release, 0.9.70) for now. [1] netblue30#5176 (comment)
|
all set! |
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Feb 17, 2023
The official .deb package is always built with apparmor support, so use
`--enable-apparmor` in mkdeb.sh and remove the "deb-apparmor" target in
order to reduce redundancy.
Note that custom configure options may be specified by calling
./mkdeb.sh directly.
For example, to build the .deb package without apparmor support, instead
of running `make deb`, the following commands can be used:
make dist
./mkdeb.sh --disable-apparmor
Also, change the `build_apparmor` GitLab CI job into
`build_no_apparmor`, which is intended to check that building without
apparmor still works.
Note: This commit makes the resulting .deb package not have an
"-apparmor" suffix (see `EXTRA_VERSION` in mkdeb.sh), to avoid
redundancy (as having apparmor support becomes the default).
Misc: This is a follow-up to netblue30#5654.
Relates to netblue30#5154 netblue30#5176 netblue30#5547.
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.
This reverts commit 8229944.
The idea is to later enable building the .deb package with AppArmor by
default with
make deband to then removemake deb-apparmor(thoughnote that some ci changes might also be needed in tandem[1]). This
could potentially allow building a .deb package for all firejail
versions (including past and future ones) with just
make deb.Also, note that other options can be added/removed to the default
debtarget (besides AppArmor-related ones), so ideally there would be only a
single
debtarget with all the desired options applied.So instead of releasing a version without
make deband thenpotentially adding it back and removing
make deb-apparmor, just leavethe targets as is (considering the current release, 0.9.70) for now.
[1] #5176 (comment)