diff options
-rw-r--r-- | meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb | 2 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb index 089c325252..f5d5debe11 100644 --- a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb +++ b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb | |||
@@ -21,7 +21,7 @@ RDEPENDS_packagegroup-meta-webserver = "\ | |||
21 | RDEPENDS_packagegroup-meta-webserver-http = "\ | 21 | RDEPENDS_packagegroup-meta-webserver-http = "\ |
22 | nginx monkey hiawatha nostromo apache-websocket \ | 22 | nginx monkey hiawatha nostromo apache-websocket \ |
23 | apache2 sthttpd \ | 23 | apache2 sthttpd \ |
24 | ${@bb.utils.contains("BBPATH", "meta-python2", "cherokee", "", d)} \ | 24 | ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \ |
25 | " | 25 | " |
26 | 26 | ||
27 | RDEPENDS_packagegroup-meta-webserver-php = "\ | 27 | RDEPENDS_packagegroup-meta-webserver-php = "\ |
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index b31f4c430b..7424467946 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/cherokee/webserver \ | |||
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} | 23 | inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} |
24 | 24 | ||
25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
26 | PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" | 26 | PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" |