Skip to content

[master] deb, rpm: slight refactor / cleanup#1154

Merged
thaJeztah merged 6 commits intodocker:masterfrom
thaJeztah:build_cleanups
Jan 24, 2025
Merged

[master] deb, rpm: slight refactor / cleanup#1154
thaJeztah merged 6 commits intodocker:masterfrom
thaJeztah:build_cleanups

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jan 23, 2025

deb, rpm: use "make dynbinary" instead of ./scripts/build/binary

The "make dynbinary" target calls ./scripts/build/binary with the
right options set, and does not use docker to build (so can be
run as part of our deb/rpm build scripts.

rpm: use install -D where possible

The "-D" option creates parent directories if missing; we
can use it in most places, except for one where we're using
wildcards, as installing multiple files requires the target
directory to exist.

rpm: consistently use "install -p" (--preserve-timestamps)

This unlikely makes a big difference, as some files may have timestamps
based on checkout date or being generated, but it doesn't hurt doing
either.

deb: consistently use "install -p" (--preserve-timestamps)

This unlikely makes a big difference, as some files may have timestamps
based on checkout date or being generated, but it doesn't hurt doing
either.

deb: stop using dh_bash-completion for bash completions

The dh_bash-completion debhelper provides an easy way to install the
shell-completion scripts for Bash. Unfortunately there is no stable
equivalent yet for the other shells (zsh, fish, powershell), which
resulted in two out of three shells requiring manual install.

Given that the installation path for Bash is well-documented,
we can align Bash with the other shells to make this less confusing.

This patch makes that change, and adds a code-comment to outline
the reasoning (and possible future options) for future readers.

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah self-assigned this Jan 23, 2025
The "make dynbinary" target calls ./scripts/build/binary with the
right options set, and does not use docker to build (so can be
run as part of our deb/rpm build scripts.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The "-D" option creates parent directories if missing; we
can use it in most places, except for one where we're using
wildcards, as installing multiple files requires the target
directory to exist.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This unlikely makes a big difference, as some files may have timestamps
based on checkout date or being generated, but it doesn't hurt doing
either.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This unlikely makes a big difference, as some files may have timestamps
based on checkout date or being generated, but it doesn't hurt doing
either.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Makes it slightly clearer where installing the CLI itself
ends, and where installing completion scripts start.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The dh_bash-completion debhelper provides an easy way to install the
shell-completion scripts for Bash. Unfortunately there is no stable
equivalent yet for the other shells (zsh, fish, powershell), which
resulted in two out of three shells requiring manual install.

Given that the installation path for Bash is [well-documented][1],
we can align Bash with the other shells to make this less confusing.

This patch makes that change, and adds a code-comment to outline
the reasoning (and possible future options) for future readers.

[1]: https://github.com/scop/bash-completion/blob/79fd051907328c8c26372691f68d627c1f0e3916/README.md

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title deb, rpm: slight refactor / cleanup [master] deb, rpm: slight refactor / cleanup Jan 24, 2025
@thaJeztah thaJeztah merged commit 989f442 into docker:master Jan 24, 2025
@thaJeztah thaJeztah deleted the build_cleanups branch January 24, 2025 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants