build: simplify code related to seccomp filters/man pages #5898
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 partially reverts commit 2b34747 ("generate seccomp filters at install time", 2023-07-07). See also commit 6fa19aa ("feature: use seccomp filters build at install time for --restrict-namespaces", 2023-07-12). The seccomp filters were always being built because src/fseccomp/fseccomp (and other programs) are in `$(ALL_ITEMS)`, which is incorrectly marked as phony. This commit fixes that and restores the previous target logic, for consistency with the other targets and so that the seccomp filters are made at build time rather than at install time.
kmk3
force-pushed
the
build-simplify-man
branch
2 times, most recently
from
b035430
to
26658b9
Compare
Simplify the main targets and use wildcards instead of repeating the
filenames manually.
Also, restore the `man` target and building only when `HAVE_MAN` is
enabled.
Note: Make automatically removes intermediate files (.1 and .5), so in
general only the .gz files have to be cleaned.
Commands used to rename the man pages:
cd src/man
git mv firecfg.txt firecfg.1.in
git mv firejail-login.txt firejail-login.5.in
git mv firejail-profile.txt firejail-profile.5.in
git mv firejail-users.txt firejail-users.5.in
git mv firejail.txt firejail.1.in
git mv firemon.txt firemon.1.in
git mv jailcheck.txt jailcheck.1.in
This is kind of a follow-up to commit 9e206b7 ("rework src/man
Makefile", 2023-07-07).
|
merging, thanks! |
kmk3
changed the title
kmk3
changed the title
kmk3
changed the title
kmk3
added a commit
that referenced
this pull request
Aug 24, 2024
Related commits: * 9e206b7 ("rework src/man Makefile", 2023-07-07) * 2b34747 ("generate seccomp filters at install time", 2023-07-07) * 1d5fff9 ("Makefile fix", 2023-07-10) * 6fa19aa ("feature: use seccomp filters build at install time for --restrict-namespaces", 2023-07-12) * a6172b7 ("build: remove extraneous blank lines in makefiles", 2023-07-12) * 80eb284 ("build: restore seccomp filter targets", 2023-07-13) / PR #5898 * 76bd5ad ("build: simplify code related to man pages", 2023-07-12) / PR #5898 * 8e79f18 ("build: add missing makefile dep", 2023-08-12) / PR #5956 Note: The issue with seccomp filters specifically was fixed on commit 80eb284 ("build: restore seccomp filter targets", 2023-07-13) / PR #5898. Relates to #5156 #5898 #5956.
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.
Simplify the main targets and use wildcards instead of repeating the
filenames manually.
Also, restore the
mantarget and building only whenHAVE_MANisenabled.
Note: Make automatically removes intermediate files (.1 and .5), so only
the .gz files have to be cleaned.
Commands used to rename the man pages:
This is kind of a follow-up to commit 9e206b7 ("rework src/man
Makefile", 2023-07-07).