diff mbox series

[meta-webserver,1/3] cockpit: Remove old-bridge leftovers

Message ID 20251016074104.85537-2-dse@thaumatec.com
State New
Headers show
Series cockpit: upgrade to 349 and fix some issues | expand

Commit Message

Daniel Semkowicz Oct. 16, 2025, 7:37 a.m. UTC 
The old-bridge package config option was removed from the recipe,
but the usage of this option was left in some places.

Remove any reference to old-bridge. Only the Python bridge is currently
supported by Cockpit.

Signed-off-by: Daniel Semkowicz <dse@thaumatec.com>
---
 meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
index 986a924fb5..c9619d835a 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
@@ -12,11 +12,9 @@  SRC_URI += " \
     "
 SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf"
 
-inherit gettext pkgconfig autotools systemd features_check
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
+inherit gettext pkgconfig autotools systemd features_check python3targetconfig
 
-DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native"
-DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}"
+DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-pip-native python3-setuptools-native"
 
 COMPATIBLE_HOST:libc-musl = "null"
 
@@ -112,7 +110,7 @@  FILES:${PN}-bridge = " \
     ${libexecdir}/cockpit-askpass \
     ${PYTHON_SITEPACKAGES_DIR} \
 "
-RDEPENDS:${PN}-bridge = "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3', d)}"
+RDEPENDS:${PN}-bridge = "python3"
 
 FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop"
 RDEPENDS:${PN}-desktop += "bash"