summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2020-12-08 00:38:17 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2020-12-08 00:38:17 +0300
commit8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch)
tree281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
parentc16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff)
parent5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff)
downloadopenbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb')
-rw-r--r--meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb29
1 files changed, 20 insertions, 9 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
index f5d5debe1..e3e68582c 100644
--- a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
+++ b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
@@ -19,20 +19,31 @@ RDEPENDS_packagegroup-meta-webserver = "\
"
RDEPENDS_packagegroup-meta-webserver-http = "\
- nginx monkey hiawatha nostromo apache-websocket \
- apache2 sthttpd \
+ apache-websocket \
+ apache2 \
${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \
- "
+ hiawatha \
+ monkey \
+ nginx \
+ nginx \
+ nostromo \
+ sthttpd \
+"
RDEPENDS_packagegroup-meta-webserver-php = "\
- phpmyadmin xdebug \
- "
+ phpmyadmin \
+ xdebug \
+"
RDEPENDS_packagegroup-meta-webserver-support = "\
- spawn-fcgi fcgi \
- "
+ spawn-fcgi \
+ fcgi \
+"
RDEPENDS_packagegroup-meta-webserver-webadmin = "\
- netdata webmin \
- "
+ cockpit \
+ webmin \
+ netdata \
+"
+
EXCLUDE_FROM_WORLD = "1"