From 310d99d978364ea31bd26e75dfb1e0ee6ae25266 Mon Sep 17 00:00:00 2001 From: Michael Haener Date: Wed, 20 May 2020 11:07:25 +0200 Subject: cockpit: rt-deps for storaged No general depdependency on udisks2 (polkit) Signed-off-by: Michael Haener Signed-off-by: Khem Raj --- meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb index e23b63ea21..62b7a188b9 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 } -- cgit 1.2.3-korg