build: Drop ssh manifest.json for pybridge install

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.
cockpit-project · Oct 5, 2023 · 2aa9300 · 2aa9300
1 parent da4d19f
commit 2aa9300
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
@@ -19,9 +19,6 @@ EXTRA_DIST += \
 pcpmanifestdir = $(datadir)/cockpit/pcp
 dist_pcpmanifest_DATA = pkg/pcp/manifest.json
 
-sshmanifestdir = $(datadir)/cockpit/ssh
-dist_sshmanifest_DATA = pkg/ssh/manifest.json
-
 # one built file in dist/ which we use as dependency
 DIST_STAMP = $(srcdir)/dist/static/manifest.json
 

diff --git a/src/ssh/Makefile-ssh.am b/src/ssh/Makefile-ssh.am
@@ -33,6 +33,14 @@ cockpit_ssh_CPPFLAGS = $(libcockpit_ssh_a_CPPFLAGS)
 cockpit_ssh_LDADD = $(libcockpit_ssh_a_LIBS)
 cockpit_ssh_SOURCES = src/ssh/ssh.c
 
+# -----------------------------------------------------------------------------
+# C bridge config; Python bridge handles it internally
+
+if WITH_OLD_BRIDGE
+sshmanifestdir = $(datadir)/cockpit/ssh
+dist_sshmanifest_DATA = src/ssh/manifest.json
+endif
+
 # -----------------------------------------------------------------------------
 # mock-ssh
 

diff --git a/pkg/ssh/manifest.json → src/ssh/manifest.json b/pkg/ssh/manifest.json → src/ssh/manifest.json
diff --git a/tools/cockpit.spec b/tools/cockpit.spec
@@ -224,8 +224,10 @@ echo '%dir %{_datadir}/cockpit/base1' >> base.list
 find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
 echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
+%if 0%{?enable_old_bridge}
 echo '%dir %{_datadir}/cockpit/ssh' >> base.list
 find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
+%endif
 echo '%{_libexecdir}/cockpit-ssh' >> base.list
 
 echo '%dir %{_datadir}/cockpit/pcp' > pcp.list

diff --git a/tools/debian/cockpit-bridge.install b/tools/debian/cockpit-bridge.install
@@ -4,6 +4,5 @@ usr/lib/cockpit/cockpit-askpass
 usr/lib/cockpit/cockpit-ssh
 usr/lib/python*
 usr/share/cockpit/base1/
-usr/share/cockpit/ssh/
 usr/share/man/man1/cockpit-bridge.1
 usr/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy