build: Drop ssh manifest.json for pybridge install #19435
Merged
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
martinpitt
force-pushed
the
ssh-manifest
branch
2 times, most recently
from
b003216
to
8322a2c
Compare
Move the ssh manifest out of pkg/; there is nothing to be esbuilt or watched, it's just a single configuration file for the cockpit-ssh program. We also don't need it with the Python bridge, as that handles remote hosts internally. Direct remote logins from the login page call cockpit-ssh directly, not via the manifest. So conditionalize its installation on the C bridge.
martinpitt
force-pushed
the
ssh-manifest
branch
from
8322a2c
to
2095228
Compare
martinpitt
commented
Oct 5, 2023
| @@ -273,7 +275,7 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list | |||
|
|
|||
| # when not building basic packages, remove their files | |||
| %if 0%{?build_basic} == 0 | |||
| for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do | |||
There was a problem hiding this comment.
FTR, as it took me a while to realize: This can be dropped without further messing around: build_basic=0 builds with --disable-ssh, and src/ssh/Makefile.am now only installs the manifest if cockpit-ssh is enabled.
11 tasks
allisonkarlitskaya
approved these changes
Oct 5, 2023
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.
Move the ssh manifest out of pkg/; there is nothing to be esbuilt or watched, it's just a single configuration file for the cockpit-ssh program.
We also don't need it with the Python bridge, as that handles remote hosts internally. Direct remote logins from the login page call cockpit-ssh directly, not via the manifest. So conditionalize its installation on the C bridge.