diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-07-18 07:53:39 -0600 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-07-26 14:40:08 -0400 |
| commit | 206f11d4fbda23c2dbae8c15014f01809b9bdd68 (patch) | |
| tree | fbbb79fd2191f6b87002a96cb17cb1c16cd46e04 /docs | |
| parent | c4616510a2c7509be20120353e539804b161922d (diff) | |
| download | podman-206f11d4fbda23c2dbae8c15014f01809b9bdd68.tar.gz podman-206f11d4fbda23c2dbae8c15014f01809b9bdd68.tar.bz2 podman-206f11d4fbda23c2dbae8c15014f01809b9bdd68.zip | |
Makefile: use order-only prereq for podman-remote
podman-remote has a dependency on $(SRCBINDIR), because on
Mac and Windows that's a special dir that may not exist.
But depending on a directory means depending on its mtime,
which changes every time a file in it is updated, which
means running 'make' twice in a row will rebuild podman-remote
for no good reason.
Solution: GNU Make has the concept of "order-only" prerequisites,
precisely for this situation. Use it. Since it's an obscure
feature, document it.
UPDATE: This exposed some nasty duplication wrt podman-remote rules.
Clean those up, and add comments to some confusing sections.
Fixes: #14756
(Also, drive-by edit to remove a stray misdocumented non-option)
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/remote-docs.sh | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-import.1.md | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/remote-docs.sh b/docs/remote-docs.sh index 4c2602f80..f281c19ff 100755 --- a/docs/remote-docs.sh +++ b/docs/remote-docs.sh @@ -6,7 +6,9 @@ PLATFORM=$1 ## linux, windows or darwin TARGET=${2} ## where to output files SOURCES=${@:3} ## directories to find markdown files -# Overridden for testing. Native podman-remote binary expected filepaths +# This is a *native* binary, one we can run on this host. (This script can be +# invoked in a cross-compilation environment, so even if PLATFORM=windows +# we need an actual executable that we can invoke). if [[ -z "$PODMAN" ]]; then case $(env -i HOME=$HOME PATH=$PATH go env GOOS) in windows) diff --git a/docs/source/markdown/podman-import.1.md b/docs/source/markdown/podman-import.1.md index 4002f5255..8d482b961 100644 --- a/docs/source/markdown/podman-import.1.md +++ b/docs/source/markdown/podman-import.1.md @@ -50,10 +50,6 @@ Shows progress on the import Set variant of the imported image. -**--verbose** - -Print additional debugging information - ## EXAMPLES ``` |