summaryrefslogtreecommitdiffstats
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-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 e23b63ea2..62b7a188b 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 = " \
38 38
39PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" 39PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
40PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" 40PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
41PACKAGECONFIG[storaged] = ",,,udisks2"
41 42
42PACKAGES =+ " \ 43PACKAGES =+ " \
43 ${PN}-pcp \ 44 ${PN}-pcp \
@@ -84,7 +85,6 @@ FILES_${PN}-storaged = " \
84 ${datadir}/cockpit/storaged \ 85 ${datadir}/cockpit/storaged \
85 ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ 86 ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
86" 87"
87RDEPENDS_${PN}-storaged = "udisks2"
88 88
89FILES_${PN}-networkmanager = "${datadir}/cockpit/networkmanager" 89FILES_${PN}-networkmanager = "${datadir}/cockpit/networkmanager"
90RDEPENDS_${PN}-networkmanager = "networkmanager" 90RDEPENDS_${PN}-networkmanager = "networkmanager"
@@ -174,4 +174,11 @@ do_install_append() {
174 174
175 # provided by firewalld 175 # provided by firewalld
176 rm -rf ${D}${libdir}/firewalld 176 rm -rf ${D}${libdir}/firewalld
177
178 if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then
179 for filename in ${FILES_${PN}-storaged}
180 do
181 rm -rf ${D}$filename
182 done
183 fi
177} 184}