aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorMichael Haener <michael.haener@siemens.com>2020-05-20 11:07:25 +0200
committerKhem Raj <raj.khem@gmail.com>2020-05-21 15:07:44 -0700
commit310d99d978364ea31bd26e75dfb1e0ee6ae25266 (patch)
treeef63bbb73cd8ded06f0150d10eeb89fa5e88d196 /meta-webserver
parenteaf4a812443866951a6f96e15954ba1ca667afa9 (diff)
downloadmeta-openembedded-contrib-310d99d978364ea31bd26e75dfb1e0ee6ae25266.tar.gz
cockpit: rt-deps for storaged
No general depdependency on udisks2 (polkit) Signed-off-by: Michael Haener <michael.haener@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
index e23b63ea21b..62b7a188b97 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
@@ -38,6 +38,7 @@ EXTRA_OECONF = " \
PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
+PACKAGECONFIG[storaged] = ",,,udisks2"
PACKAGES =+ " \
${PN}-pcp \
@@ -84,7 +85,6 @@ FILES_${PN}-storaged = " \
${datadir}/cockpit/storaged \
${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
"
-RDEPENDS_${PN}-storaged = "udisks2"
FILES_${PN}-networkmanager = "${datadir}/cockpit/networkmanager"
RDEPENDS_${PN}-networkmanager = "networkmanager"
@@ -174,4 +174,11 @@ do_install_append() {
# provided by firewalld
rm -rf ${D}${libdir}/firewalld
+
+ if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then
+ for filename in ${FILES_${PN}-storaged}
+ do
+ rm -rf ${D}$filename
+ done
+ fi
}