diff options
Diffstat (limited to 'meta-webserver/recipes-core')
| -rw-r--r-- | meta-webserver/recipes-core/images/meta-webserver-image-all.bb (renamed from meta-webserver/recipes-core/images/meta-webserver-image.bb) | 2 | ||||
| -rw-r--r-- | meta-webserver/recipes-core/images/meta-webserver-image-base.bb | 7 | ||||
| -rw-r--r-- | meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb | 11 |
3 files changed, 6 insertions, 14 deletions
diff --git a/meta-webserver/recipes-core/images/meta-webserver-image.bb b/meta-webserver/recipes-core/images/meta-webserver-image-all.bb index ce4f8a0387..9d2badc236 100644 --- a/meta-webserver/recipes-core/images/meta-webserver-image.bb +++ b/meta-webserver/recipes-core/images/meta-webserver-image-all.bb @@ -1,3 +1,3 @@ -require meta-webserver-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-webserver" diff --git a/meta-webserver/recipes-core/images/meta-webserver-image-base.bb b/meta-webserver/recipes-core/images/meta-webserver-image-base.bb deleted file mode 100644 index a4ce10f674..0000000000 --- a/meta-webserver/recipes-core/images/meta-webserver-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-webserver build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb index 2fa5bc4a93..e775cdb50e 100644 --- a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb +++ b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb @@ -11,14 +11,14 @@ PACKAGES = ' \ packagegroup-meta-webserver-webadmin \ ' -RDEPENDS_packagegroup-meta-webserver = "\ +RDEPENDS:packagegroup-meta-webserver = "\ packagegroup-meta-webserver-http \ packagegroup-meta-webserver-php \ packagegroup-meta-webserver-support \ packagegroup-meta-webserver-webadmin \ " -RDEPENDS_packagegroup-meta-webserver-http = "\ +RDEPENDS:packagegroup-meta-webserver-http = "\ apache-websocket \ apache2 \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \ @@ -26,22 +26,21 @@ RDEPENDS_packagegroup-meta-webserver-http = "\ monkey \ nginx \ nginx \ - nostromo \ sthttpd \ " -RDEPENDS_packagegroup-meta-webserver-php = "\ +RDEPENDS:packagegroup-meta-webserver-php = "\ phpmyadmin \ xdebug \ " -RDEPENDS_packagegroup-meta-webserver-support = "\ +RDEPENDS:packagegroup-meta-webserver-support = "\ spawn-fcgi \ fcgi \ fcgiwrap \ " -RDEPENDS_packagegroup-meta-webserver-webadmin = "\ +RDEPENDS:packagegroup-meta-webserver-webadmin = "\ cockpit \ webmin \ netdata \ |