diff options
author | Daniel Semkowicz <dse@thaumatec.com> | 2025-10-16 09:37:43 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-10-16 08:48:34 -0700 |
commit | 35fafdb34275d6f6c8db6825e8fed1d36f28972c (patch) | |
tree | a8d12281f1e5d539bffbf1c735d4f08fe19337e3 | |
parent | 8bc16df184b17aef043f8f92d515fced7f4ea5fc (diff) | |
download | meta-openembedded-35fafdb34275d6f6c8db6825e8fed1d36f28972c.tar.gz |
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 <dse@thaumatec.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb | 8 |
1 files 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 += " \ | |||
12 | " | 12 | " |
13 | SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf" | 13 | SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf" |
14 | 14 | ||
15 | inherit gettext pkgconfig autotools systemd features_check | 15 | inherit gettext pkgconfig autotools systemd features_check python3targetconfig |
16 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)} | ||
17 | 16 | ||
18 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native" | 17 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-pip-native python3-setuptools-native" |
19 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}" | ||
20 | 18 | ||
21 | COMPATIBLE_HOST:libc-musl = "null" | 19 | COMPATIBLE_HOST:libc-musl = "null" |
22 | 20 | ||
@@ -112,7 +110,7 @@ FILES:${PN}-bridge = " \ | |||
112 | ${libexecdir}/cockpit-askpass \ | 110 | ${libexecdir}/cockpit-askpass \ |
113 | ${PYTHON_SITEPACKAGES_DIR} \ | 111 | ${PYTHON_SITEPACKAGES_DIR} \ |
114 | " | 112 | " |
115 | RDEPENDS:${PN}-bridge = "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3', d)}" | 113 | RDEPENDS:${PN}-bridge = "python3" |
116 | 114 | ||
117 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" | 115 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" |
118 | RDEPENDS:${PN}-desktop += "bash" | 116 | RDEPENDS:${PN}-desktop += "bash" |