From 35fafdb34275d6f6c8db6825e8fed1d36f28972c Mon Sep 17 00:00:00 2001 From: Daniel Semkowicz Date: Thu, 16 Oct 2025 09:37:43 +0200 Subject: [PATCH] cockpit: Remove old-bridge leftovers 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 Signed-off-by: Khem Raj --- meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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"