diff options
| -rw-r--r-- | meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb (renamed from meta-webserver/recipes-webadmin/cockpit/cockpit_298.bb) | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_298.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb index 39dbec54ee..ab05fd3777 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_298.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb | |||
| @@ -9,11 +9,13 @@ SRC_URI += " \ | |||
| 9 | file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ | 9 | file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ |
| 10 | file://cockpit.pam \ | 10 | file://cockpit.pam \ |
| 11 | " | 11 | " |
| 12 | SRC_URI[sha256sum] = "c7da91824f7a72c82c1a3aaff1a57dbe0ce1e29e05e95d92b5118a324a3f4b39" | 12 | SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e391ce9" |
| 13 | 13 | ||
| 14 | inherit gettext pkgconfig autotools systemd features_check | 14 | inherit gettext pkgconfig autotools systemd features_check |
| 15 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)} | ||
| 15 | 16 | ||
| 16 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" | 17 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" |
| 18 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}" | ||
| 17 | 19 | ||
| 18 | COMPATIBLE_HOST:libc-musl = "null" | 20 | COMPATIBLE_HOST:libc-musl = "null" |
| 19 | 21 | ||
| @@ -37,12 +39,14 @@ EXTRA_OECONF = " \ | |||
| 37 | 39 | ||
| 38 | PACKAGECONFIG ??= " \ | 40 | PACKAGECONFIG ??= " \ |
| 39 | ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ | 41 | ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ |
| 42 | old-bridge \ | ||
| 40 | " | 43 | " |
| 41 | 44 | ||
| 42 | PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" | 45 | PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" |
| 43 | PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" | 46 | PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" |
| 44 | PACKAGECONFIG[storaged] = ",,,udisks2" | 47 | PACKAGECONFIG[storaged] = ",,,udisks2" |
| 45 | PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" | 48 | PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" |
| 49 | PACKAGECONFIG[old-bridge] = "--enable-old-bridge" | ||
| 46 | 50 | ||
| 47 | PACKAGES =+ " \ | 51 | PACKAGES =+ " \ |
| 48 | ${PN}-pcp \ | 52 | ${PN}-pcp \ |
| @@ -120,8 +124,9 @@ FILES:${PN}-apps = "${datadir}/cockpit/apps" | |||
| 120 | FILES:${PN}-bridge = " \ | 124 | FILES:${PN}-bridge = " \ |
| 121 | ${bindir}/cockpit-bridge \ | 125 | ${bindir}/cockpit-bridge \ |
| 122 | ${libexecdir}/cockpit-askpass \ | 126 | ${libexecdir}/cockpit-askpass \ |
| 127 | ${PYTHON_SITEPACKAGES_DIR} \ | ||
| 123 | " | 128 | " |
| 124 | RDEPENDS:${PN}-bridge = "" | 129 | RDEPENDS:${PN}-bridge = "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3', d)}" |
| 125 | 130 | ||
| 126 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" | 131 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" |
| 127 | RDEPENDS:${PN}-desktop += "bash" | 132 | RDEPENDS:${PN}-desktop += "bash" |
