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.

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

build: mkdeb.sh: pass all arguments to ./configure #5654

Merged
merged 1 commit into from
Feb 14, 2023

Conversation

kmk3
Copy link
Collaborator

@kmk3 kmk3 commented Feb 10, 2023

Instead of using the first argument as the EXTRA_VERSION variable.
This should make the usage of mkdeb.sh less confusing, especially when
one is not trying to set the variable.

As for using EXTRA_VERSION (which is still optional with this commit),
make sure that it is set as an environment variable before caling
mkdeb.sh. Example:

env EXTRA_VERSION=-apparmor ./mkdeb.sh --enable-apparmor

See also commit 9a0fbbd ("mkdeb.sh.in: pass remaining arguments to
./configure", 2022-05-13) / PR #5154.

Instead of using the first argument as the `EXTRA_VERSION` variable.
This should make the usage of mkdeb.sh less confusing, especially when
one is not trying to set the variable.

As for using `EXTRA_VERSION` (which is still optional with this commit),
make sure that it is set as an environment variable before caling
mkdeb.sh.  Example:

    env EXTRA_VERSION=-apparmor ./mkdeb.sh --enable-apparmor

See also commit 9a0fbbd ("mkdeb.sh.in: pass remaining arguments to
./configure", 2022-05-13) / PR netblue30#5154.
@kmk3
Copy link
Collaborator Author

kmk3 commented Feb 10, 2023

Misc: This branch was based on #5219 and I think the original idea was to post
it a bit after #5219.

Also, there is a branch that removes deb-apparmor which was built on top of
this one and is intended as the next PR.

@netblue30 netblue30 merged commit 7fcb9ce into netblue30:master Feb 14, 2023
@netblue30
Copy link
Owner

All merged, thanks!

@kmk3 kmk3 deleted the build-mkdeb-noargs branch February 14, 2023 14:17
kmk3 added a commit that referenced this pull request Feb 14, 2023
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.
@kmk3 kmk3 added the modif This modifies existing behavior label Jan 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
modif This modifies existing behavior
Projects
Status: Done (on RELNOTES)
Development

Successfully merging this pull request may close these issues.

2 participants