summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-01-22 19:05:34 -0800
committerKhem Raj <raj.khem@gmail.com>2020-01-22 19:21:39 -0800
commit1da85ce7d160b05f7a9e689a470917c7b17e2dd4 (patch)
tree609b8038399abbb2ef55b2300e4ef6b06e0e63cc /meta-webserver
parent809de9b0572b8ea234af6141f73deaf2010bc54e (diff)
downloadmeta-openembedded-1da85ce7d160b05f7a9e689a470917c7b17e2dd4.tar.gz
cherokee: Replace using BBPATH with BBFILE_COLLECTIONS for meta-python2 check
BBPATH check actually does not work Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb2
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee_git.bb2
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 = "\
21RDEPENDS_packagegroup-meta-webserver-http = "\ 21RDEPENDS_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
27RDEPENDS_packagegroup-meta-webserver-php = "\ 27RDEPENDS_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
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
23inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} 23inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
24 24
25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
26PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" 26PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"