github-starred/firejail

Fork 0

mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00

[PR #5154] [MERGED] mkdeb.sh.in: pass remaining arguments to ./configure #5382

New issue

Closed

opened 2026-05-05 10:37:26 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:37:26 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/5154
Author: @kmk3
Created: 5/20/2022
Status: ✅ Merged
Merged: 5/30/2022
Merged by: @netblue30

Base: master ← Head: build-clean-up-dist

📝 Commits (3)

5247a6c mkdeb.sh.in: remove unused PACKAGE_TARNAME/TOP vars
b4d0b24 fj-mkdeb.py: run distclean before ./configure
9a0fbbd mkdeb.sh.in: pass remaining arguments to ./configure

📊 Changes

4 files changed (+20 additions, -36 deletions)

View changed files

📝 .gitlab-ci.yml (+1 -1)
📝 Makefile.in (+1 -1)
📝 contrib/fj-mkdeb.py (+16 -22)
📝 mkdeb.sh.in (+2 -12)

📄 Description

Currently, mkdeb.sh (which is used to make a .deb package) runs
./configure with hardcoded options (some of which are automatically
detected based on configure-time variables). To work around the
hardcoding, contrib/fj-mkdeb.py is used to add additional options by
rewriting the actual call to ./configure on mkdeb.sh. For example, the
following invocation adds --disable-firetunnel to mkdeb.sh:

$ ./configure && ./contrib/fj-mkdeb.py --disable-firetunnel

To avoid depending on another script and to avoid re-generating
mkdeb.sh, just let the latter pass the remaining arguments (the first
one is an optional package filename suffix) to ./configure directly.
Example:

$ make distclean && ./configure && make dist &&
  ./mkdeb.sh "" --disable-firetunnel

Additionally, change contrib/fj-mkdeb.py to do roughly the same as the
above example, by simply forwarding the arguments that it receives to
./mkdeb.sh (which then forwards them to ./configure). Also, remove the
--only-fix-mkdeb option, since the script does not change mkdeb.sh
anymore. With these changes, the script's usage (other than when using
--only-fix-mkdeb) should remain the same.

Note: To clean the generated files and then make a .deb package using
the default configuration, the invocation is still the same:

$ make distclean && ./configure && make deb

Note2: Running ./configure in the above examples is only needed for
generating Makefile/mkdeb.sh from Makefile.in/mkdeb.sh.in after running
distclean, so that running make / ./mkdeb.sh afterwards works.

Should fully fix #772.

Relates to #1205 #3414 #5142 #5148.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/5154 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 5/20/2022 **Status:** ✅ Merged **Merged:** 5/30/2022 **Merged by:** [@netblue30](https://github.com/netblue30) **Base:** `master` ← **Head:** `build-clean-up-dist` --- ### 📝 Commits (3) - [`5247a6c`](https://github.com/netblue30/firejail/commit/5247a6c7b5820197d26e19064d4ef0ff4edc41a1) mkdeb.sh.in: remove unused PACKAGE_TARNAME/TOP vars - [`b4d0b24`](https://github.com/netblue30/firejail/commit/b4d0b24c533c8aebb8961bf658e3b41580b073e2) fj-mkdeb.py: run distclean before ./configure - [`9a0fbbd`](https://github.com/netblue30/firejail/commit/9a0fbbd719b6d6c6fe46ae0f4b2e0ccd7988edcc) mkdeb.sh.in: pass remaining arguments to ./configure ### 📊 Changes **4 files changed** (+20 additions, -36 deletions) <details> <summary>View changed files</summary> 📝 `.gitlab-ci.yml` (+1 -1) 📝 `Makefile.in` (+1 -1) 📝 `contrib/fj-mkdeb.py` (+16 -22) 📝 `mkdeb.sh.in` (+2 -12) </details> ### 📄 Description Currently, mkdeb.sh (which is used to make a .deb package) runs ./configure with hardcoded options (some of which are automatically detected based on configure-time variables). To work around the hardcoding, contrib/fj-mkdeb.py is used to add additional options by rewriting the actual call to ./configure on mkdeb.sh. For example, the following invocation adds --disable-firetunnel to mkdeb.sh: $ ./configure && ./contrib/fj-mkdeb.py --disable-firetunnel To avoid depending on another script and to avoid re-generating mkdeb.sh, just let the latter pass the remaining arguments (the first one is an optional package filename suffix) to ./configure directly. Example: $ make distclean && ./configure && make dist && ./mkdeb.sh "" --disable-firetunnel Additionally, change contrib/fj-mkdeb.py to do roughly the same as the above example, by simply forwarding the arguments that it receives to ./mkdeb.sh (which then forwards them to ./configure). Also, remove the --only-fix-mkdeb option, since the script does not change mkdeb.sh anymore. With these changes, the script's usage (other than when using --only-fix-mkdeb) should remain the same. Note: To clean the generated files and then make a .deb package using the default configuration, the invocation is still the same: $ make distclean && ./configure && make deb Note2: Running ./configure in the above examples is only needed for generating Makefile/mkdeb.sh from Makefile.in/mkdeb.sh.in after running distclean, so that running `make` / `./mkdeb.sh` afterwards works. Should fully fix #772. Relates to #1205 #3414 #5142 #5148. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:37:26 -06:00

closed this issue
added the
pull-request
label

gitea-mirror referenced this issue

2026-05-05 10:39:05 -06:00

[PR #5382] [MERGED] build(deps): bump github/codeql-action from 2.1.24 to 2.1.25 #5473

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5382

No description provided.

Rows
Columns