summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-webadmin/cockpit
diff options
context:
space:
mode:
Diffstat (limited to 'meta-webserver/recipes-webadmin/cockpit')
-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 39dbec54e..ab05fd377 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 "
12SRC_URI[sha256sum] = "c7da91824f7a72c82c1a3aaff1a57dbe0ce1e29e05e95d92b5118a324a3f4b39" 12SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e391ce9"
13 13
14inherit gettext pkgconfig autotools systemd features_check 14inherit gettext pkgconfig autotools systemd features_check
15inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
15 16
16DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" 17DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd"
18DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}"
17 19
18COMPATIBLE_HOST:libc-musl = "null" 20COMPATIBLE_HOST:libc-musl = "null"
19 21
@@ -37,12 +39,14 @@ EXTRA_OECONF = " \
37 39
38PACKAGECONFIG ??= " \ 40PACKAGECONFIG ??= " \
39 ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ 41 ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
42 old-bridge \
40" 43"
41 44
42PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" 45PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
43PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" 46PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
44PACKAGECONFIG[storaged] = ",,,udisks2" 47PACKAGECONFIG[storaged] = ",,,udisks2"
45PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" 48PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
49PACKAGECONFIG[old-bridge] = "--enable-old-bridge"
46 50
47PACKAGES =+ " \ 51PACKAGES =+ " \
48 ${PN}-pcp \ 52 ${PN}-pcp \
@@ -120,8 +124,9 @@ FILES:${PN}-apps = "${datadir}/cockpit/apps"
120FILES:${PN}-bridge = " \ 124FILES:${PN}-bridge = " \
121 ${bindir}/cockpit-bridge \ 125 ${bindir}/cockpit-bridge \
122 ${libexecdir}/cockpit-askpass \ 126 ${libexecdir}/cockpit-askpass \
127 ${PYTHON_SITEPACKAGES_DIR} \
123" 128"
124RDEPENDS:${PN}-bridge = "" 129RDEPENDS:${PN}-bridge = "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3', d)}"
125 130
126FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" 131FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop"
127RDEPENDS:${PN}-desktop += "bash" 132RDEPENDS:${PN}-desktop += "bash"